Commit Graph

1130 Commits

Author SHA1 Message Date
wemeya
19454bca74 Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into author 2016-06-24 16:51:27 +08:00
Wenkai Yin
074ef19406 Merge pull request #408 from ywk253100/new-ui-with-sync-image
merge with master
2016-06-24 15:36:15 +08:00
kun wang
838ba8cb44 Merge pull request #397 from yhua123/patch-2
removed required restriction on username/password when adding a target.
2016-06-24 15:26:50 +08:00
Wenkai Yin
9e039c6a8e Merge remote-tracking branch 'upstream/master' into new-ui-with-sync-image
Conflicts:
	utils/registry/registry.go
2016-06-24 14:59:20 +08:00
Wenkai Yin
a20928c910 Merge pull request #407 from ywk253100/bug_fix_for_access_log
add insecure filed to job log and pass variable insecure to base handler
2016-06-24 14:39:07 +08:00
Wenkai Yin
6c2dc9759a pass variable insecure to base handler 2016-06-24 13:57:48 +08:00
Wenkai Yin
97150ee1f8 add insecure filed to job log 2016-06-24 13:00:56 +08:00
Wenkai Yin
610e98369c Merge pull request #406 from ywk253100/bug_fix_for_access_log
add error logs to job log file when error occurs
2016-06-24 12:46:29 +08:00
Wenkai Yin
d113ed22a2 add error logs to job log file when error occurs 2016-06-24 12:34:15 +08:00
wemeya
fa928d1abc Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into author 2016-06-24 10:50:35 +08:00
Daniel Jiang
32d981ef88 Merge pull request #405 from reasonerjt/master
handle pagination in catalog api
2016-06-24 01:49:05 +08:00
Tan Jiang
23d1acb24a fixes #398 2016-06-24 01:37:37 +08:00
Tan Jiang
7bd1888b73 handle pagination in catalog api 2016-06-24 00:21:14 +08:00
Wenkai Yin
1dabbc6427 Merge pull request #402 from ywk253100/bug_fix_for_access_log
insecure https support when checking and creating project
2016-06-23 20:09:32 +08:00
Wenkai Yin
a1b3a07d39 pass govet 2016-06-23 18:35:22 +08:00
Wenkai Yin
543cb26da1 update 2016-06-23 18:23:40 +08:00
Wenkai Yin
33035378a9 insecure https support when checking and creating project 2016-06-23 18:19:39 +08:00
wemeya
f037b23fb8 modify code for test 2016-06-23 18:15:58 +08:00
wemeya
c4734205e4 Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into author 2016-06-23 15:54:50 +08:00
Wenkai Yin
79b7c78f46 Merge pull request #396 from ywk253100/bug_fix_for_access_log
create a new registry client when refreshing cache
2016-06-23 15:34:35 +08:00
yhua123
fcc87d71a9 Update create-destination.directive.html
delete 'username' and  'passwd' blank remind
2016-06-23 15:19:12 +08:00
Wenkai Yin
841018e2d8 create a new registry client when refreshing cache 2016-06-23 15:18:32 +08:00
yhua123
2cded59909 Update create-policy.directive.html
delete 'usrname' & 'passwd' blank remind message
2016-06-23 15:14:10 +08:00
Wenkai Yin
a8cbcfbfe6 create a new registry client if it is nil in cache 2016-06-23 15:07:05 +08:00
Wenkai Yin
8e35282b11 Merge pull request #374 from ywk253100/bug_fix_for_access_log
bug fix: there's access log generated each time when view the manifes…
2016-06-23 13:51:53 +08:00
Wenkai Yin
eebf520ed5 pass go test 2016-06-23 13:02:36 +08:00
Wenkai Yin
5fbe2c1a72 token request posted to token service directly 2016-06-23 12:14:26 +08:00
Wenkai Yin
61a888926e Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into bug_fix_for_access_log
Conflicts:
	api/target.go
2016-06-23 11:17:09 +08:00
Daniel Jiang
9e8256c2d8 Merge pull request #393 from reasonerjt/job-service
propagate more env vars
2016-06-23 11:07:46 +08:00
Tan Jiang
06c12ee622 fix golint issue on comment 2016-06-23 10:50:10 +08:00
kunw
169ebf0ee4 update on switching langanges of UI. 2016-06-22 19:56:21 +08:00
kunw
5acf9ea114 update for setting languages on cookies. 2016-06-22 19:25:23 +08:00
kunw
e77fb427ae Merge branch 'new-ui-with-sync-image' of https://github.com/vmware/harbor into new-ui-with-sync-image 2016-06-22 19:03:23 +08:00
kunw
32a52a42d3 add more restriction check on sync-image of UI. 2016-06-22 19:03:12 +08:00
Tan Jiang
26124d366f propagate more env vars 2016-06-22 18:41:56 +08:00
Wenkai Yin
53abe230a0 Merge pull request #392 from ywk253100/update_and_create_policy_api_modify
bug fix: fixed policy can not be updated
2016-06-22 18:33:37 +08:00
Wenkai Yin
2da237f8bb bug fix: fixed policy can not be updated 2016-06-22 18:11:47 +08:00
kunw
210d2044b2 Merge branch 'new-ui-with-sync-image' of https://github.com/vmware/harbor into new-ui-with-sync-image 2016-06-22 16:37:09 +08:00
kunw
602dc2069d add comments on addnew controller code. 2016-06-22 16:36:48 +08:00
wemeya
f3203272e2 modify sql where condition 2016-06-22 16:36:36 +08:00
Daniel Jiang
3f7ff6da48 Merge pull request #381 from reasonerjt/job-service
data migration script to 0.2.0
2016-06-22 16:14:52 +08:00
kunw
5fe5b40d29 Merge branch 'new-ui-with-sync-image' of https://github.com/vmware/harbor into new-ui-with-sync-image 2016-06-22 15:15:31 +08:00
kunw
5e538fa9e5 updates for adding new user and auth_mode check feature of UI. 2016-06-22 15:15:25 +08:00
Wenkai Yin
97ea1da965 Merge pull request #384 from ywk253100/update_and_create_policy_api_modify
Update and create policy api modify
2016-06-22 15:05:07 +08:00
Wenkai Yin
9cdb24f4e1 Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into update_and_create_policy_api_modify 2016-06-22 14:19:31 +08:00
Wenkai Yin
b985c5bed4 1.only target of disabled policy can be modified 2.duplicated policy can not be created 2016-06-22 14:19:19 +08:00
wemeya
5f9edba5a6 modify code for travis CI 2016-06-22 14:15:32 +08:00
wemeya
1c1764495d Merge remote-tracking branch 'upstream/new-ui-with-sync-image' into author 2016-06-22 14:15:05 +08:00
kunw
82de5b3bf4 updates for mainframe width and height style settings. 2016-06-22 12:37:52 +08:00
Tan Jiang
a80e0190c6 data migration script to 0.2.0 2016-06-22 12:22:02 +08:00