Commit Graph

646 Commits

Author SHA1 Message Date
Wenkai Yin
f471f13363 Merge pull request #205 from ywk253100/bug_fix_for_registry_client
Bug fix for registry client
2016-05-10 11:11:43 +08:00
xiahaoshawn
ebd0720751 changge head_content tpl 2016-05-10 11:07:10 +08:00
Wenkai Yin
f5bf0c1a3f bug fix 2016-05-10 10:59:59 +08:00
xiahaoshawn
648a5746dd make a combination in if condition 2016-05-10 10:58:43 +08:00
xiahaoshawn
cb9b8a7f55 change password for admin user when in LDAP mode 2016-05-09 20:57:41 +08:00
saga92
9cf2525c10 fix bugs 2016-05-09 18:50:04 +08:00
Wenkai Yin
48be0a988d dao test 2016-05-09 16:53:33 +08:00
Wenkai Yin
56ccfc024a search api modification for admin 2016-05-09 16:48:59 +08:00
saga92
ba1c737d3b Merge branch 'master' of https://github.com/saga92/harbor 2016-05-09 14:57:31 +08:00
saga92
85ad1392f8 add data migration module 2016-05-09 14:41:28 +08:00
saga92
7617f4c9a3 delete pyc file 2016-05-09 14:23:15 +08:00
saga92
65c0c47368 Delete README 2016-05-09 14:23:15 +08:00
saga92
b2af17f5f6 add data migration module 2016-05-09 14:23:15 +08:00
Nagarjun
a98a786f8c email field data type size changed to 128 characters from 30 characters 2016-05-09 11:48:23 +05:30
Wenkai Yin
8c8bad8602 sysadmin has all privileges for projects 2016-05-09 12:45:45 +08:00
Wenkai Yin
6373497e58 rollback 2016-05-05 16:24:08 +08:00
Wenkai Yin
e7e31dbb69 do not track them 2016-05-05 16:09:58 +08:00
Wenkai Yin
f2816ef9bc gitignore 2016-05-05 16:04:49 +08:00
Wenkai Yin
5fdfa0bdbd Merge remote-tracking branch 'upstream/master'
Conflicts:
	api/repository.go
2016-05-05 15:27:37 +08:00
Daniel Jiang
ccaad63730 Merge pull request #171 from ywk253100/registry_api_util_update
Registry v2 API util update
2016-05-05 14:46:20 +08:00
Daniel Jiang
1493c613d5 Merge pull request #179 from hmwenchen/feature/accesslog
Add unit test for AccessLog
2016-05-05 14:40:24 +08:00
kun wang
1ad4dde2cf Merge pull request #177 from wy65701436/master
Update API doc
2016-05-05 00:05:19 +08:00
wy65701436
b68f2e1d22 pass on the swagger parser check. 2016-05-03 23:43:37 -07:00
kun wang
894cd12179 Merge pull request #183 from reasonerjt/master
bump to golang 1.6.2 image to fix compilation error
2016-05-04 14:34:49 +08:00
Tan Jiang
a5cb8e16eb bump up go version in travis.yml 2016-05-04 14:25:54 +08:00
Tan Jiang
36160ea64c bump to golang 1.6.2 image to fix compilation error 2016-05-04 14:18:52 +08:00
wy65701436
f4f716ad31 pass on the swagger editor check. 2016-05-03 18:39:37 -07:00
wy65701436
c7da848dd5 pass on the swagger editor check. 2016-05-03 18:27:07 -07:00
hmwenchen
83ba195166 Add unit test for AccessLog 2016-05-03 16:54:01 +08:00
Tan Jiang
f0a2bc879a Merge remote-tracking branch 'upstream/job-service' into job-service 2016-05-03 15:57:00 +08:00
Tan Jiang
917adc9520 update to job service, support max job limit, state machine can transit automatically 2016-05-03 15:51:52 +08:00
Tan Jiang
8fba0b314f Merge branch 'master' into job-service 2016-05-03 13:52:50 +08:00
wy65701436
73fe2a30d6 remove duplicate parameters lines. 2016-05-02 22:43:50 -07:00
wy65701436
ff42923401 update API for creating user, updating password and comment post return. 2016-05-02 21:05:06 -07:00
wy65701436
2a461ee53e update API for creating user, updating password and comment post return. 2016-05-02 20:58:50 -07:00
Wenkai Yin
2462405c1f Merge remote-tracking branch 'upstream/master'
Conflicts:
	Deploy/templates/ui/env
	api/repository.go
2016-05-03 10:33:02 +08:00
Daniel Jiang
9a0db22019 Merge pull request #174 from ywk253100/cgo
set cgo as the default DNS resolver
2016-04-29 18:28:03 +08:00
Wenkai Yin
5a7857b05f set cgo as the default DNS resolver 2016-04-29 18:19:09 +08:00
Wenkai Yin
f2a180e617 update 2016-04-29 17:46:00 +08:00
Wenkai Yin
0f0bc86ade add logs 2016-04-29 17:22:17 +08:00
Wenkai Yin
9fbebad626 set cgo as the default DNS resolver 2016-04-29 17:03:11 +08:00
Wenkai Yin
bf53ca9a47 handler from=repo 2016-04-29 16:59:54 +08:00
Wenkai Yin
0a873bc046 Merge remote-tracking branch 'upstream/master' into registry_api_util_update
Conflicts:
	api/repository.go
2016-04-29 15:18:22 +08:00
Wenkai Yin
545ca4135c token expires 2016-04-29 14:59:00 +08:00
Wenkai Yin
60f5df1a80 set cgo as the default DNS resovler 2016-04-29 13:17:59 +08:00
Daniel Jiang
cf21e2fb7f Merge pull request #144 from hmwenchen/feature/accesslog
Feature/accesslog
2016-04-29 11:58:51 +08:00
Daniel Jiang
d4c04143e1 Merge pull request #168 from senk/patch-1
Updated README to include German
2016-04-29 11:58:25 +08:00
Wenkai Yin
fbe341bf5d update 2016-04-28 18:49:59 +08:00
Wenkai Yin
5cc51a753d Merge branch 'registry_api_util_update' 2016-04-28 10:55:31 +08:00
hmwenchen
5e8a6a6d55 Merge remote-tracking branch 'origin/master' into feature/accesslog
Enlarge registry timeout
2016-04-27 20:38:04 +08:00