Commit Graph

1835 Commits

Author SHA1 Message Date
George Vinogradov a3aaf4f7ce [issue #195] Fixed bug with line numbers in blob show. 2012-03-27 14:12:26 +04:00
George Vinogradov d03f364b18 Merge branch '195-new_design_for_projects' of github.com:warpc/rosa-build into 195-new_design_for_projects 2012-03-25 01:38:32 +04:00
George Vinogradov dd8e3b0497 [issue #195] Added JQuery datatables to /projects 2012-03-25 01:36:56 +04:00
Pavel Chipiga d44de9f2bb Redo projects list. Allow view projects through groups. Hide delete from project link from project owners. Refs #195 2012-03-23 22:37:17 +02:00
George Vinogradov d3184b846b [issue #195] Fixed <Tab> in edit blobs. 2012-03-22 20:16:07 +04:00
George Vinogradov efd46249ed [issue #195] Fixed merge artefact 2012-03-22 18:53:06 +04:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects
Conflicts:
	app/views/projects/_sidebar.html.haml
2012-03-22 18:15:57 +04:00
George Vinogradov 524fa2302f [issue #279] Changed buttons alignment. 2012-03-22 17:53:35 +04:00
Vladimir Sharshov 57520c6098 Merge pull request #330 from warpc/265-activity_feed_messages
[Refs #265, #263]  fixed tests to issue comments
2012-03-22 04:47:55 -07:00
Vladimir Sharshov bfbd57d788 Merge pull request #329 from warpc/194-tests
[refs #194] fixed mailer tests
2012-03-22 04:03:33 -07:00
Alexander Machehin 9d6960fab8 [refs #265] some changes 2012-03-22 16:19:21 +06:00
Alexander Machehin 6d330d9164 [refs #265] fixed tests to issue comments 2012-03-22 16:16:31 +06:00
Alexander Machehin 600eeeb4d7 [refs #194] fixed mailer tests 2012-03-22 15:12:22 +06:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
George Vinogradov 401e570dc7 [issue #195] Change projects/sidebar to be more standart. 2012-03-22 04:42:56 +04:00
Vladimir Sharshov 74575c0ca1 Merge pull request #326 from warpc/190-encodings
[Refs #190]
- Minor gems update
- Prepare gemfile for jruby and rbi tests
- Remove encoding hacks
- Apply grit fixes for encoding support
- Recode incorrect encodings
- Refactor, cleanup and fix lots bugs in git section
- Refactor and remove unused git routes
- Translate some untranslated parts
- Redo branch/tags selector
- Fix files tree last commit message
- Project section templates refactor and cleanup
2012-03-21 15:17:19 -07:00
Pavel Chipiga 2db7726d55 Merge branch '3.2-master' into 190-encodings
Conflicts:
	db/schema.rb
2012-03-22 00:13:18 +02:00
Vladimir Sharshov 2571a75a3f Merge pull request #327 from warpc/195-new_design_for_projects
[Refs #195] Fixed avatar in commits & comments
2012-03-21 15:08:29 -07:00
George Vinogradov 65e4e0f748 [issue #195] use avatar_url_by_email instead of gravatar_url 2012-03-22 02:06:33 +04:00
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
George Vinogradov b902d8effe [issue #195] Fixed avatar in commits & comments 2012-03-22 01:51:39 +04:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Vladimir Sharshov 87e1ee4700 Merge pull request #317 from warpc/232-groups_tests
[refs #232] Add groups tests and mass assignment protect
2012-03-21 12:06:00 -07:00
Vladimir Sharshov ee867aa8d4 Merge pull request #324 from warpc/200-new_build_repos_rules
[refs #200] Fix chbx behaviour for repos and their platforms
2012-03-21 08:06:54 -07:00
konstantin.grabar 5abf64e353 [refs #200] Fix chbx behaviour for repos and their platforms 2012-03-21 19:04:01 +04:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04:00
Pavel Chipiga 8b252d8c14 Add and tune devise lockable strategy. Refs #270 2012-03-21 15:37:16 +02:00
Vladimir Sharshov 81d18b5337 Merge pull request #323 from warpc/200-new_build_repos_rules
[Refs #200] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
2012-03-21 05:17:23 -07:00
konstantin.grabar e6622d29ea [refs #200] Remove unused code 2012-03-21 15:53:54 +04:00
konstantin.grabar f9850c6885 [refs #200] Fix checkbox checking on build list form 2012-03-21 15:34:11 +04:00
Vladimir Sharshov 2df89c6ae3 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-21 14:50:38 +04:00
Vladimir Sharshov 375aa7e74e Merge pull request #322 from warpc/265-activity_feed_messages
[refs #265] add ajax to older messages
2012-03-21 03:50:25 -07:00
Vladimir Sharshov 4393e8b30f [Refs #263] Fix activity feed menu display 2012-03-21 14:48:06 +04:00
Alexander Machehin b678320638 [refs #265] add ajax to older messages 2012-03-21 16:29:45 +06:00
Vladimir Sharshov 7bf107f287 [Refs #263] Fix styles (layout and menu) 2012-03-21 03:11:58 +04:00
Vladimir Sharshov d2da4fc0ba [Refs #263] Fix css 2012-03-21 02:53:56 +04:00
Vladimir Sharshov ba140c67f9 [Refs #263] Align the menu, change colors for text and background 2012-03-21 02:47:51 +04:00
Vladimir Sharshov e2c1e59350 Merge pull request #314 from warpc/270-admins_menu
[Refs #270] created admins menu aside
2012-03-20 15:17:51 -07:00
Vladimir Sharshov 4b4b718838 Fix errors in unicorn config 2012-03-20 23:11:59 +04:00
Vladimir Sharshov 41d98f5040 Fix path for unicorn working_directory 2012-03-20 22:59:12 +04:00
Vladimir Sharshov 347b5283b0 Merge pull request #320 from warpc/279-new_design_for_platforms
[issue #279] Disable members for personal platforms
2012-03-20 11:49:21 -07:00
Vladimir Sharshov abbe849f32 Fix(?) for zero time deploy restart 2012-03-20 22:47:09 +04:00
George Vinogradov cd42c912d8 [issue #279] Fixed permissions for personal platforms. 2012-03-20 22:41:14 +04:00
Vladimir Sharshov eb4a18c0ff Merge pull request #319 from warpc/279-new_design_for_platforms
[issue #279] Fixed bugs
2012-03-20 11:03:32 -07:00
George Vinogradov f958c56a3e [issue #279] Fixed typos 2012-03-20 21:44:56 +04:00
Vladimir Sharshov 0dd0cb091c Fix for unicorn zero deploy restarting 2012-03-20 20:54:51 +04:00
Vladimir Sharshov 047425a27f Merge pull request #318 from warpc/279-new_design_for_platforms
[Refs #279] new design for platforms(add control for members, fix bugs)
2012-03-20 09:48:57 -07:00
George Vinogradov a8b457a173 [issue #279] Fixed translation typo 2012-03-20 20:46:50 +04:00
George Vinogradov 77e8a4fe4b [issue #279] Fixed "no method gsub for Nil class" bug 2012-03-20 20:29:05 +04:00
George Vinogradov 6867e87f0c [issue #279] Merge branch '279-new_design_for_platforms' of github.com:warpc/rosa-build into 279-new_design_for_platforms
Conflicts:
	config/locales/models/platform.ru.yml
2012-03-20 20:27:19 +04:00