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 |
George Vinogradov
|
7c0585ee87
|
[issue #279] Added members and other changes.
|
2012-03-20 20:24:18 +04:00 |
konstantin.grabar
|
7f6f68872e
|
[refs #200] Move some fields to rights part of the form. Hide platforms with no repos
|
2012-03-20 19:45:01 +04:00 |
konstantin.grabar
|
aa4bd2c1bc
|
[refs #232] Add groups tests
|
2012-03-20 19:40:49 +04:00 |
George Vinogradov
|
6886bf4e46
|
[issue #279] Fixed some bugs in views
|
2012-03-20 17:12:56 +04:00 |
Vladimir Sharshov
|
09fcc04489
|
Merge pull request #315 from warpc/200-new_build_repos_rules
[refs #200] Change build list repos and platforms interface
|
2012-03-20 06:02:49 -07:00 |
konstantin.grabar
|
981ea7d69f
|
[refs #200] Remove debug code from build_lists controller
|
2012-03-20 17:01:18 +04:00 |
Vladimir Sharshov
|
d3c3726a84
|
[Refs #66] Add priority in build list
|
2012-03-20 14:56:51 +04:00 |
konstantin.grabar
|
31e0c9191c
|
[refs #200] Fix build list form interface and include_repos logic
|
2012-03-20 14:36:31 +04:00 |
Vladimir Sharshov
|
56f1d06da8
|
[Refs #66] Add priority to build list
|
2012-03-20 14:08:24 +04:00 |
konstantin.grabar
|
1d56dfad3d
|
[refs #200] Remove include repos block
|
2012-03-20 00:04:33 +04:00 |
konstantin.grabar
|
f0645be9c5
|
[refs #200] Change build list repos and platforms interface
|
2012-03-19 23:52:46 +04:00 |
Alexander Machehin
|
1066307fbb
|
[refs #270] created admins menu aside
|
2012-03-19 23:32:02 +06:00 |
Vladimir Sharshov
|
4ce3e5bf32
|
Merge pull request #310 from warpc/252-user_appeal
[refs #252] fixed appeal to user in email and in welcome message in activity feed
|
2012-03-19 09:07:21 -07:00 |
George Vinogradov
|
155a46cce9
|
[issue #279] Fixed some bugs in connection info.
|
2012-03-19 19:56:40 +04:00 |
Vladimir Sharshov
|
8bf3837fcb
|
Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master
|
2012-03-19 19:46:09 +04:00 |
Vladimir Sharshov
|
ec791f2616
|
Fix for non restart unicorn with zero time deploy
http://unicorn.bogomips.org/SIGNALS.html (about 'preload_app')
|
2012-03-19 19:45:44 +04:00 |