Commit Graph

389 Commits

Author SHA1 Message Date
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 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
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 ee9af32fa6 Adding projects to repositories. 2011-10-19 17:16:29 +04:00
santaux 5f17928423 [refs #1923] Add private repositories to project 2011-10-18 17:47:17 +04:00
George Vinogradov 6d065ea01c Changed routes and added some translations 2011-10-17 18:24:45 +04: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 d7cddecbe8 Changed User representation. 2011-10-17 00:49:41 +04:00
santaux 8103b14e15 [refs #1861] Add downloads statistics 2011-10-14 10:35:25 +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
Vladimir Sharshov 02a9a46b60 Add publish function for BuildList 2011-09-15 21:56:20 +04:00
Alexey Nayden 232eb9461e Platform clone ui 2011-05-30 13:04:32 +04: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
Alexey Nayden a1bef617f9 route fix 2011-04-22 18:29:19 +04:00
Alexey Nayden eafd2c4b3c one more routes fix 2011-04-22 16:18:50 +04:00
Alexey Nayden 043fa5736d Routes fix 2011-04-22 15:39:26 +04:00
Timothy N. Tsvetkov fb2808b9e6 crontab generator without translations, because im in fucken ISRAELgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.hamlgit add app/controllers/crontabs_controller.rb app/views/crontabs/show.html.haml Shalom LEOLAM 2011-04-18 16:34:06 +04:00
Alexey Nayden 38cef4d887 Minor product fixes 2011-04-15 13:23:12 +04:00
Timothy N. Tsvetkov 577cb2e126 added platform cloning and system_wide flag 2011-04-14 21:04:32 +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
Timothy N. Tsvetkov 3b51d53225 freeze + spec 2011-03-17 17:47:16 +03:00
Timothy N. Tsvetkov 5bc5638934 friday fixes lets drink vodka for your money very well 2011-03-11 20:19:47 +03:00
Alexey Nayden 40b28e4a84 Trying to add repositories to my hierarchy (step 2) 2011-03-11 19:13:24 +03:00
Timothy N. Tsvetkov 82540c37a9 fixed routes for git 2011-03-11 13:26:29 +03:00
Timothy N. Tsvetkov 20af306073 git fixes 2011-03-11 13:06:14 +03:00
Timothy N. Tsvetkov a373af936b sample view for the project 2011-03-10 17:20:09 +03:00
Timothy N. Tsvetkov c148b48f74 merge 2011-03-10 15:41:06 +03:00
Timothy N. Tsvetkov cf2d6866b4 simple, not tested, possibly not working, without views, git controllers 2011-03-10 15:39:24 +03:00
Alexey Nayden 0a7c0e4e9b Platforms list + UI enchancements 2011-03-10 14:35:46 +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