Commit Graph

1948 Commits

Author SHA1 Message Date
Pavel Chipiga 050398c39f Merge branch 'master' into 263-refactoring
Conflicts:
	db/schema.rb
2012-03-30 00:02:59 +03:00
Pasha 9ba43bbf3a Merge pull request #356 from warpc/263-remove_unused_code
[Refs #263] remove unused code
2012-03-29 13:58:44 -07:00
Pavel Chipiga 583918fa68 Upgrade gems. Upgrade FactoryGirl syntax. Move code out from vendor/plugins, redo plugins structure. Fix all deprecations. Great refactor for lib and initializers folders. Add magic encodings. Code cleanup. Fix some specs. Refs #263 2012-03-29 23:34:22 +03:00
Vladimir Sharshov 4dd97d8c63 [Refs #263] Remove xml-rpc gem, clear CanCan abilities and tests 2012-03-30 00:24:45 +04:00
Vladimir Sharshov 34011513b5 [Refs #263] Remove old xml-rpc API 2012-03-29 23:19:00 +04:00
Vladimir Sharshov 39c5da2445 [Refs #263] Remove EasyUrpmi support 2012-03-29 23:07:38 +04:00
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 eac5461a29 Merge pull request #355 from warpc/195-new_design_for_projects
[issue #195] Fixed leave button. Added participant icons.
2012-03-29 09:29:37 -07:00
George Vinogradov c03ae5015e [issue #195] Fixed leave button. Added participant icons. 2012-03-29 20:27:33 +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
santaux 365c32a9ff Merge pull request #354 from warpc/263-fix_localizations
[Refs #263] Fix localization: mistakes, typos and missing translations.
2012-03-29 03:51:07 -07:00
Vladimir Sharshov 1d344f441f [Refs #263] Fix localization: mistakes, typos and missing translations. Special thanks to Eugeni Dodonov for help. 2012-03-29 14:48:15 +04:00
George Vinogradov bac8f0a285 Revert "[issue #195] Removed leave button from groups projects."
This reverts commit 014fd706db9894f09cbffa8372009290324dbfe8.
2012-03-29 00:46:42 +04:00
George Vinogradov 869fa0da31 [issue #195] Removed leave button from groups projects. 2012-03-29 00:24:15 +04:00
konstantin.grabar f912ff1fa0 [refs #128] Add multilanguage devise mails 2012-03-28 20:00:44 +04:00
konstantin.grabar 839daefc41 [refs #128] Small refactor of users#update action 2012-03-28 18:01:25 +04:00
Pasha 978e78da2c Merge pull request #352 from warpc/270-admins_menu
#270 Новый элемент "Статистика закачек пакетов" в меню "Центр управления"
2012-03-28 06:23:25 -07:00
Alexander Machehin 69ccf18265 [refs #270] added statistics to admins menu 2012-03-28 19:19:42 +06:00
Alexander Machehin 5fa5633690 Merge pull request #348 from warpc/263-refactoring
Рефакторинг поиска
2012-03-28 05:39:28 -07:00
santaux d40d681537 Merge pull request #350 from warpc/195-new_design_for_projects
[issue #195] Fixed bug with datatables.
2012-03-28 03:33:44 -07:00
George Vinogradov 441bdc9f05 [issue #195] Merge branch 'master' into 195-new_design_for_projects
Conflicts:
	app/models/ability.rb
2012-03-28 14:29:45 +04:00
George Vinogradov f74dba6a69 [issue #195] Fixed bug with datatables. 2012-03-28 14:21:50 +04: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
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