Commit Graph

241 Commits

Author SHA1 Message Date
Vladimir Sharshov a7563eb2f7 Fix for non save platforms. Uncomment and more fields or leave it as is. 2011-10-27 20:52:07 +04:00
George Vinogradov 6a0092bbb6 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-27 20:32:26 +04:00
George Vinogradov 98f300302d Added distr_type to platform. 2011-10-27 20:31:54 +04:00
konstantin.grabar 9e966667e7 Fix XML-RPC calls nad root_path config parameter 2011-10-27 19:20:49 +04:00
George Vinogradov 37c37f5cbd Merge branch 'master' of github.com:warpc/rosa-build 2011-10-27 18:49:14 +04:00
konstantin.grabar 89312375fd Merge master and personal_repos 2011-10-27 17:13:53 +04:00
konstantin.grabar 3114eb1ecc [refs #2106] Add personal repos to project. Some changes of private repos controller and logic 2011-10-27 17:04:03 +04:00
Pavel Chipiga 857ae7621a Merge branch 'gitolito' 2011-10-27 15:50:21 +03:00
Pavel Chipiga 7b9fa26ac8 Remove git_projects_path application config var. usr root_path instead. Fix bugs. Improve links, usability, refactor. Refs #2136 2011-10-27 15:49:26 +03:00
Pavel Chipiga a470f01690 Move easy_urpmi json integration to separate action. Do not require authentication. Change name to unixname, improve URL generation. Refs #1959 2011-10-27 14:02:25 +03:00
konstantin.grabar 7fd5f3484f [refs #2109] Fix bug with edit user href 2011-10-27 13:30:38 +04:00
konstantin.grabar 879b7acf8e [refs #2109] Fixed platform editing 2011-10-27 13:30:38 +04:00
George Vinogradov d932999b8c Fixed bug in determining visibility of object 2011-10-27 01:14:16 +04:00
Pavel Chipiga 0171a0a42a Apply basic git repo functionality operation: add, change, destroy user ssh_key. Create, destroy, open/close project git repos. Calc project owner. Improve UI for users, groups and projects: fix links and routes, add actions refactor. Other minor fixes and refactoring. Add ssh_key uniqness check. Add uname uniqness check between User and Group. Check project owner ssh_key existance before project creation. Temporary disable uname and unixname change due to gitolite stranges. Refs #2136 2011-10-26 23:57:51 +03:00
George Vinogradov a8594b433f Fix loading from dump in Roles model. 2011-10-26 17:26:10 +04:00
George Vinogradov 26f405fccd Removed old methods from ApplicationController 2011-10-26 15:01:09 +04:00
George Vinogradov f2ac7b3cc9 Turned on user registration 2011-10-26 13:31:58 +04:00
George Vinogradov fa1f7afd34 Added rights checking to top menu. 2011-10-26 04:36:30 +04:00
George Vinogradov 02a8a62f36 Added dump to yml and load from yml abilities for roles. 2011-10-26 04:35:01 +04:00
konstantin.grabar d4d43f3be1 [refs #2109] Change XML-RPC call for build list 2011-10-25 19:17:35 +04:00
George Vinogradov 09ef860e0e Removed registartion 2011-10-24 17:20:24 +04:00
George Vinogradov bc761b4ef3 Added authenticate filters. 2011-10-24 17:01:15 +04:00
konstantin.grabar 9c182f0bda Merge master and build_lists_queue 2011-10-24 14:40:36 +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
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
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
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