Alexander Machehin
|
345e4f698b
|
Merge branch 'master' into file-store-4_git_task
Conflicts:
Gemfile
|
2012-11-02 23:08:38 +06:00 |
Alexander Machehin
|
6d3a2e7bb3
|
Merge remote-tracking branch 'origin/file-store-4_git_task' into file-store-4_git_task
|
2012-11-01 23:39:08 +06:00 |
Alexander Machehin
|
84920c358a
|
[refs file-store-4] upload to file-store
|
2012-11-01 23:37:09 +06:00 |
Vladimir Sharshov
|
6523047b50
|
Merge pull request #713 from warpc/90-fixed_git_timeout
[refs #90] fixed git timeout error on the big diff
|
2012-10-26 08:50:59 -07:00 |
Alexander Machehin
|
ab57507f34
|
[refs #90] make common translation to commits and pulls
|
2012-10-26 20:12:14 +06:00 |
Alexander Machehin
|
95e5804358
|
[refs #90] fixed git timeout error on the big diff
|
2012-10-26 20:03:46 +06:00 |
Alexander Machehin
|
ba74024b29
|
fixed order of the handle exceptions
|
2012-10-25 15:42:47 +06:00 |
Alexander Machehin
|
52678de124
|
Merge pull request #710 from warpc/709-undefined-local-variable-or-method-project_counter
#709: Fix projects counter && removed unnecessary template
|
2012-10-22 02:38:38 -07:00 |
Vokhmin Alexey V
|
4f2d75ea40
|
#709: removed unnecessary template
|
2012-10-22 13:16:58 +04:00 |
Vokhmin Alexey V
|
05f16c1d13
|
#709: updated controller and view for fixing undefined local variable or method 'project_counter'
|
2012-10-22 12:26:00 +04:00 |
Vladimir Sharshov
|
daefb27f95
|
Merge pull request #707 from warpc/706-get-list-of-projects-by-repository
[refs #706:] REST API repository: list of repository projects.
|
2012-10-19 09:10:06 -07:00 |
Vladimir Sharshov
|
24d3bbb2ed
|
Merge pull request #708 from warpc/fot-fix-for-specs
hot fix for specs
|
2012-10-19 08:43:16 -07:00 |
Vokhmin Alexey V
|
25620af00c
|
hot fix for specs
|
2012-10-19 19:35:19 +04:00 |
Vokhmin Alexey V
|
ec6621a5ec
|
#706: small refactoring Advisories#show API view
|
2012-10-19 18:56:29 +04:00 |
Vokhmin Alexey V
|
e9fd2a2df6
|
Merge branch 'master' into 706-get-list-of-projects-by-repository
|
2012-10-19 18:51:11 +04:00 |
Vokhmin Alexey V
|
ba968cc5a0
|
#706: updated Ability model, Repositories controller, added specs
|
2012-10-19 18:49:01 +04:00 |
Vladimir Sharshov
|
00e92d9672
|
Merge pull request #678 from warpc/579-code_line_comments
[refs #579] code line comments
|
2012-10-19 07:48:50 -07:00 |
Vladimir Sharshov
|
d6db260385
|
Merge pull request #699 from warpc/698-rest-api-for-advisories
[refs #698]: REST API for Advisories
|
2012-10-19 07:47:46 -07:00 |
Vokhmin Alexey V
|
f67a8b3692
|
#706: some refactoring, updated build_list API response
|
2012-10-19 18:24:28 +04:00 |
Vokhmin Alexey V
|
18ac16ae96
|
#698: small refactoring, added ckeck for main platform
|
2012-10-19 18:03:09 +04:00 |
Vokhmin Alexey V
|
b9f1835d1c
|
Merge branch 'master' into 698-rest-api-for-advisories
|
2012-10-19 17:58:38 +04:00 |
Vokhmin Alexey V
|
4680e9c62c
|
#706: added #projects action to Repositories API
|
2012-10-19 17:52:36 +04:00 |
Alexander Machehin
|
6c8c1ca880
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
|
2012-10-19 18:47:26 +06:00 |
Alexander Machehin
|
9bc9eab4f1
|
[refs #579] remove new comment form after close & fix focus
|
2012-10-19 18:39:11 +06:00 |
Julea Pikareva
|
eda6ea4691
|
[refs #704] Fix height button "Clear"
|
2012-10-19 16:38:01 +04:00 |
Julea Pikareva
|
9c62029f6d
|
[refs #619] Fix long title in the activity feed
not observant
|
2012-10-19 16:07:19 +04:00 |
Vladimir Sharshov
|
1d041667a3
|
Merge pull request #705 from warpc/702-handling-errors-on-api-requests
[refs #702]: correct response for 404 and 500 code in REST API
|
2012-10-19 05:02:48 -07:00 |
Julea Pikareva
|
81c80b42e8
|
[refs #619] Fix long title in activity feed
|
2012-10-19 15:54:32 +04:00 |
Vokhmin Alexey V
|
d563c9a9f9
|
#702: added handling errors
|
2012-10-19 15:47:49 +04:00 |
Julea Pikareva
|
ef77f16fac
|
[refs #619] Fix end-of-line format
|
2012-10-19 14:38:38 +04:00 |
Julea Pikareva
|
ad27738ce9
|
[refs #619] Fix radio-button in Opera
|
2012-10-19 14:27:14 +04:00 |
Alexander Machehin
|
54f462f408
|
[refs #579] small refactoring
|
2012-10-19 15:50:15 +06:00 |
Vokhmin Alexey V
|
0cf0933074
|
#698:small refactoring
|
2012-10-19 11:32:12 +04:00 |
Alexander Machehin
|
ea1ec80d29
|
[refs #579] fixed bug with updating comments
|
2012-10-18 23:37:52 +06:00 |
Vokhmin Alexey V
|
5cf69bff92
|
#698: renamed method
|
2012-10-18 20:36:29 +04:00 |
Vokhmin Alexey V
|
8bbb82faa8
|
#698: updated Advisories API
|
2012-10-18 20:25:24 +04:00 |
Vokhmin Alexey V
|
84e5f3ead3
|
#698: updated specs, permission access
|
2012-10-18 19:44:28 +04:00 |
Vokhmin Alexey V
|
d5ad5b1a95
|
Merge branch 'master' into 698-rest-api-for-advisories
|
2012-10-18 18:59:00 +04:00 |
Vokhmin Alexey V
|
f3eff0da92
|
#698: added specs for #index, #show actions
|
2012-10-18 18:58:13 +04:00 |
Vladimir Sharshov
|
81fcb62a06
|
Merge pull request #697 from warpc/686-rest-api-for-projects
[refs #686]: REST API for Projects
|
2012-10-18 07:42:49 -07:00 |
Vladimir Sharshov
|
a5012519a9
|
Merge pull request #701 from warpc/700-fix_fork
[refs #700] Fix fork error for new project: missing code in child projects. Add recovery task for old project.
|
2012-10-18 07:40:07 -07:00 |
Alexander Machehin
|
7ad1a82876
|
[refs #700] fix fork && repare task
|
2012-10-18 20:34:32 +06:00 |
Vokhmin Alexey V
|
a3252594b8
|
#698: fixed #index action in Advisories controller
|
2012-10-18 18:32:43 +04:00 |
Vokhmin Alexey V
|
334fc9a574
|
#698: revert advisory model
|
2012-10-18 18:29:31 +04:00 |
Vokhmin Alexey V
|
68dbae8c83
|
#698: added #create and #fork actions for Advisories API
|
2012-10-18 18:17:50 +04:00 |
Vokhmin Alexey V
|
00a8858348
|
#698: updated Advisories#show API
|
2012-10-18 17:08:40 +04:00 |
Alexander Machehin
|
ecf8e7e5ee
|
[refs #579] fixed wiki & refactoring
|
2012-10-18 18:51:28 +06:00 |
Alexander Machehin
|
c6f45956cc
|
[refs #90] fixed error by 24fd99b2d5cab
|
2012-10-18 18:50:43 +06:00 |
Alexander Machehin
|
e15bf13c4f
|
[refs #90] small refactoring of the diff method
|
2012-10-18 18:09:12 +06:00 |
Alexander Machehin
|
62ca030110
|
[refs #90] head_branch -> from_branch
|
2012-10-18 17:46:57 +06:00 |