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

2207 Commits

Author SHA1 Message Date
Vladimir Sharshov 09a3d46303 Merge pull request #321 from warpc/270-user_control 
[Refs #270] Admin user control (include ban, protect from mass assigment)
 2012-03-22 08:41:07 -07:00
Alexander Machehin 071c391a6e Merge branch '3.2-master' into 270-user_control 
Conflicts:
	app/assets/stylesheets/design/custom.scss
 2012-03-22 21:15:10 +06:00
Vladimir Sharshov a85ce1d1f7 Merge pull request #332 from warpc/195-new_design_for_projects 
[Refs #195] new design for projects (support group as collaborators)
 2012-03-22 08:08:26 -07:00
Vladimir Sharshov ad39598823 Merge pull request #328 from warpc/325-new_error_pages_design 
[refs #325] Add new design for error pages
 2012-03-22 08:06:28 -07:00
George Vinogradov efd46249ed [issue #195] Fixed merge artefact 2012-03-22 18:53:06 +04:00
Alexander Machehin 23eeb1cae7 [refs #270] changes in ban 2012-03-22 20:50:15 +06:00
George Vinogradov 9f23cf7727 [issue #195] Merge branch '3.2-master' into 195-new_design_for_projects 
Conflicts:
	app/views/projects/_sidebar.html.haml
 2012-03-22 18:15:57 +04:00
George Vinogradov 524fa2302f [issue #279] Changed buttons alignment. 2012-03-22 17:53:35 +04:00
konstantin.grabar 385bd8034b [refs #263] Fix projects#index 2012-03-22 17:30:01 +04:00
konstantin.grabar f354c53709 [refs #263] Merge 3.2-master into 263-refactoring 2012-03-22 17:28:09 +04:00
konstantin.grabar 8f9824f176 [refs #325] Fix error pages titles 2012-03-22 17:18:40 +04:00
konstantin.grabar c6eb68e903 [refs #325] Fixes descripton styles for project page into main css 2012-03-22 16:31:39 +04:00
konstantin.grabar 9cee7d97db [refs #325] Remove unnessecary scripts including form error pages 2012-03-22 16:17:46 +04:00
konstantin.grabar b7defd90f1 [refs #263] Remove unnessacesary projecsts#show action and test for it 2012-03-22 16:16:11 +04:00
Alexander Machehin fcc1fad0d1 [refs #270] fixed translations 2012-03-22 18:00:34 +06:00
Alexander Machehin 787eed92a3 [refs #270] removed ssh_key 2012-03-22 17:47:56 +06:00
Vladimir Sharshov 57520c6098 Merge pull request #330 from warpc/265-activity_feed_messages 
[Refs #265, #263]  fixed tests to issue comments
 2012-03-22 04:47:55 -07:00
Alexander Machehin 71f1822fce [refs #270] some refactoring 2012-03-22 17:17:11 +06:00
Vladimir Sharshov bfbd57d788 Merge pull request #329 from warpc/194-tests 
[refs #194] fixed mailer tests
 2012-03-22 04:03:33 -07:00
Alexander Machehin 9d6960fab8 [refs #265] some changes 2012-03-22 16:19:21 +06:00
Alexander Machehin 6d330d9164 [refs #265] fixed tests to issue comments 2012-03-22 16:16:31 +06:00
konstantin.grabar 5b1db0e041 [refs #263] Fix broken projects#show test and action 2012-03-22 14:13:56 +04:00
Alexander Machehin 600eeeb4d7 [refs #194] fixed mailer tests 2012-03-22 15:12:22 +06:00
Alexander Machehin b0eeb4f260 [refs #270] fix some errors 2012-03-22 14:48:33 +06:00
konstantin.grabar 21c33b384b [refs #325] Add new design to error pages 2012-03-22 11:16:56 +04:00
George Vinogradov 9e31ae75b1 [issue #195] Added groups support to project. 2012-03-22 04:44:05 +04:00
George Vinogradov 401e570dc7 [issue #195] Change projects/sidebar to be more standart. 2012-03-22 04:42:56 +04:00
Vladimir Sharshov 74575c0ca1 Merge pull request #326 from warpc/190-encodings 
[Refs #190]
- Minor gems update
- Prepare gemfile for jruby and rbi tests
- Remove encoding hacks
- Apply grit fixes for encoding support
- Recode incorrect encodings
- Refactor, cleanup and fix lots bugs in git section
- Refactor and remove unused git routes
- Translate some untranslated parts
- Redo branch/tags selector
- Fix files tree last commit message
- Project section templates refactor and cleanup
 2012-03-21 15:17:19 -07:00
Pavel Chipiga 2db7726d55 Merge branch '3.2-master' into 190-encodings 
Conflicts:
	db/schema.rb
 2012-03-22 00:13:18 +02:00
Vladimir Sharshov 2571a75a3f Merge pull request #327 from warpc/195-new_design_for_projects 
[Refs #195] Fixed avatar in commits & comments
 2012-03-21 15:08:29 -07:00
George Vinogradov 65e4e0f748 [issue #195] use avatar_url_by_email instead of gravatar_url 2012-03-22 02:06:33 +04:00
Pavel Chipiga 90e027b8a6 Remove old project load. Fix project routes. Fix wiki history avatar load. Refs #190 2012-03-21 23:52:40 +02:00
George Vinogradov b902d8effe [issue #195] Fixed avatar in commits & comments 2012-03-22 01:51:39 +04:00
Alexander Machehin baf7fdac04 [refs #270] fix translation 2012-03-22 02:10:40 +06:00
Alexander Machehin 867d678dc4 [refs #270] some users tests 2012-03-22 02:05:27 +06:00
Pavel Chipiga 89f31e9782 Minor gems update. Prepare gemfile for jruby and rbx tests. Remove encoding hacks. Apply grit fixes for encoding support. Recode incorrect encodings. Refactor, cleanup and fix lots bugs in git section. Refactor and remove unused git routes. Translate some untranslated parts. Redo branch/tags selector. Fix files tree last commit message. Project section templates refactor and cleanup. Refs #190 2012-03-21 21:55:14 +02:00
Vladimir Sharshov 87e1ee4700 Merge pull request #317 from warpc/232-groups_tests 
[refs #232] Add groups tests and mass assignment protect
 2012-03-21 12:06:00 -07:00
Alexander Machehin bf1340939b [refs #270] fixed users filtration 2012-03-22 00:02:58 +06:00
Alexander Machehin a562219706 [refs #270] some fixes when creating new user 2012-03-21 23:52:27 +06:00
Alexander Machehin a6a5b722d2 [refs #270] use devise lockable to ban 2012-03-21 23:45:51 +06:00
Vladimir Sharshov ee867aa8d4 Merge pull request #324 from warpc/200-new_build_repos_rules 
[refs #200] Fix chbx behaviour for repos and their platforms
 2012-03-21 08:06:54 -07:00
konstantin.grabar 5abf64e353 [refs #200] Fix chbx behaviour for repos and their platforms 2012-03-21 19:04:01 +04:00
konstantin.grabar 72c02282aa [refs #232] Add mass-assignment fixes. Add create and mass-assig tests. 2012-03-21 17:52:35 +04: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
Vladimir Sharshov 81d18b5337 Merge pull request #323 from warpc/200-new_build_repos_rules 
[Refs #200] Move some fields to rights part of the form. Hide empty platform. Fix checkbox checking on build list form.
 2012-03-21 05:17:23 -07:00
konstantin.grabar e6622d29ea [refs #200] Remove unused code 2012-03-21 15:53:54 +04:00
konstantin.grabar f9850c6885 [refs #200] Fix checkbox checking on build list form 2012-03-21 15:34:11 +04:00
Vladimir Sharshov 2df89c6ae3 Merge branch '3.2-master' of github.com:warpc/rosa-build into 3.2-master 2012-03-21 14:50:38 +04:00
Vladimir Sharshov 375aa7e74e Merge pull request #322 from warpc/265-activity_feed_messages 
[refs #265] add ajax to older messages
 2012-03-21 03:50:25 -07:00