Commit Graph

566 Commits

Author SHA1 Message Date
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
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 fa3359b025 Some changes in representation 2011-10-17 00:50:56 +04:00
George Vinogradov e672c20d3f Some new translations 2011-10-17 00:49:55 +04:00
George Vinogradov d7cddecbe8 Changed User representation. 2011-10-17 00:49:41 +04: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 91cc89d31c Some fixed bugs in models.
Fixed: Project, Repository
2011-10-14 02:35:16 +04:00
George Vinogradov 229b4bb3f4 Created new models and provided relationships between them. 2011-10-13 19:55:03 +04:00
Pavel Chipiga 0efa8c83a2 Fix nickname format check. Apply readonly nickname field. Show flash notice during registration through OpenID. Fix email read from OpenID response. Refs #1954 2011-10-13 13:19:42 +03: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
Vladimir Sharshov f3d32273d8 Support Airbrake account 2011-09-29 17:24:33 +04:00
Vladimir Sharshov ef8dd8f7f6 Show button only if status is succeed
Add additional check in model
2011-09-16 18:15:50 +04:00
Vladimir Sharshov 25c8a4ab62 Fix undefined method 'publish_platform_repository_project_build_list' 2011-09-16 18:01:55 +04:00
Vladimir Sharshov 02a9a46b60 Add publish function for BuildList 2011-09-15 21:56:20 +04:00
Vladimir Sharshov 2aae25a41b Add new items to .gitignore 2011-09-15 21:54:59 +04:00
Vladimir Sharshov b2b7382613 Update BuildServer
- Change xml-rpc call function (add_build_list).
  Add id, that identify project new_bbbt and assign bs_id
- Add find_build_list_by_bs  to post_build call
2011-09-05 18:40:49 +04:00
Alexey Nayden b25a174613 Clone confirm translation 2011-06-01 15:08:16 +04:00
Alexey Nayden 232eb9461e Platform clone ui 2011-05-30 13:04:32 +04:00