Commit Graph

2124 Commits

Author SHA1 Message Date
Pavel Chipiga 9ee350b007 Refactor search controllers and scopes. Add search query whitespace strip. Refs #263 2012-03-28 02:58:03 +03:00
Pavel Chipiga c9f4cf0ea4 Fix and refactor project membered abilities. Refs #195 2012-03-28 00:28:50 +03:00
Vladimir Sharshov d955836be4 Merge pull request #346 from warpc/195-new_design_for_projects
[Refs #195] AJAX list for my project page
2012-03-27 13:49:10 -07:00
George Vinogradov 2ba4a282cd [issue #195] Global admin can change members in all projects 2012-03-28 00:16:33 +04: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
Vladimir Sharshov 7143c7a9bc Merge pull request #343 from warpc/263-refactoring
[Refs #263] Fix comment tests; refactoring.
2012-03-27 10:13:04 -07:00
Vladimir Sharshov 1967e35f5f Merge pull request #345 from warpc/279-new_design_for_platforms
[issue #279] Fixed bug with connection info if main platforms does not exist
2012-03-27 10:02:43 -07:00
George Vinogradov 385e35493f [issue #279] Fixed bug with connection info. 2012-03-27 20:51:34 +04:00
Alexander Machehin c2960b7083 [refs #263] fixed commentable accessibility 2012-03-27 22:45:07 +06:00
Pavel Chipiga b12f120962 Strip whitespaces during search. Refs #255 2012-03-27 19:22:45 +03: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
Alexander Machehin 3b57bb56bc [refs #263] removed project_id from access lists 2012-03-27 21:11:52 +06:00
Alexander Machehin a0b7f243d6 [refs #263] changed and fixed comment tests; some refactoring 2012-03-27 21:09:04 +06:00
konstantin.grabar f33ef75666 [refs #128] Add email confirmation on email change. Remove email confirmation after registration. 2012-03-27 17:45:09 +04: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
George Vinogradov a3aaf4f7ce [issue #195] Fixed bug with line numbers in blob show. 2012-03-27 14:12:26 +04:00
konstantin.grabar 8b31c6373f Merge branch 'master' into 128-account-activation 2012-03-27 13:46:21 +04: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
konstantin.grabar ae0ca1ce99 [refs #128] Fix devise mails. Fix confirm ability 2012-03-26 18:33:02 +04:00
konstantin.grabar a3d334f0c2 [refs #128] Merge 3.2-master into 128-account-activation 2012-03-26 13:55:45 +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 4b96c988d4 Reduce build batch size. Refs #263 2012-03-24 02:09:49 +02:00
Pavel Chipiga 099ba2a3dd Build platform for both arches. Refs #263 2012-03-24 01:53:07 +02:00
Vladimir Sharshov 9ced817560 [Refs #279] Temporary fix for mass rebuild 2012-03-24 03:30:12 +04:00
Pavel Chipiga 46f6b519cd Fix path to asset. Refs #325 2012-03-24 01:02:38 +02:00
Pavel Chipiga cacd9eb301 Improve add_branch task. Fix projects list JSON generation. Refs #207, #279 2012-03-24 00:48:58 +02:00
Vladimir Sharshov 6a8b8fec3a [Refs #66] User builds more priority than mass rebuild with zero priority 2012-03-24 01:29:51 +04:00
Vladimir Sharshov 115c90f03b Merge pull request #331 from warpc/263-refactoring
[Refs #263] Fix broken tests
2012-03-23 13:49:20 -07:00
Pavel Chipiga 1fab6c642e Minor design fix for product build lists. Refs #223 2012-03-23 22:39:37 +02: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
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 c2617bf1dd [refs #195] fixed edit button 2012-03-24 01:13:52 +06:00
Alexander Machehin 35c466820e [refs #195] add lock/unlock icon 2012-03-23 23:36:37 +06:00
Vladimir Sharshov 04710590f3 Merge pull request #338 from warpc/193-wiki
[Refs #193] Remove unused styles
2012-03-23 09:40:09 -07:00
Alexander Machehin 6c3edf77db [refs #193] removed second border from footer 2012-03-23 22:30:48 +06:00
Alexander Machehin 833716e200 [refs #193] smaller last edit text 2012-03-23 22:21:05 +06:00
Vladimir Sharshov f085367659 Merge pull request #337 from warpc/193-wiki
[Refs #193] Restyle wiki
2012-03-23 08:59:17 -07:00
Alexander Machehin 6864f22b35 [refs #193] remove button style from delete page link 2012-03-23 21:56:21 +06:00
Alexander Machehin 86bd036418 [refs #193] changes in wiki 2012-03-23 21:36:47 +06:00
Vladimir Sharshov 9ee90ae7a6 Merge pull request #336 from warpc/325-new_error_pages_design
[refs #325] Fix image routes. Add serach bar.
2012-03-23 07:09:00 -07:00
Vladimir Sharshov ef5c4a1b7b Merge branch '325-new_error_pages_design' of github.com:warpc/rosa-build into 325-new_error_pages_design
Conflicts:
	public/404.html
	public/500.html
2012-03-23 18:07:55 +04:00
Vladimir Sharshov 8a3592e211 [Refs #325] Fix alt text for pages 2012-03-23 18:05:44 +04:00
Vladimir Sharshov 116dbb4ad7 Merge pull request #335 from warpc/194-tracker
[Refs #194] change styles at issues list
2012-03-23 06:51:44 -07:00