Commit Graph

59 Commits

Author SHA1 Message Date
Vladimir Sharshov 4165b188eb Merge branch 'master' into 64-project_wiki
Conflicts:
	app/models/project.rb
	config/locales/en.yml
2012-02-03 00:55:16 +04:00
George Vinogradov 2f315f869d [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	db/schema.rb
2012-01-30 13:27:22 +04:00
Alexander Machehin 5efaca77cf Merge branch 'master' into 114-comment_notifications
Conflicts:
	app/models/project.rb
	app/views/user_mailer/new_comment_notification.en.haml
	app/views/user_mailer/new_comment_notification.ru.haml
	app/views/user_mailer/new_comment_reply_notification.ru.haml
	config/locales/devise.en.yml
	config/locales/en.yml
	config/locales/ru.yml
	db/schema.rb
2012-01-30 13:06:06 +06:00
Vladimir Sharshov f9abc2d39c Hide participate projects 2012-01-28 04:25:11 +04:00
George Vinogradov 549f0a55e8 [issue #64] Merge branch 'master' into 64-project_wiki
Conflicts:
	Gemfile.lock
	app/models/project.rb
	app/models/user.rb
	app/views/projects/_form.html.haml
	config/locales/ru.yml
	db/schema.rb
2012-01-27 18:27:23 +04:00
Pavel Chipiga 3f4bf65825 Upgrade paperclip. Apply srpm_import script and UI. Fix specs. Refs #31 2012-01-24 22:35:36 +02:00
Alexander Machehin 9127b6b689 [refs #114] changed logics 2012-01-24 01:42:54 +06:00
George Vinogradov 23573a1a07 [issue #64] Added creation wiki to project. 2012-01-20 19:10:30 +04:00
Alexander Machehin 800b02f544 [refs #18] Add project subsribe, tests 2012-01-20 00:20:03 +06:00
konstantin.grabar 5237939f49 Merge issues with master 2011-12-26 13:26:13 +04:00
Pavel Chipiga d901426b79 Move project build functinality to build_lists controller. Refactor downloads url - create model based methods for url genertion. Cleanup code. Add includeed_repos functionality. Display included_repos on build_list page. Refs #65 2011-12-21 16:01:50 +02:00
konstantin.grabar 375c98366f [ref #54] Add has_issue settings to projec edit. Fix routes and friendly_id bug. Fix some moments 2011-12-20 20:57:34 +04:00
konstantin.grabar d20d43eb2b [refs #54] Base logic and templates for issues and comments to them 2011-12-19 19:30:14 +04:00
konstantin.grabar 58cfe07124 [refs #56] Change project build page title 2011-12-16 11:59:34 +04:00
George Vinogradov 97579f8534 Fixed errors in projects representation. 2011-12-07 03:44:21 +04:00
George Vinogradov 9cc820080b Groups base functional. 2011-12-05 16:32:18 +04:00
konstantin.grabar 148a0fec28 [refs #2249] Global name to description and unixname to name renames 2011-11-29 14:51:14 +04:00
Pavel Chipiga 796ff75857 Great models refactoring. Refactor some cancan abilities and controllers authorization. Move some common parts to modules. Fix lots bugs. Remove unused files and code. Drop ACL tables. Add more can? helpers. Refs #2249 2011-11-24 23:48:58 +02:00
Pavel Chipiga 141fe7677f Apply project fork button. Refactor and cleanup code. Refs #2243 2011-11-23 17:52:33 +02:00
konstantin.grabar e50959e205 [refs #2249] Add full rules, helpers and filters of CanCan 2011-11-19 15:41:11 +04:00
konstantin.grabar 05bb9ce0c7 [refs #2249] CanCan rules update. Add admin role to relations. Change collaboratots edit logic and code 2011-11-18 22:26:22 +04:00
konstantin.grabar 4d4f5deed4 [refs #2249] Remove bitmask. Add new rules. Add some authorize filters. Add some template can? helpers 2011-11-16 22:45:01 +04:00
George Vinogradov aa97eb1863 Yet another change of MyProjects block 2011-11-03 02:01:11 +04:00
George Vinogradov 10b2c8d903 Fix bug with uname 2011-11-03 01:44:49 +04:00
George Vinogradov 3e2e01deb6 Changed My Projects block 2011-11-03 01:39:50 +04:00
George Vinogradov b048c54004 Added own projects sidebar 2011-11-02 20:22:42 +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 dfc507ff59 Fixed some bugs in ACL checks. 2011-11-01 01:55:56 +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
George Vinogradov b9ee6e365b Added collaborators management. 2011-10-31 02:59:03 +04:00
George Vinogradov 411e40267a Added stub for add_collaborators action. 2011-10-29 19:56:44 +04:00
konstantin.grabar 4e0617a722 [refs #2161] Swap bpl and pl fields into BuildList 2011-10-29 16:18:41 +04: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 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
konstantin.grabar d04de6e2fc [refs #1832] Fixed git repos web interface routes 2011-10-24 14:19:04 +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 c24a9fae1b [refs #1832] Build Lists updates. Project updates and fixes. 2011-10-22 19:28:41 +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
Pavel Chipiga 099120e71b Fix bugs. Refs #1858 2011-10-17 19:07:53 +03:00
George Vinogradov 5a6248c1af Changed representation of Projects 2011-10-17 18:21:29 +04:00
George Vinogradov f76a3aee39 Added groups representation. 2011-10-17 00:48:02 +04:00
Alexey Nayden fc3cd46943 Haml fix 2011-04-14 15:37:03 +04:00
Timothy N. Tsvetkov 1a6330956b build list creation 2011-04-11 20:37:09 +04:00
Timothy N. Tsvetkov 4ac5931f44 fixes + build lists 2011-04-07 17:20:21 +04:00
Alexey Nayden c116f23b7e even more minor ui fixes 2011-03-31 16:13:04 +04:00