Commit Graph

443 Commits

Author SHA1 Message Date
Pavel Chipiga 310f588621 Resolve conflict with User nickname and uname 2011-10-21 20:17:49 +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
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
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
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
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
George Vinogradov 76e8b52812 Changed DB structure. 2011-10-17 18:18:37 +04:00
Pavel Chipiga d57347648f Fix migration 2011-10-17 13:29:07 +03:00
Pavel Chipiga 5f705cdd0d Develop and apply event logging mechanism without source code modification and with localization. Apply events log display with pagination. Apply XML RPC requests stub for local test. Refactor. Refs #1828 2011-10-17 11:04:36 +03:00
George Vinogradov f76a3aee39 Added groups representation. 2011-10-17 00:48:02 +04:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +04:00
George Vinogradov 229b4bb3f4 Created new models and provided relationships between them. 2011-10-13 19:55:03 +04:00
Pavel Chipiga 77e03df70b Refactor gemfile and upgrade rails, devise and other gems, fix conflicts, remove deprecations. Implement user classic registration and registration through omniauth OpenId. Allow user enter correct nickname and change other info during registration through OpenId. Make login through nickname or email. Apply profile edit form. Dont ask current password for profile update. Fix layout and devise links. Refs #1954 2011-10-11 23:56:51 +03:00
Timothy N. Tsvetkov c927abd073 added crontab to products without translations and setting values to generator form for existing crontab line 2011-04-28 18:32:11 +04:00
Timothy N. Tsvetkov 577cb2e126 added platform cloning and system_wide flag 2011-04-14 21:04:32 +04:00
Alexey Nayden 856b93d3d8 Product management. Step 2 2011-04-14 11:23:08 +04:00
Alexey Nayden 231771890e Confilict resolve 2011-04-11 20:57:43 +04:00
Alexey Nayden dce4e76da1 Product management. Step 1 2011-04-11 20:55:52 +04:00
Timothy N. Tsvetkov 1a6330956b build list creation 2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov e3b12e4a1a merge 2011-04-11 14:52:37 +04:00
Timothy N. Tsvetkov 82869f57a7 build list items and more statuses 2011-04-11 14:47:57 +04:00
Alexey Nayden cd6e7ade15 Product Builder xml-rpc and Product model 2011-04-11 12:35:08 +04:00
Timothy N. Tsvetkov 62d0985fcb more methods fot build lists, added is_circle build flag 2011-04-07 18:56:28 +04:00
Timothy N. Tsvetkov 4ac5931f44 fixes + build lists 2011-04-07 17:20:21 +04:00
Alexey Nayden 3350d420d3 fixed user seeds 2011-03-30 02:16:04 +04:00
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Alexey Nayden 002dc417b5 Container/Arch/Rpm 2011-03-16 00:52:27 +03:00
Alexey Nayden c1ff6dcc05 Arch, container and rpm models 2011-03-12 17:15:30 +03:00
Alexey Nayden 7896c4e7d3 Container model 2011-03-12 16:35:00 +03:00
Alexey Nayden 80304ef7f2 Trying to add repositories to my hierarchy 2011-03-11 19:08:41 +03:00
Alexey Nayden 5ce300adb9 Directory creation for projects/platforms 2011-03-11 13:25:50 +03:00
Alexey Nayden 1847779319 Seed task for projects and platforms 2011-03-10 16:45:19 +03:00
Alexey Nayden af3c9b52be Hoptoad + blank platforms#index 2011-03-09 22:27:51 +03:00
Alexey Nayden 0218f5dfd0 Platform and Project core models 2011-03-09 20:38:21 +03:00
Alexey Nayden d3fd18a700 Device users 2011-03-09 19:16:48 +03:00
Alexey Nayden eae3c46912 Initial commit 2011-03-09 16:13:36 +03:00