Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
800 Commits 30 Branches 0 Tags 24 MiB
Commit Graph

544 Commits

Author SHA1 Message Date
Vladimir Sharshov 5b475ef2b8 Send platform unixname as path 2011-11-02 22:21:02 +04:00
George Vinogradov b048c54004 Added own projects sidebar 2011-11-02 20:22:42 +04:00
George Vinogradov 1dfb272ffc Fixed removing project from repository. 2011-11-02 16:55:20 +04:00
konstantin.grabar 4341155771 [refs #2161] Change private users and personal repos menus 2011-11-02 16:43:41 +04:00
George Vinogradov 18de67ba7d Merge branch 'master' of github.com:warpc/rosa-build 2011-11-02 16:32:19 +04:00
George Vinogradov 33e8e49007 Changed platform clone 2011-11-02 16:30:47 +04:00
konstantin.grabar 7b8df283eb [refs #2161] Change regenerate logic for private_users 2011-11-02 14:42:08 +04:00
konstantin.grabar 9b80c09bfb [refs #2161] Remove groups from menu 2011-11-02 13:30:14 +04:00
konstantin.grabar 8a1b73886d [refs #2161] Change urpmi hrefs 2011-11-02 13:07:16 +04:00
Vladimir Sharshov 9c00f9b56b Order correct on main page 2011-11-02 12:27:14 +04:00
Vladimir Sharshov 153641910f Show notified information from Kernel 2011-11-02 12:23:11 +04:00
Pavel Chipiga b79405c7e5 Change build_lists table update field. Refs #2162 2011-11-02 03:22:29 +02:00
Pavel Chipiga 6f7f42b4a9 Quickfix private_users password generation. Refs #2162 2011-11-02 02:45:19 +02:00
Pavel Chipiga 7e523913c5 Change build_lists recent order field. Refs #2162 2011-11-02 02:22:45 +02:00
George Vinogradov 16b6e2ddfe Merge branch 'master' of github.com:warpc/rosa-build 2011-11-02 02:35:55 +04:00
George Vinogradov 3b72efcffd Removing projects, platforms and repositorits when owner removed. 
Removing Relations joined with projects, platforms and repositories.
 2011-11-02 02:33:20 +04:00
konstantin.grabar d8b7366e5f [refs #2161] Remove unnessecary data from build list template 2011-11-02 02:23:18 +04:00
George Vinogradov 7bf87aa448 Added view to clone 2011-11-02 02:09:55 +04:00
George Vinogradov 392db40a31 Fixed bug with platforms#clone 2011-11-02 02:05:18 +04:00
George Vinogradov 103cb16f27 Added form to set name of platfroms clone 2011-11-02 02:00:44 +04:00
Pavel Chipiga 38f96adbba Refix category display. Refs #2162 2011-11-01 23:56:50 +02:00
Pavel Chipiga 0255334bc5 Fix category display. Refs #2162 2011-11-01 23:28:41 +02:00
konstantin.grabar 6fc522e6cc [refs #2161] Global header fix 2011-11-02 01:09:10 +04:00
konstantin.grabar 4bda937075 [refs #2161] Catalogs fixes 2011-11-02 01:07:32 +04:00
konstantin.grabar 2c0422a3bc [refs #2161] Split platforms on three groups 2011-11-02 00:53:48 +04:00
konstantin.grabar fffb73a484 [refs #2161] Update auto_build_lists controller scopes 2011-11-02 00:23:06 +04:00
konstantin.grabar 92011e493b [refs #2161] Add new titles to application 2011-11-02 00:18:52 +04:00
Pavel Chipiga ee02bc7a4a Fix category projects counter. Fix git blame links. Stub error when git commit diff is too big. Refs #2162 2011-11-01 20:13:08 +02:00
George Vinogradov c06a4eb653 Fixed bug in platform clone. 2011-11-01 20:40:56 +04:00
George Vinogradov b835c7ad3c Find right @repositories in repositories#index 2011-11-01 20:27:34 +04:00
konstantin.grabar b9c4ab3170 Fix downloads message 2011-11-01 20:06:50 +04:00
George Vinogradov f36b9f0176 Merge branch 'master' of github.com:warpc/rosa-build 2011-11-01 19:46:38 +04:00
George Vinogradov 915e0ec0c7 Probably fixed tags. 2011-11-01 19:46:05 +04:00
konstantin.grabar aca4c4709e Fix whenever scripts 2011-11-01 18:58:31 +04:00
konstantin.grabar e36389adfd [refs #2161] Fix add_project 2011-11-01 18:34:35 +04:00
George Vinogradov b5d0d3c2c2 Added clone of platform. 2011-11-01 18:20:53 +04:00
konstantin.grabar 643bf964e4 [refs #2161] Fix private users key pair remove 2011-11-01 17:54:28 +04:00
konstantin.grabar e03d711d1b [refs #2161] Global private users and repos fixes 2011-11-01 17:32:50 +04:00
Pavel Chipiga 5c97e89829 Fix gitolito update_key bug. Push project colaborators git. Fix key update. Hide colaborators groups. Improve RPC XML tests. Refactor and code cleanup. Refs #2162 2011-11-01 02:52:24 +02:00
George Vinogradov 5ac70da272 Fixed bug in ACL checks 2011-11-01 02:49:24 +04:00
George Vinogradov 1d34c54fda Merge branch 'master' of github.com:warpc/rosa-build 2011-11-01 02:04:17 +04:00
George Vinogradov dfc507ff59 Fixed some bugs in ACL checks. 2011-11-01 01:55:56 +04:00
Pavel Chipiga af2fafbb34 Fix container download url. Refs #2162 2011-10-31 20:54:17 +02:00
George Vinogradov 28bc00e937 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-31 22:14:55 +04:00
George Vinogradov 932251a190 Added ACL to controllers 2011-10-31 22:14:25 +04:00
konstantin.grabar 43e1c31ced [refs #2161] Fix privates controller filters 2011-10-31 21:12:35 +04:00
Pavel Chipiga d6e7e28f23 Fix git repo navigation and info links. Refs #2162 2011-10-31 19:06:39 +02:00
Pavel Chipiga 07c2ab13c2 Fix layout links. Refs #2162 2011-10-31 18:30:59 +02:00
konstantin.grabar fcb9007a47 [refs #2161] Fix downloads actions 2011-10-31 20:18:55 +04:00
konstantin.grabar c81289f937 [refs #2161] Add refresh btn to downloads 2011-10-31 20:00:33 +04:00
konstantin.grabar de959bb527 [refs #2161] Add refresh option to statistics 2011-10-31 19:58:04 +04:00
Pavel Chipiga ea0be5cd97 Fix distr_types. Refs #2162 2011-10-31 17:20:16 +02:00
konstantin.grabar 8ebdf00dd5 [refs #2161] Remove visibility field from _project_list within repositories 2011-10-31 18:50:43 +04:00
konstantin.grabar 3177ae3c7f [refs #2161] Fix DOWNLOADS_PATH 2011-10-31 18:37:27 +04:00
George Vinogradov 06aed1193d Templates for collaborators 2011-10-31 18:09:55 +04:00
George Vinogradov 3ebda42ca0 Fixed bug in projects#edit 2011-10-31 18:05:20 +04:00
Pavel Chipiga 0f820cd6d6 Show project owner in projects list. Refs #2162 2011-10-31 15:45:16 +02:00
George Vinogradov 0556ebdf8e Fixed bug with adding collaborators. 2011-10-31 17:24:46 +04:00
George Vinogradov cea4aaa8b4 Removed sidebar in project creation 2011-10-31 17:02:04 +04:00
konstantin.grabar d67f61fc51 [refs #2161] Add sudo to Download.rotate_nginx_log method 2011-10-31 15:50:14 +04:00
konstantin.grabar 17f0192e03 [refs #2161] Fix nginx restart method and app config 2011-10-31 15:41:20 +04:00
Vladimir Sharshov 96546740be Block problem with layout 2011-10-31 14:20:35 +04:00
konstantin.grabar 0c0171bef7 [refs #2161] Change nginx restart method into Download model 2011-10-31 13:53:24 +04:00
konstantin.grabar ec831014e5 [refs #2161] Small changes into platform interface 2011-10-31 11:44:37 +04:00
George Vinogradov 9a47ae9dc5 Personal platform is hidden by default. 2011-10-31 05:07:27 +04:00
George Vinogradov b48e4af930 Fixed owner links in projects & groups 2011-10-31 05:02:12 +04:00
George Vinogradov 5fb704d3c5 Fixed bug with user registration and changed hardcoded 'mandriva2011' 2011-10-31 04:33:47 +04:00
Pavel Chipiga afc1d492a8 Add events logging for platform change_visibility action. Improve autobuild events logging. Add events log for private access to hidden repositories. Change owner assign for platform and repository. Improve gitolite doc. Refactor. Refs #2162 2011-10-31 02:13:22 +02:00
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
konstantin.grabar c7e267ba00 [refs #2161] Add message to auto_build_lists 2011-10-31 02:33:15 +04:00
konstantin.grabar cd14be75ce [refs #2161] Fixed project versions collect 2011-10-31 01:11:59 +04:00
konstantin.grabar 4e9e418c66 [refs #2161] Fix some links and save method into personal repos 2011-10-31 00:03:41 +04:00
Pavel Chipiga f39e51e516 Fix XML RPC responses. Refs #2162 2011-10-30 21:01:08 +02:00
Pavel Chipiga 0c3a044f81 Fix REXML Exception when using Unicorn or Passenger with XmlRPC. Add XML RPC events logging. Refactor. Improve after_rollback callback. Refs #2162 2011-10-30 18:46:52 +02:00
Vladimir Sharshov d8c491f6e1 Fix for 'non view statistic data' 2011-10-30 18:10:42 +04:00
Vladimir Sharshov 018f12c267 Do not cancel task if Kernel not canceled it 2011-10-30 18:06:33 +04:00
Vladimir Sharshov bc23b9d44e Add support build_canceled status 2011-10-30 17:47:18 +04:00
konstantin.grabar 028cd273bc [refs #2161] Change href into personal repo page 2011-10-30 16:58:27 +04:00
konstantin.grabar 61408e74ef [refs #2161] Small fixes of translates 2011-10-30 16:58:27 +04:00
Pavel Chipiga 3281bf5706 Fix deprecation. Extend project unixname validation regexp. Add rollback callbacks to avoid core polution. Increase git timeout. Improve import script. Refs #2162 2011-10-30 14:54:24 +02:00
konstantin.grabar 12727a2149 [refs #2161] Add more roles. Fix visibility bug on personal repo page 2011-10-30 14:51:05 +04:00
konstantin.grabar 8f194e97c5 Fix auto build list 2011-10-29 23:24:57 +04:00
konstantin.grabar 30564e8e17 [refs #2161] Add auto build lists functional 2011-10-29 23:09:50 +04:00
Vladimir Sharshov b82320a4cd Merge branch 'master' of github.com:warpc/rosa-build 2011-10-29 21:51:53 +04:00
Vladimir Sharshov 3e12402245 Update status code for XML-RCP kernel 2011-10-29 21:50:47 +04:00
George Vinogradov 411e40267a Added stub for add_collaborators action. 2011-10-29 19:56:44 +04:00
George Vinogradov 6f256a40eb Changed owner_relations in models group, platform, project, repository. 2011-10-29 19:56:01 +04:00
Pavel Chipiga 3a482545f5 Fix and improve events log notification for BuildList. Refs #2162 2011-10-29 17:50:51 +03:00
George Vinogradov 14bc7acc0b Fixed mass assignment to global_role_id 2011-10-29 18:14:41 +04:00
Vladimir Sharshov 8f3ffbe827 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-29 18:06:22 +04:00
Vladimir Sharshov 8c7b196764 Update BuildListItems for new requirement 2011-10-29 18:05:40 +04:00
George Vinogradov a810c0fc3a Added editing of global_role of user. 2011-10-29 17:39:40 +04:00
konstantin.grabar 512364be32 [refs #2161] Add get_status call 2011-10-29 17:38:17 +04:00
Pavel Chipiga 6b993db2fc Fix ssh key update logic. Refs #2162 2011-10-29 16:21:04 +03:00
konstantin.grabar 8b2fdd71c7 [refs #2161] Add new fields to show.html for BuildList 2011-10-29 16:40:37 +04:00
konstantin.grabar 4e0617a722 [refs #2161] Swap bpl and pl fields into BuildList 2011-10-29 16:18:41 +04:00
konstantin.grabar 372d7dac4d [refs #2161] Fix categories group by and select 2011-10-29 15:25:11 +04:00
Pavel Chipiga 3cb8d5c4c7 Fix group creation bug. Add builds_list to layout menu. Change login error notification. Refs #2162 2011-10-29 13:56:26 +03:00
Vladimir Sharshov 05595c7ce6 Fix empty json answer 2011-10-29 13:38:52 +04:00
George Vinogradov b55a99adfa Added showing of global_role to user list 2011-10-29 02:36:02 +04:00
George Vinogradov 2f5e77ba56 Added call of visible_to to platforms and projects. 2011-10-29 02:34:51 +04:00
Pavel Chipiga 5910c8c29b Apply event logs for build list create, cancel, publish. Refs #2136 2011-10-29 01:31:47 +03:00
Pavel Chipiga 78f784cf1b Remove visibility from Repository. Refs #2136 2011-10-29 00:03:30 +03:00
Pavel Chipiga 7ec324a590 Refix sidebar for build lists. Refs #2136 2011-10-28 23:33:52 +03:00
Pavel Chipiga e97d48db70 Add platforms link tp layout. Fix sidebar for build lists. Refs #2136 2011-10-28 23:28:31 +03:00
Pavel Chipiga cdedcee801 Skip ACL for some actions. Log git hook to system events log. Fix build_list version format. Fix sidebar for build list display. Translate for ACL. Doc for project bootstrap. Refs #2136 2011-10-28 22:59:07 +03:00
George Vinogradov e880aee6cb Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 21:56:17 +04:00
George Vinogradov 324b730a7d Added checking of global rights to all controllers. 2011-10-28 21:55:40 +04:00
Vladimir Sharshov 061d3dc265 Add more info in create_project raise 2011-10-28 21:51:02 +04:00
Pavel Chipiga 3114a70b9b Change callbacks order. Update docs. Refs #2136 2011-10-28 20:16:00 +03:00
konstantin.grabar bb4343d6ce Add new product link to personal repo 2011-10-28 18:41:11 +04:00
konstantin.grabar 7b3167cfa7 Add personal repository rights. Add personal checker to controller 2011-10-28 18:28:45 +04:00
konstantin.grabar c2422a26dd Fix xml_rpc_create and xml_rpc_destroy 2011-10-28 17:53:46 +04:00
konstantin.grabar 365dac9c11 Add xml_rpc_destory call to ProjectToRepository 2011-10-28 17:33:31 +04:00
Pavel Chipiga 2a40d15928 Take back XML RPC methods. Refs #2136 2011-10-28 16:31:26 +03:00
Pavel Chipiga c39e01ba32 Add auto_build hook recivier. Remove XML RPC from project. Gitolite docs. Refs #2136 2011-10-28 16:27:12 +03:00
George Vinogradov 1a62895fd5 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 17:11:31 +04:00
George Vinogradov 5b8f567d4b User and Group creates with default role. Rake task 'roles:apply' to apply default 
roles
 2011-10-28 17:10:29 +04:00
konstantin.grabar 6147ebf79e Fix create_project XML-RPC and comment project_to_repository symlinks 2011-10-28 16:40:38 +04:00
konstantin.grabar dba428de2c Comment attr_accessible for project 2011-10-28 16:25:14 +04:00
konstantin.grabar 0718778b3f Add system ln and rm call with sudo 2011-10-28 15:45:00 +04:00
konstantin.grabar 8f459f8abc Fix repository and project_to_repository paths and symbolinks 2011-10-28 15:16:32 +04:00
konstantin.grabar 6238012fa9 [refs #2106] Move visibility logic to platforms 2011-10-28 11:20:13 +04:00
Vladimir Sharshov 96a598806b Fix mistype 2011-10-28 04:28:55 +04:00
Vladimir Sharshov 0c9b2f5d84 Add more information in projects raise 2011-10-28 04:26:53 +04:00
Pavel Chipiga ce0625e5d8 Fix callbacks order. Refs #2136 2011-10-28 03:19:59 +03:00
Pavel Chipiga 98241b20e6 Fix XML RPC. Refs #2136 2011-10-28 03:05:31 +03:00
Vladimir Sharshov e3a65246cf Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 03:39:58 +04:00
konstantin.grabar f497fc3d89 Add xml_rpc_create call on project to repository linking 2011-10-28 03:39:51 +04:00
Vladimir Sharshov 1cb728c067 Add more info for raise cases 2011-10-28 03:39:37 +04:00
George Vinogradov a833964952 Fixed bug with roles seeding. 2011-10-28 03:37:07 +04:00
Pavel Chipiga 812711b144 Allow XML RPC. Refs #2136 2011-10-28 02:23:39 +03:00
Pavel Chipiga b5704f9b4c Fix project create. Refs #2136 2011-10-28 02:18:13 +03:00
konstantin.grabar 4f6bfac345 Fix rep destroy redirect 2011-10-28 03:16:22 +04:00
konstantin.grabar 3b78277536 Comment repository add_downloads_link raise 2011-10-28 03:01:25 +04:00
konstantin.grabar 04b49c9f65 Add hidden field for platform_id within repository new form 2011-10-28 02:49:37 +04:00
Pavel Chipiga f66216fa6a Change project redirect rules. Fux git repo clone port. Refs #2136 2011-10-28 01:44:02 +03:00
Vladimir Sharshov 5d5a333377 Add more info than raise exceptions 2011-10-28 02:42:56 +04:00
Vladimir Sharshov 73f7535192 Change save path for create_platforms 2011-10-28 02:13:24 +04:00
Pavel Chipiga 0127b104a6 Fix ssh_key_destroy. Refs #2136 2011-10-28 00:53:33 +03:00
George Vinogradov c4c09f28e9 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 01:48:39 +04:00
George Vinogradov 7fbded5d28 Fast fix to PG sql. wouldn't work on MySQL. 2011-10-28 01:38:48 +04:00
Pavel Chipiga f9125a13d2 Fix project model. Refs #2136 2011-10-28 00:37:54 +03:00
konstantin.grabar 61816bd557 Fix repository validation. Fix platform callbacks. 2011-10-28 01:24:52 +04:00
Vladimir Sharshov 27e51aa1b5 Update XML-RPC call for create_platform 2011-10-28 01:14:08 +04:00
konstantin.grabar 04a1835b65 Fix repository update 2011-10-28 00:20:48 +04:00
George Vinogradov 97c49a718e Fixed bug in loading roles. 2011-10-28 00:10:49 +04:00
George Vinogradov 2926cc6309 Merge branch 'master' of github.com:warpc/rosa-build 2011-10-28 00:10:38 +04:00
George Vinogradov adcd99d255 Minor fix in roles 2011-10-28 00:06:53 +04:00
konstantin.grabar 29503a90ea Distrib type and personal repository create fixes 2011-10-27 23:33:34 +04:00
Pavel Chipiga 8fadbfbd66 Redo with_ga include trying to fix strange production bug. Refs #2136 2011-10-27 22:23:31 +03:00
Pavel Chipiga f7045179c5 Fix validation. Refs #2136 2011-10-27 21:13:55 +03:00
George Vinogradov 87cdb88731 Added use_default and use_default_for_owner to roles 2011-10-27 22:09:22 +04:00
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