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

2685 Commits

Author SHA1 Message Date
Vladimir Sharshov 0b6e5ec51a Merge branch 'master' of github.com:warpc/rosa-build 
Conflicts:
	app/models/user.rb
 2011-10-24 17:23:53 +04:00
George Vinogradov 09ef860e0e Removed registartion 2011-10-24 17:20:24 +04:00
George Vinogradov 33e9d5e4c3 Removed registartion 2011-10-24 17:18:08 +04:00
George Vinogradov bc761b4ef3 Added authenticate filters. 2011-10-24 17:01:15 +04:00
George Vinogradov 51ed1f3bab Merge branch 'master' of github.com:warpc/rosa-build 2011-10-24 14:48:07 +04:00
George Vinogradov c7b6b45810 Added roles_to and rights_to method to controllers 2011-10-24 14:47:32 +04:00
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +04:00
konstantin.grabar 7053333296 [refs #1832] Change downloads controller routes to statistics 2011-10-24 14:27:00 +04:00
konstantin.grabar d04de6e2fc [refs #1832] Fixed git repos web interface routes 2011-10-24 14:19:04 +04:00
Ilya Krasilnikov f5033a224c XML-PRC controller 2011-10-24 05:59:16 +04:00
Ilya Krasilnikov 3915da75d4 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-24 05:55:16 +04:00
Ilya Krasilnikov ba617742a3 XML-PRC controller v1 2011-10-24 05:55:03 +04:00
George Vinogradov 82d72a851c ACL for testing. 2011-10-24 01:39:44 +04:00
konstantin.grabar 5a5529ba3e [refs #1832] Build list process fixes 2011-10-23 15:24:46 +04:00
konstantin.grabar d047e3f2b2 [refs #1832] Replace branches to tags in the project 2011-10-23 14:34:42 +04:00
konstantin.grabar 59bfac2be7 [refs #1832] Add some fixes to controllers. Add JS validation to project build 2011-10-23 11:37:54 +04:00
konstantin.grabar 56df3d05b0 [refs #1832] Fix build lists controller and some templates 2011-10-23 10:49:56 +04:00
George Vinogradov 54c7c80af8 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-22 19:57:26 +04:00
konstantin.grabar c24a9fae1b [refs #1832] Build Lists updates. Project updates and fixes. 2011-10-22 19:28:41 +04:00
Pavel Chipiga 310f588621 Resolve conflict with User nickname and uname 2011-10-21 20:17:49 +03:00
George Vinogradov a69b55502d Added specs form merged branches 2011-10-21 19:41:03 +04:00
George Vinogradov 600a897490 Added route to roles controller. 2011-10-21 19:39:32 +04:00
Pavel Chipiga b61797e896 Merge branch 'easy_urpmi' 
Conflicts:
	app/controllers/application_controller.rb
 2011-10-21 17:57:29 +03:00
Pavel Chipiga 644d57b420 Merge branch 'catalog' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/views/layouts/application.html.haml
	app/views/repositories/show.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
 2011-10-21 17:55:41 +03:00
Pavel Chipiga 559f3d2ee9 Fix bug and refactor role relation. Apply platforms JSON display in supplied format. Refs #1959 2011-10-20 23:23:38 +03:00
George Vinogradov 5b5761e80e Fixed some bugs. 2011-10-20 21:01:01 +04:00
George Vinogradov 505cb74c34 Merge branch 'itima_web_refactoring' 
Conflicts:
	app/models/user.rb
 2011-10-20 20:00:52 +04:00
George Vinogradov a92282de1e Merge branch 'chipiga' 
Conflicts:
	app/controllers/application_controller.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	db/schema.rb
 2011-10-20 19:55:03 +04:00
George Vinogradov 1659ad5805 Merge branch 'private_repos' 
Conflicts:
	config/application.yml.sample
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
 2011-10-20 19:49:35 +04:00
George Vinogradov 2dd99d32f9 Merge branch 'downloads' 
First turn of merging.

Conflicts:
	.gitignore
	Gemfile
	Gemfile.lock
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
 2011-10-20 19:22:11 +04:00
George Vinogradov 5732e999b1 Finished merging of master with itima_web_refactoring 2011-10-20 18:05:06 +04:00
Pavel Chipiga 5291752419 Add categories and apply basic CRUD actions. Add category link and description to project. Apply category assign to project. Apply categorization with platforms. Integrate to common design and layout. Import basic categories structure. Refs #1858 2011-10-19 23:58:31 +03:00
Toljio b84ab42d00 add extension actions, model role_relations 2011-10-20 00:19:45 +04:00
George Vinogradov ff36b1fdd3 Merge branch 'itima_web_refactoring' 
Conflicts:
	Gemfile
	Gemfile.lock
	app/models/user.rb
	app/views/layouts/application.html.haml
	config/locales/ru.yml
	config/routes.rb
	db/schema.rb
 2011-10-19 18:09:58 +04:00
George Vinogradov 126e9e1db1 Merge branch 'itima_web_refactoring' of github.com:warpc/rosa-build into itima_web_refactoring 
Conflicts:
	app/models/platform.rb
 2011-10-19 17:23:23 +04:00
George Vinogradov ee9af32fa6 Adding projects to repositories. 2011-10-19 17:16:29 +04:00
George Vinogradov 7ef909afbb Changed some models. 2011-10-19 17:14:53 +04:00
Toljio e5438b29bc change roles/rights 2011-10-18 22:32:08 +04:00
George Vinogradov f7ff112087 Finished models. 2011-10-18 19:07:09 +04:00
George Vinogradov b4c199c1b8 Finished models. 2011-10-18 19:00:06 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
Pavel Chipiga 099120e71b Fix bugs. Refs #1858 2011-10-17 19:07:53 +03:00
George Vinogradov 3c31bdf29c Changed Platforms representation 2011-10-17 18:27:07 +04:00
George Vinogradov 6d065ea01c Changed routes and added some translations 2011-10-17 18:24:45 +04:00
George Vinogradov 0d10c50710 Changed representation of Users 2011-10-17 18:23:51 +04:00
George Vinogradov b1a801f7f9 Added search form and changed group representation 2011-10-17 18:22:30 +04:00
George Vinogradov 5a6248c1af Changed representation of Projects 2011-10-17 18:21:29 +04:00
George Vinogradov 75cd0c7ae6 Changed representation of Repositories. 2011-10-17 18:20:35 +04:00
George Vinogradov 76e8b52812 Changed DB structure. 2011-10-17 18:18:37 +04:00
George Vinogradov ff5aa09c30 Added method to determine current acter (group or user) 2011-10-17 18:16:21 +04:00