Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
1,218 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

130 Commits

Author SHA1 Message Date
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki 
Conflicts:
	app/models/project.rb
	config/locales/en.yml
 2012-02-03 00:55:16 +04:00
Vladimir Sharshov 8562b882da Merge pull request #136 from warpc/114-comment_notifications 
Notifications and subscribtions about new comments in commit [Refs #114]
 2012-02-01 11:12:24 -08:00
George Vinogradov d0717c8f9e [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	Gemfile.lock
	db/schema.rb
 2012-02-01 22:39:04 +04:00
konstantin.grabar 502f06b65f [refs #127] Make route more short 2012-02-01 22:13:42 +04:00
konstantin.grabar 0559f1b678 [refs #127] Filter request refactor 2012-02-01 20:00:19 +04:00
Alexander Machehin f15cb90b87 Merge branch 'master' into 114-comment_notifications 
Conflicts:
	config/locales/ru.yml
 2012-01-31 21:42:37 +06:00
George Vinogradov 24124766f4 [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	Gemfile.lock
	config/locales/en.yml
	db/schema.rb
 2012-01-31 02:07:11 +04:00
Pavel Chipiga 13780a1b53 Add magic encodings. Refs #95 2012-01-30 22:39:34 +02:00
Alexander Machehin e0b7699ffd Revert "Merge branch '114-comment_notifications' into user-emails-list" 
This reverts commit 2179cbbf40334cbe5d4fa9ba3a7f297d8f543a0a, reversing
changes made to 9bf06e5e1a595f320dc4527ebd44f14be05fcd64.

Conflicts:

	app/models/user.rb
 2012-01-30 12:22:54 +06:00
Alexander Machehin f6b6bbfb54 Revert "[refs #114] emails control" 
This reverts commit 26fb1fcbfb843163231d8b8f0caf582bafccbe57.

Conflicts:

	app/models/subscribe.rb
	app/models/user.rb
	spec/models/comment_for_commit_spec.rb
 2012-01-30 12:19:54 +06:00
Alexander Machehin dc39eefe62 Revert "[refs #114] add js" 
This reverts commit 48a9c4d50b9f11a11cc4f2c5831c4b5b25fdc4d1.
 2012-01-30 12:16:09 +06:00
George Vinogradov acdd1f22b6 [issue #64] Fixed bug with revert all wiki. 2012-01-28 16:10:43 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
 2012-01-27 18:27:23 +04:00
Alexander Machehin 06ab99a1d0 [refs #114] add js 2012-01-27 18:20:07 +06:00
Alexander Machehin e71a9e84cb [refs #114] emails control 2012-01-27 02:11:07 +06:00
Alexander Machehin e04b2eb59b Merge branch '114-comment_notifications' into user-emails-list 
Conflicts:
	app/models/subscribe.rb
	config/locales/en.yml
 2012-01-26 14:55:16 +06:00
Alexander Machehin 77420d2a8f [refs #114] user emails 2012-01-26 14:53:40 +06:00
George Vinogradov 45877e8b5c [issue #64] Bug fix & views refactoring 
*  Fixed bug with history
*  Navigation moved to partial.
 2012-01-25 00:47:55 +04:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
George Vinogradov 230c25eefd [issue #64] Some changes. 
*  WikiController#compare splitted into WikiController#compare
   and WikiController#compate_wiki
*  Show only last 30 versions in history.
 2012-01-23 16:45:38 +04:00
George Vinogradov 364f2e40c0 [issue #64] Added Wiki history, compare, revert. 2012-01-20 03:25:15 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
George Vinogradov 0c527af291 [issue #64] Added revisions comparsion. 2012-01-19 17:49:32 +04:00
George Vinogradov 51e9b5d1f6 [issue #64] Some changes in views and routes. 2012-01-18 02:28:59 +04: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
George Vinogradov 1e1dab369b [issue #64] Added some views, styles and scripts. 
*  Added base gollum styles
*  Added base gollum javascripts (with minor changes)
*  Fixed some bugs in WikiController
*  Added some views (draft yet)
 2012-01-17 01:48:38 +04: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
George Vinogradov 729bd94045 [issue #64] Merge branch 'master' into 64-project_wiki 
Conflicts:
	config/routes.rb
	db/schema.rb
 2012-01-13 18:05:42 +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
Alexander Machehin 07dc7a4800 [refs #18] add comments to commit 2012-01-12 17:19:22 +06:00
konstantin.grabar 2b8aca5f09 [refs #54] Add settings notifier 2012-01-11 17:58:13 +04:00
George Vinogradov 7c50b2c3f5 [issue #76] Added jQuery DataTable. But it doesn't work yet 2011-12-31 02:42:58 +04:00
konstantin.grabar a44530980e [refs #54] Remove some unnessacary comments 2011-12-30 18:44:47 +04:00
konstantin.grabar fa8656d1f5 [refs #54] Refactor subscires routes and authorize 2011-12-28 17:54:45 +04:00
konstantin.grabar 1c263c6e0a [refs #54] Notification DJ support. Routes fixes. 2011-12-28 14:47:54 +04: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
George Vinogradov ec95373d28 [#issue 64] Routes to Wiki and some methods in controller. 
Useless yet.
 2011-12-26 21:07:16 +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
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
konstantin.grabar 3ab55d34b8 [refs #54] Add CanCan rules for issues and comments. Fix serial_id routes and some actions 2011-12-21 18:48:16 +04: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 6c48e058be [close #70] Removed all & filter methods in BuildListsController 
*  Removed methods
*  Changed abilities
*  Changed routes
*  Added specs
 2011-12-21 05:30:34 +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 d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +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