Commit Graph

3331 Commits

Author SHA1 Message Date
Vladimir Sharshov 0c475b35f7 Merge pull request #694 from warpc/691-rest-api-for-users
[refs #691]: REST API for Users
2012-10-15 12:10:12 -07:00
Vokhmin Alexey V 888cbe445e #691: small refactoring 2012-10-15 22:30:06 +04:00
Alexander Machehin 938a8a0ad1 Merge branch 'master' into 579-code_line_comments
Conflicts:
	app/views/projects/pull_requests/_pull_diff.html.haml
	app/views/projects/wiki/_diff_data.html.haml
2012-10-16 00:19:22 +06:00
Alexander Machehin 5c7fb21511 [refs #579] add cursor pointer to arrow 2012-10-16 00:16:01 +06:00
Alexander Machehin cef112efc3 [refs #579] first version of the outdated diff 2012-10-16 00:14:43 +06:00
Alexander Machehin 8d4311e419 [refs #579] remove a wrong line 2012-10-15 23:46:44 +06:00
Alexander Machehin 66f0cc3244 [refs #579] fixed setting status to inline comments 2012-10-15 23:45:01 +06:00
Alexander Machehin e3a0005bd3 [refs #579] small refactoring 2012-10-15 23:42:28 +06:00
Alexander Machehin ef37180825 [refs #579] small activity refactoring 2012-10-15 22:50:21 +06:00
Alexander Machehin fb1288e382 [refs #579] ugly sorting common pull comments 2012-10-15 22:33:16 +06:00
Vokhmin Alexey V 6aef7cfb30 #691: revert base controller 2012-10-15 19:49:52 +04:00
Vokhmin Alexey V f3605a1211 #691: updated routes according to Vladimir's comments 2012-10-15 19:47:42 +04:00
Vladimir Sharshov c115a37a04 Merge pull request #695 from warpc/add-invitation-link-to-register_requests-table
added invitation link to the table
2012-10-15 08:28:35 -07:00
Alexander Machehin a7a442c4e1 [refs #90] fixed rendering diff 2012-10-15 21:24:29 +06:00
Vokhmin Alexey V 3e0b3b8bfc added invitationlink to the table 2012-10-15 19:24:20 +04:00
Vokhmin Alexey V 5aa5bbc0b8 #691: small refactoring 2012-10-15 18:50:58 +04:00
Vokhmin Alexey V 84b49052b1 #691: added specs for Users API 2012-10-15 18:43:09 +04:00
Vokhmin Alexey V 0879a7e46f #691: added #notifiers and #update actions for Users API 2012-10-15 18:06:08 +04:00
Vokhmin Alexey V 2ae671df21 Merge branch 'master' into 691-rest-api-for-users 2012-10-15 17:03:05 +04:00
Alexander Machehin 1ee9e3f00e [refs #579] fixed updating comment 2012-10-15 18:30:34 +06:00
Vladimir Sharshov 8c7ac11ec7 Merge pull request #689 from warpc/672-rest-api-for-repositories
[refs #672]: REST API for Refositories
2012-10-15 04:44:08 -07:00
Vokhmin Alexey V 9087a15627 #672: small refactoring Api::V1::BaseController#member method 2012-10-15 14:07:10 +04:00
Alexander Machehin 00323cec82 [refs #579] grouped commits 2012-10-15 16:03:35 +06:00
Vokhmin Alexey V 5d9a1e2586 #672: removed API helper 2012-10-15 13:48:25 +04:00
Vokhmin Alexey V e50bd3a2b5 #691: added #show action for Users API 2012-10-15 13:45:00 +04:00
Vladimir Sharshov 66d8ae9451 Merge pull request #693 from warpc/690-truncate-project-name-before-validation
[refs #690]: truncates project name before validation
2012-10-15 01:47:52 -07:00
Vokhmin Alexey V fae5d3ff2b #690: truncate project name before validation 2012-10-15 12:28:18 +04:00
Vokhmin Alexey V 5c88ac6f3e #672: updated Repositories#signatures API action, added specs 2012-10-14 18:44:10 +04:00
Vokhmin Alexey V 00f5d0ce62 #672: updated Repositories API 2012-10-14 17:38:06 +04:00
Vokhmin Alexey V 146f72c062 #672: small refactoring 2012-10-14 16:39:58 +04:00
Vokhmin Alexey V be8ed0984a #672: added #add_member, #remove_member, #update, #destroy actipns for Repository API 2012-10-14 16:00:49 +04:00
Alexander Machehin b9d69a966b [refs #579] add 404 for wrong commit hash 2012-10-13 01:59:14 +06:00
Alexander Machehin c5d6707b8f [refs #579] fixed commit comments errors 2012-10-13 01:57:54 +06:00
Alexander Machehin bb47567628 [refs #579] small improvements of the discussion 2012-10-13 00:12:04 +06:00
Vladimir Sharshov a9054f24e3 Merge pull request #688 from warpc/648-disable_filter_form_submit
[refs #648] disable submiting the project filter form
2012-10-12 03:26:49 -07:00
Alexander Machehin 6981a7f238 [refs #648] disable submiting the project filter form 2012-10-12 16:24:51 +06:00
Vladimir Sharshov 4f21f0cb88 Add new school adress; change email send method to sendmail; add google check page 2012-10-12 00:16:51 +04:00
Vladimir Sharshov 2e0f4dc2eb Merge pull request #680 from warpc/671-rest-API
[refs #671]: full rest API for Platforms; Add refs_list api for Project
2012-10-11 13:12:32 -07:00
Vokhmin Alexey V 72822f9760 #671: updated specs for Platforms API 2012-10-11 22:38:19 +04:00
Vokhmin Alexey V 32dea63865 #671: added specs for Projects#refs_list API 2012-10-11 21:51:40 +04:00
Alexander Machehin 993454fc29 [refs #579] alpha version of the pull discussion 2012-10-11 23:50:40 +06:00
Vladimir Sharshov 414e3ccbf8 Merge pull request #683 from warpc/374-add_commit_validation
[refs #374] added commit validation for build list
2012-10-11 09:37:23 -07:00
Vokhmin Alexey V 8f3ed58cd8 #671: added Projects#refs_list API action 2012-10-11 20:27:17 +04:00
Alexander Machehin 7f031ac688 [refs #374] added commit validation 2012-10-11 22:11:53 +06:00
Vokhmin Alexey V 6b3bf41c7a #671: removed before_filter 2012-10-11 19:36:14 +04:00
Vokhmin Alexey V 992892f2c8 #671: small refactoring 2012-10-11 19:18:54 +04:00
Vladimir Sharshov 0091e34298 Merge pull request #682 from warpc/90-fix_to_project
[refs #90] fix pull to external project; fix diff for wiki.
2012-10-10 13:02:08 -07:00
Alexander Machehin a7bb5f48ba [refs #90] fixed wiki diff 2012-10-11 01:16:47 +06:00
Alexander Machehin 01b60fc4d7 [refs #90] test to creation pull on the forked project 2012-10-11 01:00:27 +06:00
Alexander Machehin e379a603b4 [refs #90] get new pull to this project 2012-10-11 00:59:25 +06:00