Pavel Chipiga
|
9ee350b007
|
Refactor search controllers and scopes. Add search query whitespace strip. Refs #263
|
2012-03-28 02:58:03 +03:00 |
George Vinogradov
|
baf35da99c
|
[issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
app/controllers/projects_controller.rb
|
2012-03-27 21:23:09 +04:00 |
George Vinogradov
|
9bb1d80172
|
[issue #195] Added AJAX to /projects list.
|
2012-03-27 19:50:00 +04:00 |
Alexander Machehin
|
c327ca8d61
|
[refs #270] fixed translation for admin menu
|
2012-03-27 21:28:22 +06:00 |
Vladimir Sharshov
|
993d480a13
|
Merge pull request #341 from warpc/270-admins-menu
[refs #270] added register requests page to admins menu
|
2012-03-27 06:01:56 -07:00 |
Alexander Machehin
|
6cac84e1bb
|
[refs #270] added register requests page to admins menu
|
2012-03-27 18:55:08 +06:00 |
Vladimir Sharshov
|
3d2fedb594
|
[Refs #263] Speed up deploy if assets didn't change
|
2012-03-27 02:21:35 +04:00 |
Vladimir Sharshov
|
5c574a74e4
|
* Fix for non en_US.UTF-8 user locale deploy
* Fix missing data in pingwinsoft application config
|
2012-03-26 23:18:33 +04:00 |
Vladimir Sharshov
|
90024065a8
|
Change settings for pingwinsoft deploy env
|
2012-03-26 22:45:28 +04:00 |
Pavel Chipiga
|
dafedb3dcf
|
Reroute and refactor admin user creation to force invitation and self registration work correct. Refs #270
|
2012-03-26 17:49:00 +03:00 |
George Vinogradov
|
dd8e3b0497
|
[issue #195] Added JQuery datatables to /projects
|
2012-03-25 01:36:56 +04:00 |
Vladimir Sharshov
|
0a2561549b
|
Merge pull request #339 from warpc/195-projects
[Refs #195] add lock/unlock icon, fixed edit button, changed translations
|
2012-03-23 12:26:30 -07:00 |
Alexander Machehin
|
863d2999c8
|
[refs #195] changed translations
|
2012-03-24 01:15:34 +06:00 |
Alexander Machehin
|
b08b1f7528
|
[refs #270] changed translation to Admin
|
2012-03-23 17:11:15 +06:00 |
Pavel Chipiga
|
7f31246463
|
Tune project specific build_lists page filters. Cleanup. Refs #223
|
2012-03-22 22:58:02 +02:00 |
Vladimir Sharshov
|
df32afbda6
|
[Refs #265] change text for load_messages link
|
2012-03-22 22:35:01 +04:00 |
Alexander Machehin
|
071c391a6e
|
Merge branch '3.2-master' into 270-user_control
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-03-22 21:15:10 +06: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 |
Alexander Machehin
|
fcc1fad0d1
|
[refs #270] fixed translations
|
2012-03-22 18:00:34 +06: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 |
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 |
Alexander Machehin
|
a6a5b722d2
|
[refs #270] use devise lockable to ban
|
2012-03-21 23:45:51 +06:00 |
Alexander Machehin
|
4a6ce6c8a8
|
Merge branch '3.2-master' into 270-user_control
Conflicts:
app/views/users/index.html.haml
|
2012-03-21 15:29:44 +06: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 |
Alexander Machehin
|
5c408540ff
|
[refs #270] can ban user
|
2012-03-21 02:06:51 +06: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
|
abbe849f32
|
Fix(?) for zero time deploy restart
|
2012-03-20 22:47:09 +04:00 |
Alexander Machehin
|
20ff998f08
|
[refs #270] user control
|
2012-03-21 00:12:18 +06: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
|
7c0585ee87
|
[issue #279] Added members and other changes.
|
2012-03-20 20:24:18 +04:00 |
Alexander Machehin
|
1066307fbb
|
[refs #270] created admins menu aside
|
2012-03-19 23:32:02 +06: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 |
George Vinogradov
|
b6b1462de5
|
[issue #279] Fixed some bugs in connection info.
|
2012-03-19 19:37:08 +04:00 |
George Vinogradov
|
ddc95c25fb
|
[issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-03-19 18:56:04 +04:00 |
George Vinogradov
|
1cbc3f5b7a
|
[issue #279] Added block of connection data for personal platform.
|
2012-03-19 18:46:12 +04:00 |
Vladimir Sharshov
|
abe06b5068
|
Merge pull request #305 from warpc/223-monitoring_design
[Refs #223] monitoring design for current task
|
2012-03-19 03:28:30 -07:00 |
Alexander Machehin
|
296acd80da
|
[refs #265] added build waiting message
|
2012-03-19 15:07:09 +06:00 |
konstantin.grabar
|
b3d7091db0
|
Merge 3.2-master into 223-monitoring_design
|
2012-03-19 10:41:30 +04:00 |
konstantin.grabar
|
4b26eebeca
|
[refs #223] Add new design to build list task page
|
2012-03-18 12:20:31 +04:00 |
Alexander Machehin
|
86871ab32d
|
Merge branch '3.2-master' into 265-activity_feed_messages
Conflicts:
config/locales/menu.en.yml
config/locales/menu.ru.yml
|
2012-03-17 01:09:04 +06:00 |
Alexander Machehin
|
dd5f51de71
|
[refs #265] added build tasks feed
|
2012-03-16 21:37:58 +06:00 |
George Vinogradov
|
3d9f9b5c73
|
[issue #279] Fixed permissions and moved some buttons.
Removed Freeze/Unfreeze actions from Platform.
|
2012-03-16 17:25:34 +04:00 |