Alexander Machehin
|
b132a56937
|
Merge branch 'master' into 674-diff_between_commits
Conflicts:
db/schema.rb fresh
|
2012-12-04 00:02:45 +06:00 |
Alexander Machehin
|
0669fb2789
|
[refs #674] small changes
|
2012-12-03 22:52:11 +06:00 |
Vokhmin Alexey V
|
d325838b1f
|
Merge branch 'master' into 735-package-build-server
|
2012-12-03 15:38:03 +04:00 |
Vokhmin Alexey V
|
fcdbfd4538
|
add new column to build_lists table, some refactoring
|
2012-11-30 14:41:39 +04:00 |
Alexander Machehin
|
76606036cb
|
[refs #737] remove branch from commit message
|
2012-11-28 19:15:15 +06:00 |
Alexander Machehin
|
c969d82c94
|
fix ru translate
|
2012-11-28 19:06:31 +06:00 |
Vokhmin Alexey V
|
6fe07d83d6
|
add validation for build_for_platform field
|
2012-11-20 20:14:51 +04:00 |
Vokhmin Alexey V
|
0f74aaedc1
|
#727: remove unnecessary fields
|
2012-11-20 16:33:29 +04:00 |
Vokhmin Alexey V
|
2203bb8ad0
|
update locales
|
2012-11-19 21:02:08 +04:00 |
Vokhmin Alexey V
|
894f8651d9
|
rename BUILD_IN_QUEUE to BUILD_PENDING
|
2012-11-19 20:38:08 +04:00 |
Vokhmin Alexey V
|
edc6638b1e
|
update statuses
|
2012-11-19 20:05:12 +04:00 |
Vokhmin Alexey V
|
846aedf49d
|
add canceling status
|
2012-11-19 19:41:59 +04:00 |
Vokhmin Alexey V
|
ebbf47f818
|
show file size, and in_queue status for ProductBuildList
|
2012-11-19 19:11:07 +04:00 |
Vladimir Sharshov
|
34bb256ff1
|
Merge pull request #715 from warpc/iso-worker
[refs #711] Integration Iso worker
|
2012-11-14 03:14:28 -08:00 |
Alexander Machehin
|
21a32fba6c
|
show expected message after add member error
|
2012-11-13 20:29:45 +06:00 |
Vokhmin Alexey V
|
f522fd3cd0
|
add selecting Arch on create product build
|
2012-11-13 18:01:06 +04:00 |
Vokhmin Alexey V
|
21d8a42072
|
merge master into the branch
|
2012-11-12 20:52:33 +04:00 |
Vokhmin Alexey V
|
51aff682d4
|
some refactoring according to Alexander's comments
|
2012-11-12 20:23:11 +04:00 |
Vokhmin Alexey V
|
259eeaecfc
|
add Stop action and time_living for building ISO
|
2012-11-12 17:22:19 +04:00 |
Alexander Machehin
|
26af1aa27c
|
Merge branch 'master' into 90-fix_orphan_pulls
Conflicts:
app/models/pull_request.rb
|
2012-11-09 20:53:55 +06:00 |
Vokhmin Alexey V
|
ef967e97ae
|
small style changes
|
2012-11-09 17:51:33 +04:00 |
Vokhmin Alexey V
|
b39ccea0d5
|
add show logs in real time
|
2012-11-09 17:08:56 +04:00 |
Vokhmin Alexey V
|
3d293b908d
|
added IsoWorkerObserver
|
2012-11-09 01:39:42 +04:00 |
Vokhmin Alexey V
|
fc3dbbf698
|
added help for creating ISO
|
2012-11-08 15:11:44 +04: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
|
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 |
Alexander Machehin
|
7870ffef7d
|
[refs #579] fixed some bugs
|
2012-10-18 00:38:42 +06: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 |
Alexander Machehin
|
bb47567628
|
[refs #579] small improvements of the discussion
|
2012-10-13 00:12:04 +06: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 |
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 |
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 |
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
|
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 |
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 |
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
|
0dd103b7f4
|
[refs #374] Fix build list tests, remove unused code.
|
2012-09-27 03:54:56 +04:00 |
Vokhmin Alexey V
|
37fbb4632e
|
#90: updated branch
|
2012-09-26 21:04:12 +04:00 |