Commit Graph

607 Commits

Author SHA1 Message Date
Daniel Jiang
e2dd4fcce9
Merge pull request #4154 from ninjadq/update_doc_for_descrption_repo
Update Docs for description repository
2018-02-02 15:38:25 +08:00
Wenkai Yin
6814efc9fc Update replication part of user guide as some UI pages are changed 2018-01-31 13:23:13 +08:00
yixingjia
45c3afbdf2
Merge pull request #4168 from yixingjia/HAdocs
Update HA document.
2018-01-31 12:33:08 +08:00
yixingj
a8dc8d784f Update HA document.
Format the docs
2018-01-30 18:13:35 +08:00
pengpengshui
f4270213ce
Merge pull request #4172 from pengpengshui/batchDelection
Modify replication list unsave when modify username or possword
2018-01-29 19:10:25 +08:00
yixingjia
bb479cbced
Merge pull request #3669 from yixingjia/harborRequiremnt
Harbor resource requirement doc
2018-01-29 17:07:19 +08:00
pfh
dca8459a13 Merge remote-tracking branch 'upstream/master' into batchDelection 2018-01-29 16:41:47 +08:00
Deng, Qian
70ee52edce Update Docs for description repository 2018-01-29 15:14:08 +08:00
Daniel Jiang
c5643f807e
Merge pull request #4150 from reasonerjt/swagger-415
Update swagger doc to include description for status code 415
2018-01-29 14:05:55 +08:00
Tan Jiang
45d2b1923e Update swagger doc to include description for 415 status code 2018-01-29 12:20:55 +08:00
stonezdj
310076597c Add Harbor ova migration guide 2018-01-29 10:28:38 +08:00
pfh
163fba0f21 Modify md file for some batch delection operation and change some pictures 2018-01-26 17:25:38 +08:00
yixingjia
f9272e25ae
Merge pull request #3923 from yixingjia/HAdocs
High availability Deployment installation guide
2018-01-25 18:43:18 +08:00
yixingj
74d98e4c8c High availability Deployment installation guide
HA installation guide for HA
2018-01-24 12:21:28 +08:00
Wenkai Yin
300463fe11
Merge pull request #4075 from ywk253100/180119_user_guide
Update replication part in user guide
2018-01-23 14:13:19 +08:00
Daniel Jiang
d18517c910
Merge pull request #4042 from stonezdj/ldap_doc_3962
Document update for LDAP/OVA
2018-01-22 15:45:37 +08:00
Wenkai Yin
eb7c0d19ad Update replication part in user guide 2018-01-19 15:41:59 +08:00
Wenkai Yin
611709a7be Add pagination support in listing replication policy API 2018-01-18 15:54:12 +08:00
stonezdj
72180e4d44 Document update for LDAP/OVA 2018-01-17 11:27:09 +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
Deng, Qian
da2bf64289 Update doc file to avoid issues when rollback from 1.3 to 1.2 2018-01-09 15:18:38 +08:00
stonezdj
aa4e36c61a Change ldap scope after refactor 2018-01-08 16:59:15 +08:00
Wenkai Yin
96a63c56b1 Merge remote-tracking branch 'upstream/master' into 180103_merge 2018-01-03 10:32:03 +08:00
yixingj
3153705731 Harbor resource requirement doc
Add harbor resource requirement for Harbor installation guide
2018-01-02 16:22:45 +08:00
stone
027fa72df7
Merge pull request #3681 from stonezdj/ova_install_doc
Add harbor ova install guide
2017-12-26 13:47:58 +08:00
stonezdj
110ff691ca Add harbor ova install guide 2017-12-26 12:49:37 +08:00
Daniel Jiang
1c2d5e8036
Merge pull request #3638 from CMUH/k8s/bump-to-newer-resource
Bump many resources type to newer ones of Kubernetes
2017-12-26 11:44:29 +08:00
Wenkai Yin
3be1d5a7fd Assign read-only privilege of replication policy to project admin and add stopping replication jobs API. 2017-12-25 23:49:21 +08:00
Wenkai Yin
665a54edc3 Merge remote-tracking branch 'upstream/master' into 171213_merge 2017-12-13 13:40:24 +08:00
Yan
bcb74dde83
Merge pull request #3730 from sigsbee/updateguide
Add link to user guide overview issue#3519
2017-12-10 20:49:24 -08:00
Qian Deng
5de872486c
Merge pull request #3692 from ywk253100/171127_repo_desc
Add update repository API to support description of repository
2017-12-04 17:25:38 +08:00
Wenkai Yin
2ba3758472 Update the replicatoin APIs in swagger.yaml 2017-12-04 15:39:40 +08:00
myufei
4e87152cd5 Add link to user guide overview issue#3519 2017-12-02 02:36:30 +08:00
Wenkai Yin
7ccdce33a0 Refactor ping target API
Merge ping target API by ID into ping target API
2017-11-29 17:15:03 +08:00
Wenkai Yin
8d9af50bbc Add update repository API to support description of repository 2017-11-27 14:18:57 +08:00
A31882(Wu Yi Chung)
0ae6eccde4 Replace Nginx-Proxy with Ingress 2017-11-27 09:25:24 +08:00
A31882(Wu Yi Chung)
ae2b702ea5 Replace ReplicationController with Deployment 2017-11-24 16:50:09 +08:00
Wenkai Yin
1c338ed30b Add replication manual trigger API & update replication/policy API docs 2017-11-24 10:50:10 +08:00
JJ Asghar
b38ebd6b29 Update installation_guide.md (#3558)
It's technically OpenStack not Openstack.
2017-11-19 22:39:34 -06:00
JJ Asghar
64431610ec Update kubernetes_deployment.md (#3565)
Some formatting to make it look prettier.
2017-11-19 22:39:00 -06:00
Wenkai Yin
249fd61dce Update installation guide for release 1.3 2017-11-17 16:21:07 +08:00
Evgeny Shmarnev
17c61b6ef7 Add link to official docker documentation 2017-11-15 09:14:00 +01:00
Wenkai Yin
e4f2711f4f Update user guide for release 1.3 2017-11-13 12:40:24 +08:00
Wenkai Yin
5cef58baa1 update according to the comments 2017-11-08 17:53:41 +08:00
Daniel Jiang
7cd44e4eb6
Merge pull request #3540 from cmingxu/patch-1
Update kubernetes_deployment.md
2017-11-07 15:17:18 +08:00
kevin.xu
047e5e9d05
Update kubernetes_deployment.md 2017-11-02 05:12:28 -05:00
Wenkai Yin
51d5df0849 Update replication policy API to support trigger and filter 2017-11-02 14:59:26 +08:00
Evgeny Shmarnev
af88cc11a9 ISSUE-3463: fix docker-compose command 2017-10-30 12:17:45 +01:00
Wenkai Yin
5b2ececae8 Merge pull request #3436 from ywk253100/171020_meta_api
Add project metadata API
2017-10-27 05:16:50 -05:00
Wenkai Yin
c355034c14 Add project metadata API
Project metadata API can be used to integrated with project management
service which can not provide all metadatas needed by Harbor.
2017-10-27 17:05:15 +08:00
Wenkai Yin
2156750b04 Move certificate verification to target level
The certificate verification is on system level before this commit. Moving it
to target level makes the configuration more flexible for different targets.
2017-10-20 15:36:56 +08:00
Wenkai Yin
66b2d0d3f3 Apply project level policies to standalone Harbor
The following features are only enabled in integration mode, this commit moves
these to standalone Harbor:
 - Content trust policy: only signed images can be pulled
 - Vulnerability policy: only images whose severity is below the threshold can be pulled
 - Automatic scan policy: automatic scan pushed images
2017-10-19 17:33:28 +08:00
Steven Zou
46814206bb Merge branch 'master' into master 2017-10-11 02:10:50 -05:00
Wenkai Yin
5333cdc5e3 Merge pull request #3311 from huzhengchuan/patch-1
fix type error in swagger.yaml
2017-10-10 21:33:32 -05:00
Daniel Jiang
503cbb5c10 Merge pull request #3345 from vmware/reasonerjt-patch-1-1
Update user_guide.md to include instructions to pull image via k8s.
2017-09-29 17:22:41 +08:00
Daniel Jiang
57a913a42b Fix typo 2017-09-29 16:41:40 +08:00
Daniel Jiang
9a7660596d Add instructions pulling image via kubernetes 2017-09-29 16:20:34 +08:00
Tan Jiang
72b9c5f39e Refine document to add limitation and clarify loading the image, also update the name of prepare script to k8s-prepare, to differentiate the default one. 2017-09-28 16:28:59 +08:00
Steven Zou
708a8b04a2 add sceenshots for the demo references added in user guide document 2017-09-28 10:17:59 +08:00
Steven Zou
07b6934c9d add video demo references (both youtube and v.qq)to the readme.md and the user guide 2017-09-27 12:53:59 +08:00
huzhengchuan
3569d62b83 fix type error in swagger.yaml
fix #3310
2017-09-27 11:18:16 +08:00
Tan Jiang
0615f7ba9b Refine k8s deployment scripts and document 2017-09-26 13:57:44 +08:00
Wenkai Yin
82dc758064 Merge pull request #3213 from ywk253100/170914_image_size
Return image size when getting detail information of tag
2017-09-19 17:09:49 +08:00
Wenkai Yin
8d7644b8b5 Merge pull request #3151 from ywk253100/170830_email_insecure
Expose the insecure flag for email configuration
2017-09-15 15:01:30 +08:00
Wenkai Yin
2ebcc454ba support image size 2017-09-15 13:34:23 +08:00
Daniel Jiang
6efa2d5414 Merge pull request #2308 from m-masataka-ns/modify_userguide_in_notary
Add the discription of notary in User Guide
2017-09-13 17:46:31 +08:00
Wenkai Yin
99c1168e29 update description of new feature for different roles 2017-09-11 12:48:45 +08:00
Wenkai Yin
74dfeed7df update swagger 2017-09-04 15:12:54 +08:00
Tan Jiang
d1852e08e3 update swagger for 1.2 API. 2017-08-30 17:03:03 +08:00
Steven Zou
489b89dc13 recapture screenshots for vul scanning and content trust 2017-08-21 14:16:34 +08:00
yixingj
5864434a28 Fix commond issue 2017-08-18 14:26:26 +08:00
Daniel Jiang
987ad06ed7 Merge pull request #3024 from reasonerjt/master
fix issue in use_notary document
2017-08-10 15:27:35 +08:00
Tan Jiang
f21c266d50 fix issue in use_notary 2017-08-10 14:22:26 +08:00
Haining Henry Zhang
c53c5f65a9 Vulnerability data import (#2981)
* update offline data import for vul scan

* update vul scan data import guide

* update vul data guide
2017-08-07 18:34:13 +08:00
Haining Henry Zhang
43b2bce6b1 update docs for 1.2 (#2974)
* update change log

* update documents

* update documents

* update AUTHORS

* update README

* update harbor.cfg

* remove unused files

* updated TOC of docs

* update REAME

* update README

* udpate docs for 1.2

* udpate authors

* updated installation guide

* updated migration guide

* updated migration guide
2017-08-07 14:38:10 +08:00
Daniel Jiang
a6dc3e549d Merge pull request #2941 from wy65701436/update-migration-guide
update migration guide
2017-08-04 19:18:13 +08:00
Yan
957bd1722a update installation guide (#2930)
* update installation guide

* add perf turning.

* update per comments

* update per comments
2017-08-04 18:04:14 +08:00
Daniel Jiang
ef909b4e0c Merge pull request #2318 from timchenxiaoyu/timchenxiaoyu-patch-1
docs error
2017-08-04 17:01:34 +08:00
sigsbee
4632926266 update userguide (#2933)
* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* fix refer

* update user guide gc

* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* update userguide

* update user guide

* update user guide
2017-08-03 15:26:44 +08:00
Daniel Jiang
8a92724198 Merge pull request #2931 from wy65701436/update-compile-guide
Update compile guide
2017-08-03 13:18:44 +08:00
Steven Zou
c05f843704 update document for Clair user guide 2017-08-02 18:47:32 +08:00
wangyan
7aff623997 update migration guide 2017-08-02 15:36:14 +08:00
wangyan
8331fe20d4 update compile guite 2017-08-01 14:42:56 +08:00
wangyan
6871a080b8 update compile guite 2017-08-01 14:35:08 +08:00
Daniel Jiang
9582637651 fixes #2539 (#2877) 2017-07-26 18:37:57 -07:00
yixingjia
69adddd866 Merge pull request #2786 from yixingjia/docs
Clair offline data update guide
2017-07-25 17:11:43 +08:00
Daniel Jiang
2a50559ff7 update swagger doc (#2822)
* update swagger doc

* remove unused definitions
2017-07-20 03:47:46 -07:00
yixingj
9b65a6ae75 Update the docs 2017-07-18 14:34:24 +08:00
yixingj
bfb0c0a32d Update Clair offiline date guide 2017-07-14 17:04:37 +08:00
yixingj
19a5591ef5 Update Clair offline data update doc 2017-07-14 16:57:43 +08:00
yixingj
008f386f7e refactor 2017-07-14 16:54:13 +08:00
yixingj
bfb1b7e75b refactor format 2017-07-14 16:50:04 +08:00
yixingj
dc8ec8921b refactor format 2017-07-14 16:48:00 +08:00
yixingj
a3ac9639f1 Clair offline data update guide 2017-07-14 16:43:03 +08:00
wemeya
ddee1ca7e8 Update swagger.yaml 2017-06-30 15:27:32 +08:00
Wenkai Yin
2ada2dbd16 Merge pull request #2631 from ywk253100/170626_statistic
Refactor statistics API to return private/public count of projects and repositories
2017-06-30 14:26:15 +08:00
Steven Zou
c90dacb0ba Merge pull request #2648 from steven-zou/master
Upgrade UI builder to 1.2.7
2017-06-27 19:26:57 +08:00
Steven Zou
22a4e91a79 Upgrade UI builder to 1.2.7 2017-06-27 18:33:53 +08:00
Steven Zou
30ece92360 Merge pull request #2614 from steven-zou/master
Update UI builder to 1.2.5
2017-06-26 14:24:55 +08:00
Wenkai Yin
6e9ec3f22c refactor statistics API 2017-06-26 14:15:01 +08:00
Steven Zou
7c68c1ca69 Enhance script in make/dev/nodeclarity/entrypoint.sh 2017-06-23 18:58:58 +08:00
Steven Zou
7c0e79d10a update ui builder to 1.2.6 2017-06-23 18:58:14 +08:00
Wenkai Yin
bdd49e51d5 call ui API to get project 2017-06-22 14:01:17 +08:00
Steven Zou
ed1263148f Merge pull request #2562 from steven-zou/master
Refactor harnor portal with sharable components in harbor-ui lib
2017-06-21 16:51:46 +08:00
Steven Zou
478b56e6a4 Modify travis config 2017-06-21 16:17:29 +08:00
Daniel Jiang
81c475eb93 Merge pull request #2584 from reasonerjt/clair-integration
update swagger YAML
2017-06-21 13:03:55 +08:00
Daniel Jiang
dc7d0a3d4f Merge pull request #2482 from wemeya/master
modify prepare-swagger.sh and configure_swagger.md
2017-06-21 11:08:06 +08:00
Tan Jiang
a8a00a425f update swagger YAML 2017-06-21 00:15:01 +08:00
Wenkai Yin
65f466d7da add get tag api 2017-06-20 16:56:40 +08:00
Tan Jiang
15384317e0 add with_clair flag in systeminfo 2017-06-15 16:15:46 +08:00
Wenkai Yin
7d595c10c5 Merge pull request #2485 from ywk253100/170608_project
Refactor GET /projects API
2017-06-14 21:03:28 +08:00
Wenkai Yin
802a2fbcce update 2017-06-14 20:23:29 +08:00
wemeya
a091f6f935 modify prepare-swagger.sh and configure_swagger.md 2017-06-14 17:30:53 +08:00
Wenkai Yin
539c0375a1 support pagination 2017-06-12 18:36:10 +08:00
Wenkai Yin
20cf8de0f7 Merge remote-tracking branch 'upstream/master' into 170608_project 2017-06-09 16:41:13 +08:00
Wenkai Yin
e97d7dab85 refactor GET /projects 2017-06-09 16:41:02 +08:00
Wenkai Yin
f700b1bfc6 Merge pull request #2461 from ywk253100/170607_log_api
Support query logs according to different conditions
2017-06-09 11:08:08 +08:00
Wenkai Yin
b2380818fd support query logs according to conditions 2017-06-08 14:44:08 +08:00
Daniel Jiang
2e5a4003a8 Merge pull request #2401 from wemeya/master
modify swagger.yaml
2017-06-08 11:16:52 +08:00
wemeya
1b995e1736 modify swagger.yaml 2017-06-01 15:21:40 +08:00
wemeya
4463540995 modify swagger.yaml 2017-06-01 14:22:19 +08:00
Wenkai Yin
1b83c0b076 support pagination in GET recent logs API 2017-05-26 17:51:20 +08:00
Wenkai Yin
30316a2b94 return signatures in GET tags API 2017-05-24 10:15:39 +08:00
Daniel Jiang
32102c1523 Merge pull request #2332 from vmware/release-1.1.0
merge 1.1.0 to master
2017-05-19 07:19:46 -07:00
Daniel Jiang
0b02231093 Update registry img (#2330)
* update the registry image

* update other yml files and docs to reflect image update
2017-05-19 00:19:27 -07:00
Steven Zou
a311d3d825 Change ui build image version to 1.1.2 2017-05-18 22:32:11 -07:00
timchenxiaoyu
86062d9592 docs error
fix #1347
2017-05-16 17:19:08 +08:00
root
299bf31337 Add the discription of notary in User Guide 2017-05-15 02:51:51 +00:00
Mizukoshi Masataka
39a0667fb2 modify the harbor-clarity-ui-builder's version in docs 2017-05-14 08:11:02 +00:00
Wenkai Yin
0cf2ef8a2b update 2017-05-11 17:34:08 +08:00
Wenkai Yin
06ba7e0de0 update 2017-05-11 12:34:14 +08:00
Wenkai Yin
6cf545f304 update swagger 2017-05-04 12:01:46 +08:00
Yan
4268d2a7fb Merge branch 'release-1.1.0' into release-1.1.0 2017-04-25 00:14:47 -07:00
wangyan
b061efdeb8 add 1.1.0.1 support
update 1.1.x

update 1.1.x
2017-04-24 23:49:27 -07:00
Henry Zhang
29236838c8 update installation guide 2017-04-24 15:01:19 +08:00
sigsbee
23506dc40f update user guide (#1983)
* update user guide

* update user guide

* update user guide

* update user guide

* update user guide

* fix refer

* update user guide gc

* update user guide

* update user guide

* update user guide

* update user guide
2017-04-18 17:09:45 +08:00
Steven Zou
0bec263df7 Merge pull request #2041 from steven-zou/master
update i18 development guide document
2017-04-18 15:50:13 +08:00
Steven Zou
f87e7475f4 update i18 development guide document 2017-04-18 15:26:12 +08:00
Haining Henry Zhang
d84218d7f0 Update TOC of docs (#2032)
* update change log

* update documents

* update documents

* update AUTHORS

* update README

* update harbor.cfg

* remove unused files

* updated TOC of docs

* update REAME

* update README
2017-04-18 14:16:52 +08:00
Yan
c06abe9b8a Merge pull request #2026 from wy65701436/1.1.0-document
update compile document
2017-04-17 22:16:15 -07:00
wangyan
c31ad85042 update version 2017-04-17 21:47:43 -07:00
Haining Henry Zhang
05378cbd85 Merge pull request #2031 from sigsbee/fixmarkdown
fix markdown
2017-04-17 20:33:48 +08:00
myufei
07f38025e0 fix markdown 2017-04-17 19:06:00 +08:00
wangyan
f41fcdeeb4 update compile document
update makefile

update per comments

update document
2017-04-17 04:05:33 -07:00
Tan Jiang
ce0b22633e fix port issue 2017-04-17 19:02:05 +08:00
Tan Jiang
33aca89a37 refer to lifecycle mgmt section 2017-04-17 18:23:49 +08:00
Tan Jiang
0b9008c131 update install guide to highlight the lifecycle management commands for Harbor in notary mode 2017-04-17 16:19:18 +08:00
Tan Jiang
84eed7fdaf update according to review comments 2017-04-17 12:56:49 +08:00
Tan Jiang
f8db6c6cf6 update installation guide 2017-04-14 18:10:07 +08:00
Wenkai Yin
ac77ee3bc4 modify ping targat and put target api 2017-04-10 13:45:24 +08:00
Daniel Jiang
7d6d641827 Merge branch 'master' into dev 2017-04-05 17:01:27 +08:00
wy65701436
3c44235efe move clarity to vmware namespace. 2017-04-04 20:12:00 -07:00
Tan Jiang
6e671e5cc2 minor fix to doc for setup env for using notary 2017-03-28 22:54:39 +08:00
Daniel Jiang
f749b84aff Merge pull request #1806 from wy65701436/dev
change version to gittag
2017-03-27 18:52:30 +08:00
wy65701436
4f8174a497 remove proxy from doc 2017-03-26 23:55:37 -07:00
Wenkai Yin
4cc2115a23 Merge pull request #1710 from ywk253100/170321_url
Refactor API URL.
2017-03-27 13:26:32 +08:00
Wenkai Yin
5c4808bf93 update frontend codes 2017-03-24 18:38:33 +08:00
Wenkai Yin
d83554013b Merge remote-tracking branch 'upstream/dev' into 170321_url 2017-03-24 14:56:55 +08:00
Tan Jiang
90bc280ea1 add a 4443 ssl server to nginx config 2017-03-24 13:16:48 +08:00
wy65701436
9d4b36a97c add doc for make 2017-03-23 00:20:18 -07:00
Tan Jiang
a588819ce0 add a simple guide for notary on harbor 2017-03-23 13:48:36 +08:00
Wenkai Yin
9e12274309 Merge remote-tracking branch 'upstream/dev' into 170321_url
Conflicts:
	src/ui/router.go
2017-03-23 11:19:34 +08:00
Wenkai Yin
b461ba54a8 refactor api. 2017-03-22 14:30:49 +08:00
wy65701436
8268cf66bd update swagger 2017-03-21 18:56:42 -07:00
Daniel Jiang
eda9aa189e Merge pull request #1634 from reasonerjt/more-systeminfo
return ca root cert status in systeminfo
2017-03-20 10:41:24 +08:00
Yan
92d9f8516f Merge pull request #1626 from ywk253100/170315_registry_upgrade
Upgrade registry to 2.6.0
2017-03-17 18:25:22 +08:00
Tan Jiang
5e229f7d96 systeminfo returns flag for ca root 2017-03-17 14:06:33 +08:00
Wenkai Yin
9d8366d89e Merge remote-tracking branch 'upstream/dev' into 170315_ping_email
Conflicts:
	src/ui/api/harborapi_test.go
2017-03-16 15:54:15 +08:00
Wenkai Yin
c5917eddf3 modify swagger 2017-03-16 15:19:47 +08:00
Wenkai Yin
108aa21499 upgrade registry to 2.6.0 2017-03-16 13:44:16 +08:00
Wenkai Yin
b25f5f9692 ping email server API enhancement 2017-03-16 11:52:12 +08:00
Wenkai Yin
c3626edd42 reset config 2017-03-16 11:27:45 +08:00
Daniel Jiang
58a05c0aaf Merge pull request #1563 from ywk253100/170310_top_repo
Refactor getting top repo API to return more info
2017-03-13 10:45:36 +08:00
Tan Jiang
ef906c96d0 provide systeminfo API for UI 2017-03-10 18:53:11 +08:00
Wenkai Yin
62963eb3a8 update swagger 2017-03-10 15:31:05 +08:00
Wenkai Yin
3cb53011eb refactor get tags API to return more info 2017-03-09 17:30:00 +08:00
Tan Jiang
42bc430cfd update swagger, fix minor issues in test 2017-03-08 13:57:34 +08:00
Wenkai Yin
f7fe063436 fix conflict 2017-03-08 10:57:17 +08:00
Wenkai Yin
b4f8fdf563 fix bug in swagger 2017-03-07 20:34:43 +08:00
Daniel Jiang
c1d9d68232 Merge pull request #1518 from ywk253100/170306_search
Refactor search API to return more info
2017-03-07 13:12:53 +08:00
Wenkai Yin
dfae869dce add test cases 2017-03-06 18:03:31 +08:00
Wenkai Yin
d6a6f67596 refactor search API to return more info 2017-03-06 17:47:05 +08:00
yhua
c48d908515 add new ldap auth and import user feature 2017-02-27 15:13:49 +08:00
Wenkai Yin
414e8a8bcf Merge remote-tracking branch 'upstream/dev' into 170224_merge_config
Conflicts:
	make/docker-compose.tpl
	src/ui/service/token/authutils.go
2017-02-24 13:52:19 +08:00
kun wang
09833b2fc4 Merge pull request #1261 from guiguan/patch-1
LGTM
2017-02-15 12:08:14 +08:00
Wenkai Yin
6dc6b4fa79 update Makefile 2017-02-10 17:03:21 +08:00
Wenkai Yin
1fbb28ad8c update 2017-02-09 15:25:52 +08:00
Tan Jiang
27802f7620 Merge branch 'master' into dev 2017-01-24 12:16:53 +08:00
Henry Zhang
63d2aa9321 update document README 2017-01-23 22:08:41 +08:00
Henry Zhang
67cf2df307 update migration guide 2017-01-23 21:24:25 +08:00
Henry Zhang
d0648efbb9 update migration guide 2017-01-23 21:17:06 +08:00
Haining Henry Zhang
e05a125b64 Merge pull request #1287 from vmware/yhua123-patch-1
Update migration_guide.md
2017-01-23 21:03:48 +08:00
yhua
c7a05e0571 fix typo 2017-01-20 16:25:03 +08:00
yhua
e21787e68a update swagger.yaml 2017-01-20 16:15:56 +08:00
Wenkai Yin
deab033c8b update downloading images part of doc (#1311)
LGTM
2017-01-20 15:24:17 +08:00
Kira
00259567a8 update kubernetes deployment 2017-01-16 12:06:35 +08:00
yhua
7fbe811394 add ldap ping feature 2017-01-11 15:08:41 +08:00
yhua123
789797f400 Update migration_guide.md 2017-01-04 18:45:26 +08:00
yhua
4c213a8717 remove openldap lib from Dockerfile and support build with offcial golang image(1.7.3) 2017-01-04 17:48:20 +08:00
Guan Gui
9ca7d3014f Added escape for angle brackets in email_from
This solved the "[ERROR] [password.go:83]: Send email failed: 555 5.5.2 Syntax error. b192sm9510409pga.30 - gsmtp" error.
2016-12-21 16:31:52 +11:00