Commit Graph

663 Commits

Author SHA1 Message Date
Vladimir Sharshov 0c2d0f4612 [Refs #263] Delete Categories 2012-03-29 23:01:25 +04:00
Vladimir Sharshov 5db485a4c0 [Refs #263] Remove Aut BuildList. Part 2 2012-03-29 22:43:46 +04:00
Vladimir Sharshov 66c285c796 [Refs #263] Delete AutoBuildList 2012-03-29 22:22:48 +04:00
Vladimir Sharshov 9a45353ccb Merge pull request #342 from warpc/128-account-activation
[Refs #128] account activation
2012-03-29 09:09:03 -07:00
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
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
Alexander Machehin c2960b7083 [refs #263] fixed commentable accessibility 2012-03-27 22:45:07 +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 8b31c6373f Merge branch 'master' into 128-account-activation 2012-03-27 13:46:21 +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
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 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
Pavel Chipiga 7f31246463 Tune project specific build_lists page filters. Cleanup. Refs #223 2012-03-22 22:58:02 +02:00
Pavel Chipiga 4553affa56 Add missing magic_encodings. Fix blame commit select, hide blank blame. Fix git repo hooks - redo branch parse to support non-ascii branches. Refs #190, #134 2012-03-22 19:11:12 +02: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
Alexander Machehin 23eeb1cae7 [refs #270] changes in ban 2012-03-22 20:50:15 +06:00
Alexander Machehin 787eed92a3 [refs #270] removed ssh_key 2012-03-22 17:47:56 +06:00
Alexander Machehin 71f1822fce [refs #270] some refactoring 2012-03-22 17:17:11 +06:00
Alexander Machehin 867d678dc4 [refs #270] some users tests 2012-03-22 02:05:27 +06: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
Alexander Machehin bf1340939b [refs #270] fixed users filtration 2012-03-22 00:02:58 +06:00
Alexander Machehin a6a5b722d2 [refs #270] use devise lockable to ban 2012-03-21 23:45:51 +06:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04:00
Alexander Machehin 3c7dec3b97 Merge branch '3.2-master' into 270-user_control 2012-03-21 19:39:55 +06:00
Pavel Chipiga 8b252d8c14 Add and tune devise lockable strategy. Refs #270 2012-03-21 15:37:16 +02: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
Alexander Machehin 5c408540ff [refs #270] can ban user 2012-03-21 02:06:51 +06: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
George Vinogradov cd42c912d8 [issue #279] Fixed permissions for personal platforms. 2012-03-20 22:41:14 +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 7c0585ee87 [issue #279] Added members and other changes. 2012-03-20 20:24:18 +04:00
Vladimir Sharshov d3c3726a84 [Refs #66] Add priority in build list 2012-03-20 14:56:51 +04:00
Vladimir Sharshov 56f1d06da8 [Refs #66] Add priority to build list 2012-03-20 14:08:24 +04: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 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
Alexander Machehin 9b2dc6538d [refs #252] new user notifications 2012-03-19 20:45:47 +06:00
Alexander Machehin d5dc05233f [refs #252] fixed appeal to user 2012-03-19 20:34:57 +06:00
Alexander Machehin 296acd80da [refs #265] added build waiting message 2012-03-19 15:07:09 +06: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 fb89eedca3 [refs #265] forgot build list setup 2012-03-17 00:58:41 +06:00
Alexander Machehin dd5f51de71 [refs #265] added build tasks feed 2012-03-16 21:37:58 +06:00