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

123 Commits

Author SHA1 Message Date
Pavel Chipiga b957600eda Merge branch 'master' into 263-refactoring 
Conflicts:
	app/models/project.rb
	app/views/projects/_repo_block.html.haml
	db/schema.rb
	spec/controllers/issues_controller_spec.rb
	spec/controllers/projects_controller_spec.rb
 2012-05-01 15:54:13 +03:00
George Vinogradov de093d7065 [issue #425] Changed object to actor in Relation and to eventable in 
EventLog
 2012-04-26 05:38:33 +04:00
Pavel Chipiga 7af06cc7ab Downgrade unicorn. Fix project fork. Fix reserved_names validator. Add comments, cleanup code and refactor. Fix some bugs. Redo specs project URLs. Refs #263 2012-04-23 23:55:42 +03:00
Pavel Chipiga c0d2d67c73 Merge branch 'master' into 263-refactoring 
Conflicts:
	Gemfile
	Gemfile.lock
	config/routes.rb
 2012-04-23 17:58:45 +03:00
Pavel Chipiga 701da7e1f9 Disable bluepill. Update gems. Github project style URLs. Fix project load. Fix abilities. Fic urls generation. Fix some specs. Refs #263 2012-04-19 22:45:50 +03:00
George Vinogradov 510b0c0c50 [issue #347] Merge branch 'master' into 347-javascript_refactoring 
Conflicts:
	app/assets/stylesheets/design/custom.scss
	app/models/group.rb
	app/models/user.rb
 2012-04-19 19:32:11 +04:00
konstantin.grabar 8ef020427d [refs #396] Add token auth for atom feed 2012-04-18 16:46:09 +04:00
George Vinogradov 442b44a68e [issue #347] Added not_member_of scope. Added ActsLikeMember module 2012-04-10 19:45:38 +04:00
Pavel Chipiga a9ecc683f2 Fix search bug. Write anonymous read specs for issues and search controllers. Refs #263 2012-04-05 20:11:02 +03:00
George Vinogradov 7234cb7f99 [issue #195] Changed scopes. 2012-03-31 03:13:09 +04:00
George Vinogradov 0c09568d74 [issue #195] Merge branch 'master' into 195-new_design_for_projects 
Conflicts:
	app/models/group.rb
	app/models/user.rb
 2012-03-31 02:48:44 +04:00
George Vinogradov 71c1a4afcf [issue #195] Owner removed from list of collaborators when editing list 2012-03-31 02:45:05 +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
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
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
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
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 5c408540ff [refs #270] can ban user 2012-03-21 02:06:51 +06:00
Alexander Machehin d5dc05233f [refs #252] fixed appeal to user 2012-03-19 20:34:57 +06:00
George Vinogradov 747edb73a5 [issue #279] Merge branch '3.2-master' into 279-new_design_for_platforms 
Conflicts:
	db/schema.rb
 2012-03-14 21:43:08 +04:00
Alexander Machehin b93032e226 [refs #265] fixed avatar sizes 2012-03-14 00:53:37 +06:00
Alexander Machehin f6dd072a24 Merge branch '3.2-master' into 257-new_design_for_profiles 
Conflicts:
	config/locales/users.en.yml
	config/locales/users.ru.yml
 2012-03-12 23:04:31 +06:00
Alexander Machehin 843d95b64e [refs #257] fixed 'big' geometry 2012-03-12 23:02:02 +06:00
Alexander Machehin 4fd91e2bfe [refs #257] force convert avatar to jpg 2012-03-12 22:28:56 +06:00
George Vinogradov 535c075d3e [issue #279] Added platform main page, menu & sidebar 2012-03-12 03:08:50 +04:00
Pavel Chipiga 1cf2660cda Fix search order. Refs #255 2012-03-08 02:32:12 +02: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
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
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 9b68752ffd [refs #257] Change avatar helper and logic. Add paperclip avatar to users 2012-03-03 22:05:02 +04:00
konstantin.grabar f58e24b134 [refs #257] User edit pages fixes 2012-03-03 20:03:23 +04: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
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
Alexander Machehin bc4a157703 Merge branch '3.2-master' into 194-tracker 
Conflicts:
	app/assets/stylesheets/application.scss
	app/views/issues/_form.html.haml
	app/views/platforms/show.html.haml
 2012-02-28 20:13:08 +06:00
Pavel Chipiga 159ef26b38 Merge branch 'master' into 3.2-master 
Conflicts:
	app/views/wiki/_compare.html.haml
	app/views/wiki/_diff_data.html.haml
	db/schema.rb
 2012-02-27 22:32:57 +02:00
Pavel Chipiga 5e58ec9e59 Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-24 19:27:58 +04:00
Pavel Chipiga ed60751dfa Delegate all repo abilities to platform. Remove repository owner and relations. Fix templates and specs. Refactor and code cleanup. Refs #205 2012-02-21 01:13:05 +02:00
Alexander Machehin 76beb6a277 [refs #194] add creator to issue 2012-02-19 23:28:43 +06:00
Alexander Machehin da0d791f74 [refs #96] fixed commentable & subscribeable ids 2012-02-15 02:28:01 +06:00
konstantin.grabar 5039907431 Merge branch 'master' into 123-activity-feed 2012-02-14 14:30:27 +04:00