Commit Graph

168 Commits

Author SHA1 Message Date
Alexander Machehin 06a977ea21 Merge branch 'master' into 114-comment_notifications 2012-01-20 22:03:04 +06:00
Vladimir Sharshov 25bd2cd13d Fix for localization files 2012-01-20 00:33:28 +04:00
Alexander Machehin 71447a29e3 [refs #114] add settings for commits notifications 2012-01-19 00:20:08 +06:00
Pasha 4ba268dd67 Merge pull request #109 from warpc/18-commit_comments
18 commit comments
2012-01-18 05:49:57 -08:00
konstantin.grabar bbbf17c2b4 [refs #105] Merge master with 105-internationalization 2012-01-17 17:58:49 +04:00
konstantin.grabar 726eddc40e [refs #105] Add internationalization support to project 2012-01-17 15:48:40 +04:00
Pavel Chipiga fab62c548f Hide container_path if build_list published. Cleanup translations. Refs #100 2012-01-17 13:04:50 +02:00
Alexander Machehin bf4e4f02ed Right merge branch 'master' into 18-commit_comments
Conflicts:
	app/controllers/comments_controller.rb
	app/views/comments/edit.html.haml
	app/views/issues/show.html.haml
	db/schema.rb
2012-01-17 15:52:46 +06:00
konstantin.grabar 52696791f2 [refs #54, #94] Merge master into issues 2012-01-16 13:42:44 +04:00
Alexander Machehin 794c55a030 Merge branch 'master' of github.com:warpc/rosa-build into 18-commit_comments 2012-01-13 22:01:30 +06:00
konstantin.grabar db0a66846b [refs #94] Add new notifier rules. Fix some issues and comments bugs 2012-01-13 19:07:01 +04:00
George Vinogradov 0751a94974 [update #76] Merge branch 'master' into 76-project_autocomplete
Conflicts:
	app/views/layouts/_stylesheets.html.haml
2012-01-12 20:43:32 +04:00
George Vinogradov 73b710ae4e [close #76] Changed styles. Fixed bug with pagination. 2012-01-12 20:37:50 +04:00
Alexander Machehin 636c90e6e4 [refs #18] add some I18n 2012-01-12 20:27:45 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
konstantin.grabar e8977a7d95 Merger issues with master 2011-12-30 18:23:16 +04:00
Pavel Chipiga acb970686c Apply auto_publish for build_lists. Apply publish build_list error status. Remove circle build info. Display auto_publish info. Fix bugs. Refactor. Apply specs for all build_lists core callbacks. Refs #72 2011-12-29 04:37:34 +02:00
konstantin.grabar a783b460bd Merge issues with master 2011-12-28 13:22:57 +04:00
Pavel Chipiga 5e3addd5d2 Great refactor for cancan abilities. Remove product relations. Fix git abilities. Fix and refactor specs. Refs #85. Refactor issues controller to avoid serial_id problem. Fix links and routes. Fix minor bugs and translations. Fix specs. Refs #54 2011-12-28 04:59:05 +02:00
konstantin.grabar d3ba83135e [refs #54] Add some locales and interface fixes for issues 2011-12-27 17:18:25 +04:00
konstantin.grabar 8face9208e [refs #54] Add fixes and locales to subscribes 2011-12-27 16:35:31 +04:00
konstantin.grabar ce6746f7a9 [refs #54] Add subscribes and notifications 2011-12-26 19:48:57 +04:00
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04:00
konstantin.grabar bf2f3d1bc7 [refs #54] Add issue statuses filters 2011-12-23 18:34:32 +04:00
Pavel Chipiga a82f59f35a Add route, action and statuses for publish_build. Apply status assign and check. Localize statuses. Convert tabs to spaces. Refs #80 2011-12-22 02:53:55 +02:00
Pavel Chipiga 2c67843c34 Refactor and cleanup build_lists controller and routes. Rename methods. Allow deffis in platform and repository name. Add missing relation and migration to force work user assign in build_lists. Fix and simplify links. Abstract sidebar. Refs #65 2011-12-21 23:42:06 +02:00
Pavel Chipiga e588482f32 [#74] Merge branch 'master' into 65-build_repo
Conflicts:
	app/controllers/build_lists_controller.rb
	app/controllers/projects_controller.rb
	db/schema.rb
2011-12-21 20:13:57 +02:00
Pavel Chipiga d901426b79 Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65 2011-12-21 16:01:50 +02:00
George Vinogradov 39dade9945 [closed #63] Added user column to build_list. 2011-12-20 21:09:29 +04:00
konstantin.grabar 375c98366f [ref #54] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments 2011-12-20 20:57:34 +04:00
konstantin.grabar 446cdac8e6 [refs #54] Add new locales. Fix routes. Fix issues and comments update 2011-12-20 14:20:00 +04:00
konstantin.grabar 58cfe07124 [refs #56] Change project build page title 2011-12-16 11:59:34 +04:00
konstantin.grabar b3f422e713 [refs #32] Add user filter 2011-12-15 20:15:25 +04:00
George Vinogradov 1b3e473b94 [closed #20] Changed adding collaborators to project
Changed collaborators page of project:
  *  Added form to input group and/or project nickname.
  *  In tables show only projects/groups that already added to project
2011-12-14 19:52:47 +04:00
Pasha 2edf0ad172 Merge pull request #44 from warpc/tuning_monitoring_view
Tuning monitring view
2011-12-14 05:34:34 -08:00
Vladimir Sharshov 7614d027a6 Reordered search by id and name;
Change localization for project_name_search.
Fix wrong label for field
2011-12-14 17:11:40 +04:00
Vladimir Sharshov 9ab07c1675 Merge pull request #36 from warpc/platform_edit
Edit platform;
Added callback updates with new owner.
Added a button for call edit action;
Removed unnecessary to edit platform form field when you upgrade.
2011-12-14 03:15:41 -08:00
Vladimir Sharshov 1d55e8758e Merge pull request #26 from warpc/platform_admin_fixes
Fix autocomplete. Rsync stubs for development env. Blocked problematic validation for development env
2011-12-14 02:00:01 -08:00
konstantin.grabar 4a723369a2 [refs #12] Add platform update options 2011-12-13 17:27:27 +04:00
santaux 24766d2383 Merge pull request #14 from warpc/group_members_change
Changed adding members to group.
2011-12-13 02:16:37 -08:00
Vladimir Sharshov 842a74d000 #24. Fix translation missing: ru.layout.build_lists.items.statuses.build_started 2011-12-12 21:03:13 +04:00
George Vinogradov 5815ef46ec Merge pull request #25 from warpc/24-update_build_status
24 update build status
2011-12-12 07:54:33 -08:00
konstantin.grabar 6a364b73a6 [refs #12] Fix platform admin relations. Locales correction. Add validationa and rsync stubs. 2011-12-12 18:10:39 +04:00
Vladimir Sharshov 55c41ca306 Fix mistake in dependency_test_failed 2011-12-12 16:49:15 +04:00
Vladimir Sharshov cf18550cfb #24. Add new statuses and remove repetition 2011-12-12 16:34:20 +04:00
George Vinogradov 5c07046dac [updated #16] Fixed localization fauldnames. 2011-12-11 22:50:55 +04:00
George Vinogradov d2831da4b8 Issue #11 updated. Added check if user already added. 2011-12-10 21:26:57 +04:00
George Vinogradov 168e110169 [close #11] Changed adding members to group. 2011-12-10 03:40:13 +04:00
Vladimir Sharshov 5e3711505c Merge pull request #5 from warpc/build_lists_filter
New build lists filter (search by name and bs_id)
2011-12-08 14:17:03 -08:00
konstantin.grabar 0f855356ac [refs #6] Add sudo mount fixes. Rename ID Admin fields into platform form 2011-12-09 00:41:01 +04:00