Commit Graph

758 Commits

Author SHA1 Message Date
wemeya
9f16403a22 modify test code 2016-06-02 19:03:04 +08:00
wemeya
eb62beba31 modify merge conflicts 2016-06-02 17:57:39 +08:00
Wenkai Yin
ca6131e67d Merge pull request #305 from ywk253100/sync_image
bug fix: the username in token is null when using basic auth
2016-06-02 17:33:31 +08:00
wemeya
389a6037d5 change code as the review reqired 2016-06-02 17:33:10 +08:00
Wenkai Yin
396889280f bug fix: the username in token is null when using basic auth 2016-06-02 17:32:04 +08:00
root
d66a8f913e merge master 2016-06-02 13:41:52 +08:00
wemeya
267152f8e6 change code according to review 2016-06-01 19:29:08 +08:00
wemeya
ccbe297bba change code according to travis CI 2016-06-01 18:12:06 +08:00
wemeya
1c9162559c change code 2016-06-01 18:07:33 +08:00
wemeya
c972406d0f change code 2016-06-01 18:02:32 +08:00
wemeya
9b5cb57d2a change code according to travis CI 2016-06-01 17:57:33 +08:00
wemeya
af55312664 change code for review 2016-06-01 17:51:06 +08:00
wemeya
4d4ab9e408 Merge remote-tracking branch 'upstream/master' 2016-06-01 17:02:02 +08:00
wemeya
ffd58c0f2d add api to list top 10 repos 2016-06-01 17:01:43 +08:00
kun wang
54e54433e1 Merge pull request #283 from liubin/add-support-for-Japanese
add Japanese support
2016-06-01 16:33:13 +08:00
Wenkai Yin
aadef3c10f Merge pull request #297 from ywk253100/sync_image
Sync image
2016-06-01 15:32:21 +08:00
Wenkai Yin
610566fe73 Merge branch 'master' into sync_image 2016-06-01 15:10:52 +08:00
Wenkai Yin
8c6ea744c2 modify test codes of registry client to pass test 2016-06-01 15:09:10 +08:00
Wenkai Yin
8206ef2dcb Merge pull request #296 from ywk253100/bug_fix_get_member
bug fix: the length should be 0 when initialize a slice
2016-06-01 13:52:07 +08:00
Wenkai Yin
297e5c4a44 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-06-01 13:50:19 +08:00
Wenkai Yin
07c7ce403c bug fix: the length should be 0 when initialize a slice 2016-06-01 13:47:23 +08:00
Daniel Jiang
38d68bec0c Merge pull request #295 from reasonerjt/job-service
update travis.yml and fix build issues
2016-06-01 13:37:44 +08:00
Tan Jiang
bd223796b4 fix issue in travis 2016-06-01 13:28:02 +08:00
Tan Jiang
c18fb10f80 install mysql 5.6 on travis 2016-06-01 13:06:01 +08:00
Tan Jiang
9f06617ea6 install mysql 5.6 on travis 2016-06-01 12:57:10 +08:00
Tan Jiang
82840368ff install mysql 5.6 on travis 2016-06-01 12:35:44 +08:00
wemeya
498d2e629a change code according to review 2016-06-01 12:27:26 +08:00
wemeya
0aade05222 change code according to comment 2016-05-31 17:38:51 +08:00
Wenkai Yin
f7897b53f3 Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-05-31 15:08:59 +08:00
Wenkai Yin
7dad92d607 remove restriction for id in router because the .../current api/ 2016-05-31 15:03:45 +08:00
Daniel Jiang
e3085a31bc Merge pull request #285 from reasonerjt/job-service
Job service, add comments to pass golint
2016-05-30 17:43:37 +08:00
wemeya
97b5d16e26 change dao_test file 2016-05-30 17:22:38 +08:00
wemeya
53edb50eef modify code to search logs only relevant to the user 2016-05-30 17:11:39 +08:00
Tan Jiang
e53d2d9900 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-30 15:53:55 +08:00
Wenkai Yin
f0de98d9ad add comment 2016-05-30 15:39:51 +08:00
Tan Jiang
05069eeed1 clean up code, update API url of job service 2016-05-30 14:44:03 +08:00
bin liu
bf6c8e5a44 remove tail comma 2016-05-30 14:42:23 +08:00
bin liu
3470366199 add Japanese support 2016-05-27 23:20:26 +08:00
Wenkai Yin
2df9f97467 Merge pull request #282 from ywk253100/sync_image
support job deletion
2016-05-27 18:48:26 +08:00
Wenkai Yin
4f0e64c404 support job deletion 2016-05-27 18:46:07 +08:00
wemeya
b29a41034c modify code according to review 2016-05-27 17:54:25 +08:00
wemeya
e4bffb59da Merge remote-tracking branch 'upstream/master' 2016-05-27 17:32:54 +08:00
Daniel Jiang
34490c1d02 Merge pull request #279 from reasonerjt/job-service
Job service integration
2016-05-27 16:25:10 +08:00
Tan Jiang
8817c24a27 Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-27 16:21:55 +08:00
Tan Jiang
9493b8c238 integrate jobservice into docker-compose template 2016-05-27 16:21:32 +08:00
Wenkai Yin
116cc15804 Merge pull request #276 from ywk253100/sync_image
Sync image
2016-05-27 15:17:53 +08:00
Wenkai Yin
f76b45426c conflict fix 2016-05-27 15:15:57 +08:00
Wenkai Yin
50994cc183 Merge pull request #275 from ywk253100/sync_image
Sync image
2016-05-27 15:14:52 +08:00
Wenkai Yin
1e09cf899b fix 2016-05-27 15:04:20 +08:00
Wenkai Yin
a4d318dffe Merge pull request #274 from ywk253100/modify_authentication_of_repository_api
bug fix: create repository client with credential when basic auth is used
2016-05-27 12:25:35 +08:00