Commit Graph

5904 Commits

Author SHA1 Message Date
Ilya Krasilnikov f15f2ce98d fuckin fuck 2011-10-26 03:27:08 +04:00
Ilya Krasilnikov d9acf9f504 unicorn fix 2011-10-26 03:13:22 +04:00
Ilya Krasilnikov 5c090919a8 unicorn listens on port instead of socket 2011-10-26 03:06:28 +04:00
Ilya Krasilnikov 36c724d0e2 database.yml 2011-10-26 02:54:52 +04:00
Ilya Krasilnikov ed59d22fad unicorn 2011-10-26 02:34:57 +04:00
Ilya Krasilnikov 398d4b2b66 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-26 02:30:53 +04:00
Ilya Krasilnikov bcdc10220b unicorn 2011-10-26 02:30:39 +04:00
konstantin.grabar d4d43f3be1 [refs #2109] Change XML-RPC call for build list 2011-10-25 19:17:35 +04:00
konstantin.grabar 7e1aaec63b [refs #2109] Fix bug with edit user href 2011-10-25 17:52:01 +04:00
Ilya Krasilnikov d4e526a3d0 unicorn script fix 2011-10-25 17:32:16 +04:00
Ilya Krasilnikov a1311c9168 +x 2011-10-25 17:26:46 +04:00
Ilya Krasilnikov eb85728516 unicorn fix 2011-10-25 17:23:20 +04:00
konstantin.grabar 50956a50ee [refs #2109] Fixed platform editing 2011-10-25 17:07:19 +04:00
Ilya Krasilnikov 733a34f0f8 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-25 04:15:01 +04:00
Ilya Krasilnikov 1283a4b2c4 xml-prc demo script 2011-10-25 04:14:46 +04:00
George Vinogradov 517a0e6df1 Changed ACL documentation 2011-10-25 02:20:38 +04:00
George Vinogradov 2437f72f08 Fixed controller methods 2011-10-25 02:07:11 +04:00
George Vinogradov b6441bf816 First revision of ACL documentation 2011-10-24 21:50:37 +04:00
Vladimir Sharshov cff8643082 Update deploy config 2011-10-24 17:37:24 +04:00
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