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

526 Commits

Author SHA1 Message Date
Alexander Machehin 6d5120e5cc Merge branch '3.2-master' into 265-new_design_for_activity_feed 2012-03-11 22:44:25 +06:00
Alexander Machehin 66b57f7a0a [refs #265] fixed issue assignee 2012-03-11 17:56:56 +06:00
Pavel Chipiga 1cf2660cda Fix search order. Refs #255 2012-03-08 02:32:12 +02:00
Pavel Chipiga 41cd1ddaf3 Redo cusel assign to avoid side effects. Refactor and cleanup projects controller, routes, views. Apply new design and functionality for projcts list page. Add fork button and fix fork. Apply gap repo during repo fork. Apply attr_accessible for projects. Cleanup locales. Fix new_build link ability check. Refs #195 2012-03-07 23:34:49 +02:00
Vladimir Sharshov e49551756c Merge pull request #276 from warpc/194-issue_page 
[Refs #194] Fix for manage labels and executor
 2012-03-07 11:26:11 -08:00
Alexander Machehin de62aaad53 [refs #257] fix user update registration page 2012-03-08 00:47:19 +06:00
Alexander Machehin 185962890f [refs #194] issue executor 2012-03-07 22:27:12 +06:00
Alexander Machehin c657efc338 [refs #194] show all project labels without searching 2012-03-07 19:36:17 +06:00
Alexander Machehin 7588a318da Merge branch '3.2-master' into 265-new_design_for_activity_feed 
Conflicts:
	app/models/user.rb
 2012-03-07 03:58:35 +06:00
Alexander Machehin 13ba125dc0 [refs #265] add project_id to comment & fix email notification 2012-03-07 03:49:29 +06:00
Alexander Machehin 0f823bd9f3 [refs #265] fix security & commit to comments 2012-03-07 02:51:51 +06:00
Alexander Machehin 4b9d0616d6 Merge branch '3.2-master' into 194-issue_page 
Conflicts:
	app/views/issues/_create_sidebar.html.haml
 2012-03-07 01:19:34 +06:00
Pavel Chipiga 7308c4a0d2 Merge branch '3.2-master' into 255-search 
Refactor avatars. Fix user bugs. Remove ssh_key delete migration

Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/user.rb
 2012-03-06 20:59:29 +02:00
Alexander Machehin 8ae7ebee2b Merge branch '3.2-master' into 194-issue_page 2012-03-06 22:51:13 +06:00
Pavel Chipiga d6f9b2c3e9 Minor gems update. Apply search design and controller. Add and refactor search scopes. Fix relations. Separate and refactor search translations. Refactor search form. Refs #255 2012-03-06 17:53:04 +02:00
Alexander Machehin b9de81f4df [refs #194] managing labels in the issue 2012-03-06 21:21:13 +06:00
konstantin.grabar de6490346b [refs #257] Change error messages logic. Fix avatar ru translation 2012-03-06 15:24:42 +04:00
Vladimir Sharshov 91ba8b1543 [Refs #257] Fix password change, refactoring. 2012-03-05 19:36:23 +04:00
konstantin.grabar 73296059eb [refs #257] Merge 3.2-master into 257-new_design_for_profiles 2012-03-05 13:42:39 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04:00
konstantin.grabar ecff8d2d41 [refs #257] Add new design to notifier settings. Fix sidebar. Add edit btn to user profile 2012-03-03 13:23:30 +04:00
konstantin.grabar 0dc22bae82 [refs #257] Add new design for users edit and private settings edit. Add new fields and action. 2012-03-03 12:01:32 +04:00
Pavel Chipiga ce633f5838 Fix group owner. Refs #232 2012-03-03 03:34:24 +02:00
Pavel Chipiga a0f0c24f88 Fix flash messages. Add styles. Refs #263 2012-03-03 03:05:19 +02:00
Pavel Chipiga 159fbe65dc Re-add compass. Add flash messages design. Refactor and fix bugs after merge. Remove duplicates, sync and separate locales . Fix some specs. Refs #263 2012-03-03 02:28:27 +02:00
Pavel Chipiga a831a4aa63 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-03 01:43:14 +02:00
Pavel Chipiga 56a12dc9ea Merge branch 'master' into 3.2-master 
Conflicts:
	app/models/comment.rb
	app/models/issue.rb
	config/locales/en.yml
 2012-03-03 01:38:43 +02:00
Vladimir Sharshov 622d80c6d3 Merge pull request #261 from warpc/194-tracker 
[Refs #194] Fix ACL and tests for issues
 2012-03-02 11:48:10 -08:00
Alexander Machehin 7cd3e40efc [refs #194] fix accessible list 2012-03-03 01:23:45 +06:00
Alexander Machehin 319fcdad86 [refs #194] refactoring 2012-03-03 00:21:46 +06:00
Alexander Machehin c7b412c0e0 [refs #194] some refactoring 2012-03-02 23:38:00 +06:00
George Vinogradov 6522650c5a [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects 
Conflicts:
	app/views/git/blobs/_show.html.haml
 2012-03-02 20:58:28 +04:00
Alexander Machehin 41c0d1e856 [refs #194] fix security and tests 2012-03-02 22:52:15 +06:00
George Vinogradov b3750f8644 [issue #195] Fixed branch selector. 2012-03-02 20:48:19 +04:00
konstantin.grabar 8677fa7493 [refs #232] Remove name field 2012-03-02 14:39:48 +04:00
konstantin.grabar 3369953b4c [refs #232] Remove unused commented code from groups controller 2012-03-02 13:46:16 +04:00
konstantin.grabar 1700588b97 [refs #232] Merge 3.2-master into 232-new_groups_design 2012-03-02 13:44:54 +04:00
konstantin.grabar d376b55a57 [refs #232] Move groups locales to another files. Remove unsused commented code. On small sidebar fix 2012-03-02 12:47:16 +04:00
Pavel Chipiga 036dfb6dd5 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-02 02:04:04 +02:00
George Vinogradov 318dc72d29 [issue #195] Fixes. 
*  Added border to gutter in file preview
  *  Added "empty repo" message
  *  Fixed one of bugs with tree/branch selector
 2012-03-02 02:23:53 +04:00
Pavel Chipiga 7d112d0524 Fix build_lists bugs. Add build list display and new build list pages design, apply compass. Refactor and cleanup assets. Refactor abilities. Refactor build_list search. Improve layout_class helper. Change defaul build_lists index filter and fix specs. Fix assets path. Refs #223 2012-03-01 19:33:46 +02:00
konstantin.grabar eb689b7f18 [refs #232] Add new design and logic refactor for group members action 2012-03-01 19:41:40 +04:00
konstantin.grabar fc3d4c0b6d [refs #232] Add group members edit page design 2012-03-01 18:23:26 +04:00
konstantin.grabar 55ff2c7f6b [refs #195] Change new project route and some other changes 2012-03-01 16:10:12 +04:00
konstantin.grabar bc75b318ce [refs #195] Merge 3.2-master into 195-new_design_for_projects 2012-02-29 21:37:28 +04:00
konstantin.grabar 12d8f5e7b8 [refs #232] Add new design to some group pages 2012-02-29 21:12:06 +04:00
Vladimir Sharshov 05eac4918f Fix NoMethodError: undefined method `default_order' for ActiveRecord::Relation 2012-02-29 19:10:01 +04:00
konstantin.grabar c5d8041296 [refs #195] Add global fixes to projects and collaborators logic 2012-02-29 18:45:04 +04:00
Pavel Chipiga cefaa902b1 Apply new design for projects build monitoring page. Improve and refactor filters. Improve abilities. Switch off old statuses. Separate build_lists translations. Refactor and remove duplicate translations. Refactor and code cleanup. Fix specs. Apply layout class helper. Refs #223 2012-02-29 16:04:38 +02:00
konstantin.grabar 2ec2548390 [refs #195] Add base design and functional to project members page 2012-02-29 01:01:25 +04:00