Commit Graph

850 Commits

Author SHA1 Message Date
Wenkai Yin
b782e18b0c Merge pull request #333 from ywk253100/sync_image
remove duplicate mysql installation
2016-06-14 17:37:02 +08:00
Wenkai Yin
db9347135c bug fix 2016-06-14 17:33:37 +08:00
Wenkai Yin
fcfa009cad remove duplicate mysql installation 2016-06-14 13:04:31 +08:00
Wenkai Yin
dba2ce3bf2 Merge pull request #332 from ywk253100/sync_image
assume Yes to remove
2016-06-14 12:07:48 +08:00
Wenkai Yin
df4766b43e add primary key annotation to models 2016-06-14 11:59:44 +08:00
Wenkai Yin
fa0898f98c assume Yes to remove 2016-06-14 11:38:10 +08:00
Wenkai Yin
c7418f43da Merge pull request #331 from ywk253100/sync_image
Sync image
2016-06-14 11:19:16 +08:00
Wenkai Yin
81600e8db4 bug fix 2016-06-14 11:14:48 +08:00
Wenkai Yin
14e71f0052 Merge branch 'master' into sync_image
Conflicts:
	.travis.yml
	models/accesslog.go
	models/project.go
	models/user.go
2016-06-13 18:14:41 +08:00
Wenkai Yin
8f56e9fc4a Merge pull request #330 from ywk253100/sync_image
add modify policy
2016-06-13 17:54:05 +08:00
Wenkai Yin
bc0aa21441 add modify policy 2016-06-13 17:32:22 +08:00
Wenkai Yin
32857a9154 Merge pull request #329 from ywk253100/sync_image
filter policies by name and project ID
2016-06-13 16:57:43 +08:00
Wenkai Yin
39edccf549 filter policies by name and project ID 2016-06-13 16:49:46 +08:00
Wenkai Yin
784947a787 Merge pull request #328 from ywk253100/sync_image
Sync image
2016-06-13 14:40:25 +08:00
Wenkai Yin
cf7ee9a327 update implements of FilterTargets() 2016-06-13 14:24:13 +08:00
Wenkai Yin
82b4781571 update implements of FilterTargets() 2016-06-13 13:48:12 +08:00
Wenkai Yin
e05ff0373b update implements of FilterTargets() 2016-06-13 08:54:42 +08:00
Wenkai Yin
e5fe595f62 add test for FilterTargets() 2016-06-13 08:42:11 +08:00
Wenkai Yin
3bc41cc6d3 filter targets by name 2016-06-13 08:31:32 +08:00
Wenkai Yin
a7845df552 Merge pull request #307 from wemeya/develop
api for logs, updating user profile and listing top repositories
2016-06-08 17:59:10 +08:00
wemeya
6f188e5620 modify swagger.yml 2016-06-08 17:00:25 +08:00
wemeya
97c8c785bd modify swagger.yml 2016-06-08 15:14:41 +08:00
wemeya
a481a01035 modify swagger.yml 2016-06-08 11:20:41 +08:00
wemeya
e34162bcb5 modify syntax error 2016-06-07 20:38:56 +08:00
wemeya
0147ec8d3b Merge remote-tracking branch 'upstream/job-service' into develop 2016-06-07 20:35:24 +08:00
kun wang
2784e72151 Merge pull request #323 from wknet123/master
update for listing repo name contains dot.
2016-06-07 18:09:10 +08:00
kunw
f3723384b1 update for listing repo name contains dot. 2016-06-07 17:49:17 +08:00
Daniel Jiang
8a55cd8efc Merge pull request #322 from yhua123/master
update .travis and go lib dir
2016-06-07 16:11:45 +08:00
yhua
227ea57d6e update .travis 2016-06-07 16:00:46 +08:00
yhua
2c9ff58a81 Merge remote-tracking branch 'upstream/master'
merge code for develop 20160607
2016-06-07 15:02:45 +08:00
yhua
bd8f311d1b test for travis and github lib(1) 2016-06-07 14:55:04 +08:00
yhua
2f8ec6461b test for travis and github lib 2016-06-07 14:40:37 +08:00
Daniel Jiang
285572e64b Merge pull request #319 from vmware/api-attribute-rename
Api attribute rename
2016-06-07 14:26:39 +08:00
Daniel Jiang
fdeba6acd0 Merge pull request #321 from reasonerjt/master
remove .swp files
2016-06-07 14:26:12 +08:00
Tan Jiang
46187d6fa8 remove .swp files 2016-06-07 14:06:29 +08:00
Wenkai Yin
52c7f9716b Merge pull request #317 from ywk253100/sync_image
Sync image
2016-06-07 13:58:16 +08:00
Daniel Jiang
e4d4e8a92f Merge pull request #320 from yhua123/master
for API testing (support Travis automation testing)
2016-06-07 13:52:18 +08:00
Wenkai Yin
cc890adf49 Merge branch 'master' into sync_image 2016-06-07 13:51:15 +08:00
Wenkai Yin
f91d2f1eba Merge remote-tracking branch 'upstream/job-service' into sync_image 2016-06-07 13:48:10 +08:00
yhua
202a2a91c5 remove cat 2016-06-07 13:41:27 +08:00
Wenkai Yin
6788f891f1 add test for dao metod 2016-06-07 13:41:02 +08:00
yhua
12e15de42e change docker status 2016-06-07 13:28:51 +08:00
kunw
0151639ebd updates for item-detail.js 2016-06-07 13:00:08 +08:00
yhua
83a88e5ec0 automation testing 2016-06-07 12:27:21 +08:00
yhua
00f69eb327 automation testing 2016-06-07 12:19:48 +08:00
kunw
b8201688d6 Merge branch 'api-attribute-rename' of https://github.com/vmware/harbor into api-attribute-rename 2016-06-07 11:55:14 +08:00
kunw
34e4c4e6f7 merged from upstream/master 2016-06-07 11:53:55 +08:00
wemeya
fbb26634a7 change code for travis ci 2016-06-06 23:47:27 +08:00
shixi_weimeng
8459fcf7dc change code for review 2016-06-06 23:07:17 +08:00
wemeya
411ead21fc change code for review 2016-06-06 17:53:36 +08:00