4085 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
stonezdj	b99a13cfa8	Fix bug 4073	2018-01-19 11:46:24 +08:00
Wenkai Yin	69fa18c881	Merge pull request #4059 from ywk253100/180117_job_status ... Support multiple status in query string of replication job listing API	2018-01-18 18:05:08 +08:00
pengpengshui	db8511bd0b	Merge pull request #4045 from pengpengshui/batchDelection ... Add add endpoint button in replication rule	2018-01-18 16:18:54 +08:00
Fuhui Peng (c)	5b921d59aa	Modify package.json	2018-01-18 15:08:45 +08:00
Fuhui Peng (c)	29e53817b9	Merge remote-tracking branch 'upstream/master' into batchDelection	2018-01-18 14:59:32 +08:00
Qian Deng	8f855ffc4e	Merge pull request #4037 from ninjadq/admin_rename_ui ... add admin rename ui	2018-01-18 14:53:17 +08:00
Daniel Jiang	440f5e6364	Merge pull request #4039 from stonezdj/ldap_migrate_scope ... Add update ldapScope for migrate	2018-01-18 14:12:06 +08:00
stone	c815dc01dd	Merge pull request #4043 from reasonerjt/uaa-bugfix ... Read Email from UAA while onboarding user.	2018-01-18 14:04:35 +08:00
Deng, Qian	b884be3e72	Add admin rename ui Add UI Element for rename admin	2018-01-18 13:49:13 +08:00
Qian Deng	b61e0ec867	Merge pull request #3953 from ninjadq/fix_text_bugs ... Fix bugs about i18n & text	2018-01-18 13:19:02 +08:00
Qian Deng	a34512f072	Merge pull request #4022 from ninjadq/update_package_js ... Update package.js file	2018-01-18 13:17:10 +08:00
pfh	757a99bc6e	Add add endpoint button in replication rule ... Modify stop job button privilege Modify dispay issue about replication rule	2018-01-17 19:46:07 +08:00
yixingjia	208cb02d5c	Merge pull request #4054 from yixingjia/HA_Monitor ... Keepalived real server check script	2018-01-17 19:03:14 +08:00
Deng, Qian	ac34c2c1da	Fix bugs about i18n & text	2018-01-17 17:24:07 +08:00
Wenkai Yin	9ec8b4d634	Support multiple status in query string of replication job listing API	2018-01-17 17:07:10 +08:00
yixingj	ffa69bb256	Enhance monitor script for HA ... Add keepalived real server check script	2018-01-17 14:23:26 +08:00
stonezdj	01ba4e1ea8	Add update ldapScope for migrate	2018-01-17 14:01:57 +08:00
Wenkai Yin	45894de89a	Merge pull request #4038 from ywk253100/180116_bug_fix ... Fix bug: checking whether the status is null when listing replication jobs	2018-01-17 12:06:22 +08:00
Tan Jiang	d5d913f51d	Read Email from UAA while onboarding user. ... Will call the userinfo API of UAA to get user info and generage user model based on the response. Also this commit include a change that whenever the UAA Client is to be used it will update the configuraiton, this is needed as we enable user to update the configuration of UAA via UI.	2018-01-17 10:28:49 +08:00
Daniel Jiang	7195865226	Merge pull request #4018 from wy65701436/refine-build-process ... [Upload Build] Refine CI build process and storage structure	2018-01-17 10:21:14 +08:00
Deng, Qian	289946ccb4	Update package.js ... Using fixed version number to reduce the npm log in travis	2018-01-16 19:40:31 +08:00
Wenkai Yin	7ebcc82516	Fix bug: checking whether the status is null when listing replication jobs	2018-01-16 19:25:18 +08:00
Wenkai Yin	8cda2d8d65	Merge pull request #4036 from ywk253100/180116_s3 ... Propagate registry storage driver name to adminserver and return it in /api/systeminfo	2018-01-16 18:41:08 +08:00
wangyan	c4a66bf3c0	Refine CI build process and storage structure	2018-01-16 02:20:55 -08:00
pengpengshui	7537d0ff10	Merge pull request #4010 from pengpengshui/batchDelection ... Modify replication list to batch delection mode	2018-01-16 17:59:20 +08:00
Daniel Jiang	1595200d05	Merge pull request #4028 from jessehu/reload_config ... [Issue 4015] Read reload_config option from harbor.cfg	2018-01-16 17:35:04 +08:00
Qian Deng	5017670d00	Merge pull request #4005 from ninjadq/db_migrate_from_1_3_to_1_4 ... Update migration tool for v1.4	2018-01-16 17:04:54 +08:00
Wenkai Yin	53d5a2256a	Propagate registry storage driver name to adminserver and return it in /api/systeminfo	2018-01-16 16:57:28 +08:00
pfh	78dcdc409f	Modify replication list to batch delection mode and add admin privilege to project replication module ... Modity text about new replication rule	2018-01-16 15:53:11 +08:00
Deng, Qian	b3e65ed71e	Update migration tool for v1.4 ... 1. Update database meta file 2. Add migration file for 1.4	2018-01-16 15:38:51 +08:00
Wenkai Yin	e1a5958258	Merge pull request #4013 from ywk253100/180112_property_name ... Update the value of trigger type and schedule type	2018-01-16 13:26:33 +08:00
Jesse Hu	b995881cd2	[Issue 4015] Read reload_config option from harbor.cfg ... If reload_config is true, Harbor will reload all configuration in harbor.cfg when restarting. It's false by default.	2018-01-16 12:42:30 +08:00
Daniel Jiang	a9fe5564df	Merge pull request #4011 from ywk253100/180112_fix_404 ... Handle /harbor/* with IndexController to fix UI 404 Page Not Found error	2018-01-15 17:10:43 +08:00
Wenkai Yin	a1dd8c3bff	Merge pull request #4004 from ywk253100/180111_jobservice ... Provide a mechanism to stop pending and retrying jobs	2018-01-15 12:55:44 +08:00
Daniel Jiang	083b924829	Merge pull request #4016 from reasonerjt/enable-edit-uaa ... Enable user to edit UAA settings on UI	2018-01-15 11:00:52 +08:00
Tan Jiang	bc1366c3e5	Enable user to edit UAA settings on UI	2018-01-14 11:47:45 +08:00
Daniel Jiang	a214084370	Merge pull request #4014 from reasonerjt/dao-test-clear ... Remove data generated by dao_test after the test.	2018-01-12 19:00:39 +08:00
Wenkai Yin	af8dbff4ce	Update the value of trigger type and schedule type	2018-01-12 16:19:41 +08:00
Tan Jiang	d6bf0ea11d	Remove data generated by dao_test after the test.	2018-01-12 15:56:30 +08:00
Wenkai Yin	27b4197459	Handle /harbor/* with IndexController to fix UI 404 Page Not Found error	2018-01-12 15:48:42 +08:00
Wenkai Yin	4070ed5152	Provide a mechanism to stop pending and retrying jobs	2018-01-12 15:29:20 +08:00
Daniel Jiang	43afd426bb	Merge pull request #3995 from reasonerjt/admin-rename ... Provide API to rename admin	2018-01-12 13:59:13 +08:00
stone	ec173305a3	Merge pull request #3974 from stonezdj/ldap_ping_timeout ... Setting timeout for ldap ping	2018-01-12 11:22:27 +08:00
sigsbee	bf14cf4436	Add batch delete testcase (#3981)	2018-01-12 10:42:17 +08:00
Tan Jiang	a392a8dc29	Provide API to rename admin ... This is to provide a workaround for very corner case that in user's authentication backend (LDAP, UAA) has a user called "admin" and because Harbor's super user is hard coded to "admin" it's not possible to login the "admin" with credentials in LDAP or UAA. To minimize the impact, we'll provide an internal API for user to update the super user's username from "admin" to "admin@harbor.local", this API can be called by "admin" only, and is not reversible.	2018-01-11 23:01:06 +08:00
stonezdj	c48c7f7b6a	Setting timeout for ldap ping	2018-01-10 15:14:30 +08:00
pengpengshui	7831a01f26	Merge pull request #3934 from pengpengshui/batchDelection ... Modify filters' position and modify member module switch members' ap…	2018-01-10 14:50:52 +08:00
stone	83faddcdef	Merge pull request #3965 from stonezdj/ldap_search_level2 ... Change ldap scope after refactor	2018-01-10 11:31:53 +08:00
Qian Deng	e8c86cde54	Merge pull request #3970 from ninjadq/migration_doc_update ... Update doc file to avoid issues when rollback from 1.3 to 1.2	2018-01-10 11:00:23 +08:00
Wenkai Yin	e26b442c9c	Merge pull request #3951 from ywk253100/180104_replicate_interval ... Manual starting replication will be rejected if there are pending/running jobs	2018-01-10 10:56:45 +08:00