Vokhmin Alexey V
|
3d293b908d
|
added IsoWorkerObserver
|
2012-11-09 01:39:42 +04:00 |
Vokhmin Alexey V
|
4595ce349c
|
Merge branch 'master' into iso-worker
|
2012-11-08 18:17:35 +04:00 |
Vokhmin Alexey V
|
fc3dbbf698
|
added help for creating ISO
|
2012-11-08 15:11:44 +04:00 |
Alexander Machehin
|
e9233d362a
|
add new git_path param
|
2012-11-08 15:13:48 +06:00 |
Vokhmin Alexey V
|
f21926f7f5
|
extra style changes
|
2012-11-07 17:21:08 +04:00 |
Vokhmin Alexey V
|
eb40fbbbd5
|
removed unnecessary fields for build ISO
|
2012-11-07 16:14:31 +04:00 |
Vokhmin Alexey V
|
6a7035d551
|
added #show action for product_build_list
|
2012-11-06 22:01:54 +04:00 |
Vokhmin Alexey V
|
317f672e32
|
added #new action for create ISO build
|
2012-11-06 19:08:54 +04:00 |
Vokhmin Alexey V
|
ecec330b4d
|
added migration, updated models, UI
|
2012-11-06 18:13:16 +04:00 |
Alexander Machehin
|
970da230f2
|
[refs #90] add validations
|
2012-10-29 21:33:20 +06:00 |
Alexander Machehin
|
ab57507f34
|
[refs #90] make common translation to commits and pulls
|
2012-10-26 20:12:14 +06:00 |
Vokhmin Alexey V
|
e9fd2a2df6
|
Merge branch 'master' into 706-get-list-of-projects-by-repository
|
2012-10-19 18:51:11 +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 |
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 |
Vokhmin Alexey V
|
d5ad5b1a95
|
Merge branch 'master' into 698-rest-api-for-advisories
|
2012-10-18 18:59:00 +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
|
b7eff22c23
|
#698: added API for Advisories
|
2012-10-18 15:22:31 +04:00 |
Alexander Machehin
|
7870ffef7d
|
[refs #579] fixed some bugs
|
2012-10-18 00:38:42 +06:00 |
Vokhmin Alexey V
|
6680265c64
|
#686: some refactoring of relations
|
2012-10-17 17:46:16 +04:00 |
Vokhmin Alexey V
|
351821912b
|
#686: added API for show list of projects
|
2012-10-17 14:35:33 +04:00 |
Vokhmin Alexey V
|
d99a2104ce
|
#692:added index action for Groups API
|
2012-10-16 15:49:07 +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
|
cef112efc3
|
[refs #579] first version of the outdated diff
|
2012-10-16 00:14:43 +06:00 |
Vokhmin Alexey V
|
f3605a1211
|
#691: updated routes according to Vladimir's comments
|
2012-10-15 19:47:42 +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 |
Vokhmin Alexey V
|
e50bd3a2b5
|
#691: added #show action for Users API
|
2012-10-15 13:45:00 +04:00 |
Vokhmin Alexey V
|
00f5d0ce62
|
#672: updated Repositories API
|
2012-10-14 17:38:06 +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
|
bb47567628
|
[refs #579] small improvements of the discussion
|
2012-10-13 00:12:04 +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
|
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
|
eef640e82c
|
#671: added API Platforms#create action, updated specs, added validation to platform model
|
2012-10-10 21:45:56 +04:00 |
Vokhmin Alexey V
|
972877bc76
|
#671: added API Platforms#destroy action and specs
|
2012-10-10 19:43:14 +04:00 |
Vokhmin Alexey V
|
d9c583e226
|
#671: added specs for API Platforms#clone action
|
2012-10-10 19:13:14 +04:00 |
Vokhmin Alexey V
|
e5c6707594
|
#671: added #remove_member action for platforms API, updated specs
|
2012-10-09 21:07:10 +04:00 |
Vokhmin Alexey V
|
30909b281d
|
#671: added #add_member action for platforms API, added new specs
|
2012-10-09 20:23:48 +04:00 |
Vokhmin Alexey V
|
9e6e2de955
|
#671: added #members action for platforms API
|
2012-10-09 19:06:27 +04:00 |
Vokhmin Alexey V
|
feefe8ed89
|
#374: added #platforms_for_build action for Platforms API
|
2012-10-08 22:02:44 +04:00 |
Alexander Machehin
|
548f698526
|
[refs #579] add a line comment button
|
2012-10-08 20:42:38 +06:00 |
Alexander Machehin
|
f12634cee8
|
[refs #579] add link to comments
|
2012-10-08 15:14:31 +06:00 |
Alexander Machehin
|
ed7aec602f
|
[refs #579] alpha version of the pull inline comments
|
2012-10-06 01:19:05 +06:00 |
Alexander Machehin
|
e085784d51
|
Merge branch 'master' into 579-code_line_comments
Conflicts:
app/assets/stylesheets/design/custom.scss
app/helpers/diff_helper.rb
app/models/ability.rb
app/views/projects/comments/_list.html.haml
app/views/projects/git/commits/_commit_diff.html.haml
lib/ext/git/inline_callback.rb
|
2012-10-05 15:32:29 +06:00 |
Alexander Machehin
|
527dd210bf
|
[refs #579] alpha version of inline comments for commit
|
2012-10-05 00:40:12 +06:00 |
Vokhmin Alexey V
|
4b72501159
|
#671: added Architectures API
|
2012-10-04 16:45:49 +04:00 |
Vokhmin Alexey V
|
04b2647ef0
|
#668: added uploading avatars for groups
|
2012-10-03 20:38:42 +04:00 |
Alexander Machehin
|
94029c3cda
|
[refs #90] base -> to, head -> from
|
2012-10-03 17:58:34 +06:00 |
Vladimir Sharshov
|
d2c338e4e4
|
Merge pull request #665 from warpc/90-ui
[refs #90] pull request ui + fixes
|
2012-10-02 10:41:06 -07:00 |
Vokhmin Alexey V
|
cb994c6fd6
|
#349: created autocompletes_controller, refactoring, updated specs
|
2012-10-02 20:54:55 +04:00 |
Vokhmin Alexey V
|
ba7a7b20a5
|
#349: updated locales, added shared template
|
2012-10-02 19:20:58 +04:00 |
Alexander Machehin
|
f66f80c128
|
Merge branch 'master' into 90-ui
Conflicts:
spec/controllers/projects/pull_requests_controller_spec.rb
|
2012-10-02 19:43:23 +06:00 |
Alexander Machehin
|
eaf29713cc
|
[refs #90] autoload refs
|
2012-10-01 22:03:08 +06:00 |
Vokhmin Alexey V
|
234615d728
|
#658: added link to notification center in email
|
2012-10-01 17:08:02 +04:00 |
Alexander Machehin
|
e7549635f0
|
[refs #90] change translation
|
2012-09-28 23:44:26 +06:00 |
Vladimir Sharshov
|
7756f6200d
|
[refs #374] Add http headers for rate limit, restrict rate limit only for api calls.
|
2012-09-28 01:07:19 +04:00 |
Alexander Machehin
|
abafbc6ef5
|
Merge again-and-again branch 'master' into 90-pull
Conflicts:
db/schema.rb
|
2012-09-28 00:09:34 +06:00 |
Alexander Machehin
|
2b4e2f03e5
|
Merge pull request #585 from warpc/374-rest_api_for_builds
[refs #374] Add json responses for build lists api
|
2012-09-27 07:00:19 -07:00 |
Vladimir Sharshov
|
223aa33604
|
[refs #374] Add info about API doc site
|
2012-09-27 17:55:16 +04:00 |
Vladimir Sharshov
|
7c4c855341
|
[refs #374] Small refactoring
|
2012-09-27 17:41:02 +04:00 |
Vladimir Sharshov
|
0dd103b7f4
|
[refs #374] Fix build list tests, remove unused code.
|
2012-09-27 03:54:56 +04:00 |
Vladimir Sharshov
|
4402f676c3
|
Increase hourly request limit, remove daily limit
|
2012-09-27 01:59:31 +04:00 |
Vokhmin Alexey V
|
37fbb4632e
|
#90: updated branch
|
2012-09-26 21:04:12 +04:00 |
Vokhmin Alexey V
|
613db04375
|
#90: added limit for commits into the pull request
|
2012-09-26 21:00:58 +04:00 |
Vokhmin Alexey V
|
37c9a906c4
|
Merge branch '90-pull' into 90-separate-issues-and-pull-requests
|
2012-09-26 18:45:26 +04:00 |
Vokhmin Alexey V
|
6070c276f6
|
Merge branch 'master' into 90-pull
|
2012-09-26 18:33:04 +04:00 |
Vokhmin Alexey V
|
07b27b934f
|
#90: updated #index page for pull-requests
|
2012-09-26 15:46:23 +04:00 |
Vokhmin Alexey V
|
397d411252
|
#90: added #index action, updated routes
|
2012-09-26 00:50:40 +04:00 |
Alexander Machehin
|
dfbf8a8d58
|
Merge branch 'master' into 90-pull
Fucking conflicts:
app/controllers/projects/issues_controller.rb
app/models/ability.rb
app/views/projects/issues/show.html.haml
config/routes.rb
db/schema.rb
lib/tasks/import.rake
spec/models/comment_for_commit_spec.rb
vendor/assets/javascripts/bootstrap-tab.js
vendor/assets/stylesheets/bootstrap.css
|
2012-09-25 17:55:30 +06:00 |
Vladimir Sharshov
|
06099a15b6
|
Merge pull request #657 from warpc/648-add-filters-to-projects-page
[refs #648]: Filters by owners in projects page
|
2012-09-25 03:41:11 -07:00 |
Vladimir Sharshov
|
c426f81abe
|
Merge pull request #656 from warpc/616-issues_and_comments
[refs #616] Markdown in issues descriptions and comments, ability to preview, help info about markdown, refactoring.
|
2012-09-25 03:37:44 -07:00 |
Vokhmin Alexey V
|
9be978eb68
|
#648: updated models, JS, controller according to comments and discussions
|
2012-09-24 22:04:53 +04:00 |
Alexander Machehin
|
51c9375613
|
[refs #616] change preview translation
|
2012-09-24 23:40:41 +06:00 |
Vokhmin Alexey V
|
cee1ee6cb6
|
#648: small refactoring
|
2012-09-23 20:22:49 +04:00 |
konstantin.grabar
|
7812adfdbc
|
[refs #374] Add custom http basic auth for api
|
2012-09-21 23:15:56 +04:00 |
Vokhmin Alexey V
|
ceeae09332
|
#648: small revert, updated filter name
|
2012-09-21 22:08:19 +04:00 |
Vokhmin Alexey V
|
2406423483
|
#648: added filters to Projects page
|
2012-09-21 21:57:22 +04:00 |
konstantin.grabar
|
e94c6f4f00
|
[refs #374] Merge master into 374-rest_api_for_builds
|
2012-09-21 13:20:04 +04:00 |
Alexander Machehin
|
1dcce7bf92
|
[refs #616] small fixes
|
2012-09-20 20:58:14 +06:00 |
Vokhmin Alexey V
|
799a1464fb
|
#385: fixed
|
2012-09-20 18:26:26 +04:00 |
Alexander Machehin
|
32e05de186
|
[refs #616] cheat sheet small i18n
|
2012-09-20 00:53:40 +06:00 |
Alexander Machehin
|
a85a95d18a
|
[refs #616] markdown cheat sheet
|
2012-09-19 23:35:43 +06:00 |
konstantin.grabar
|
f7d28dd23c
|
[refs #374] Patch Rack::Throttle http_error method. Finish main page
text
|
2012-09-19 19:02:54 +04:00 |
Alexander Machehin
|
4fc9ba7aeb
|
[refs #616] add lost i18n
|
2012-09-19 15:41:08 +06:00 |
Vokhmin Alexey V
|
967c5daaa8
|
#575: added 'arch' to subject and body of email
|
2012-09-18 16:03:10 +04:00 |
Alexander Machehin
|
a4c8e8eff8
|
Merge branch 'master' into 616-issues_and_comments
Conflicts:
Gemfile
app/assets/stylesheets/design/custom.scss
app/controllers/projects/projects_controller.rb
|
2012-09-17 16:52:50 +06:00 |
Vokhmin Alexey V
|
ef923d06c7
|
#575: added build_list_notification
|
2012-09-16 21:29:45 +04:00 |
Vokhmin Alexey V
|
01576702a0
|
#575: added migration, updated Settings page
|
2012-09-14 20:12:48 +04:00 |
Vladimir Sharshov
|
c690a8446a
|
Merge pull request #644 from warpc/633-fix-ui-on-build-list-page
[refs #633] Fixed blocking auto publication in personal repository. Refactoring creating build list page.
|
2012-09-13 16:39:19 -07:00 |
Vladimir Sharshov
|
fc4eb189b5
|
Add new staging server;
Remove special application config;
Change localization (builded to built);
Add quotes to git command.
|
2012-09-14 00:46:56 +04:00 |
Vokhmin Alexey V
|
4138399ad3
|
#633: updated message
|
2012-09-13 20:23:49 +04:00 |
Vokhmin Alexey V
|
a99bfee4a6
|
#633: UI has been updated
|
2012-09-13 20:08:41 +04:00 |
Vladimir Sharshov
|
5a699ad379
|
Merge pull request #640 from warpc/638-add-access-permissions-for-users-to-repository
[refs #638] Repository supervisor
|
2012-09-12 13:52:42 -07:00 |
Vokhmin Alexey V
|
1a75a5a394
|
#638: updated Relation model, repositories and platforms controllers according to comments
|
2012-09-12 23:32:51 +04:00 |
Vladimir Sharshov
|
e3bcd2382e
|
[refs #641] Show only public projects in group profile
|
2012-09-12 18:49:40 +04:00 |
Vokhmin Alexey V
|
b468b09529
|
#638: some refactoring for adding new user
|
2012-09-12 17:07:34 +04:00 |
Vokhmin Alexey V
|
3858bfa6b7
|
#638: added members to repository model, updated views
|
2012-09-11 19:30:14 +04:00 |
Pavel Chipiga
|
768e40ee2a
|
Merge branch 'master' into 631-publish-to-the-repository-without-qa
Conflicts:
app/models/ability.rb
|
2012-09-07 16:38:21 +03:00 |