Commit Graph

446 Commits

Author SHA1 Message Date
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
Wenkai Yin
111638ae8e Merge pull request #1249 from yhua123/dev-update-registry
update registry from 2.5.0 to 2.5.1
2016-12-16 18:03:53 +08:00
Wenkai Yin
3717b37dca Merge pull request #1251 from yhua123/dev-update-golang
upgrade golang baseimage from 1.6.2 to 1.7.3
2016-12-16 17:27:24 +08:00
yhua
0249f2181a update registry from 2.5.0 to 2.5.1 2016-12-15 16:50:50 +08:00
yhua
10306e784b upgrade golang baseimage from 1.6.2 to 1.7.3 2016-12-15 13:16:14 +08:00
yhua123
0d09379fb7 Merge branch 'dev' into dev 2016-12-12 15:11:00 +08:00
Tan Jiang
ee4cfa68d8 Merge branch 'master' into dev 2016-12-12 14:39:45 +08:00
yhua
90be98bc5d add 'data_volume' in harbor.cfg 2016-12-12 14:35:28 +08:00
Wenkai Yin
62c1c2d50b update docs 2016-12-08 21:37:09 +08:00
yhua123
ead0985d20 Merge pull request #1146 from wknet123/dev-update-swagger
Updates Swagger YAML for new added API.
NMT
2016-12-08 15:44:39 +08:00
Henry Zhang
588cc375a5 update docs 2016-12-06 01:01:03 +08:00
Henry Zhang
8359c91e66 update docs 2016-12-06 00:41:05 +08:00
Daniel Jiang
8333e54d75 Merge pull request #1210 from ywk253100/161204_ova_install_guide
Move self-registrition option to authentication group in installation guide
2016-12-05 17:14:53 +08:00
Wenkai Yin
d808c402d2 move self-registrition option to authentication group in installation guide 2016-12-04 21:54:33 +08:00
Wenkai Yin
ad4560b50f user guide for ova 2016-12-02 17:47:41 +08:00
Wenkai Yin
871c18df46 Merge pull request #1177 from ywk253100/161118_lvm
lvm guide
2016-11-28 14:54:04 +08:00
Wenkai Yin
988ad4608b lvm guide 2016-11-28 14:36:03 +08:00
Wenkai Yin
e5b2995b1e log collection doc 2016-11-28 14:06:14 +08:00
Henry Zhang
f4017bdd5a update ova installation guide 2016-11-24 22:47:33 +08:00
Henry Zhang
814e89cadb update ova installation guide 2016-11-24 22:39:01 +08:00
Henry Zhang
0c62b50606 update installation guide 2016-11-23 23:35:57 +08:00
Henry Zhang
ee7ad59143 update installation guide 2016-11-23 23:33:33 +08:00
Henry Zhang
810db2415f update ova installation guide 2016-11-23 23:26:57 +08:00
Henry Zhang
d435a41006 install guide ova 2016-11-22 21:59:46 +08:00
Henry Zhang
01004a8427 update install guide ova 2016-11-22 21:48:16 +08:00
Henry Zhang
9fa6842f83 install guide ova 2016-11-22 21:15:06 +08:00
kunw
e3f5e9e501 Updates Swagger YAML for new added API. 2016-11-22 19:19:17 +08:00
Henry Zhang
093747cd2c udpate installation guide OVA 2016-11-22 18:12:11 +08:00
Daniel Jiang
2119034c5c Merge pull request #1123 from ywk253100/161118_ova_guide
Update ova guide
2016-11-21 16:44:30 +08:00
kun wang
4671f4a02f Merge pull request #1124 from yhua123/dev
LGTM
2016-11-21 15:18:11 +08:00
yhua
a0fc5a132e add api/users/current to swagger.yaml 2016-11-18 17:10:53 +08:00
Wenkai Yin
3c99b366b5 update ova guide 2016-11-18 17:07:23 +08:00
Tan Jiang
00c41c5860 Merge branch 'master' into dev 2016-11-16 22:01:59 +08:00
yhua123
48ef9bed30 Update configure_https.md
remove update openssl.cnf part
2016-11-15 15:11:07 +08:00
yhua123
34d5884647 Update configure_https.md
remove serial part in demoCA directory(1)
2016-11-15 14:08:08 +08:00
yhua123
374f817924 Update configure_https.md
remove serial part in demoCA directory
2016-11-15 14:05:42 +08:00
yhua123
284219efc0 Merge pull request #1029 from xuxinkun/master
fix responses for /repositories/tags.
LGTM
2016-11-14 11:38:25 +08:00
Daniel Jiang
3008dc0749 Merge pull request #1057 from hainingzhang/master
update install and user guide
2016-11-14 11:34:57 +08:00
yhua
e55aa47641 modify openssl ca to openssl x509 for certificate format 2016-11-11 18:43:47 +08:00
Tan Jiang
977c5a80a0 Merge branch 'master' into dev 2016-11-11 15:21:02 +08:00
Henry Zhang
2b0cf6a5e0 update install and user guide 2016-11-10 17:19:35 +08:00
Henry Zhang
b9b4274e9e build guide 2016-11-10 16:22:08 +08:00
Henry Zhang
321c850d48 build guide 2016-11-10 16:16:36 +08:00
Henry Zhang
c22e78c54f build guide 2016-11-10 16:10:39 +08:00
Daniel Jiang
2d348cca6a Merge pull request #1050 from senk/fix-docs
Fix filepath to app.conf
2016-11-10 16:07:12 +08:00
Daniel Jiang
812f5f8cf0 Merge pull request #1032 from reasonerjt/update-https-doc
update configure https guide
2016-11-10 15:16:33 +08:00
Tan Jiang
fcf292d948 update the doc 2016-11-10 14:49:08 +08:00
Robin Naundorf
c9601ef169
Fix filepath to app.conf 2016-11-09 13:34:01 +01:00
Henry Zhang
acd48d7211 update typos 2016-11-09 17:24:54 +08:00
Haining Henry Zhang
e37389a75a Merge pull request #1035 from hainingzhang/master
update docs and test cases
2016-11-07 22:34:11 +08:00
Henry Zhang
876712a5ca user guide 2016-11-07 21:58:17 +08:00
Henry Zhang
6d237bf69d user guide 2016-11-07 21:53:46 +08:00
Brian Christner
bb12288776
fixed some spelling/grammer in the README and install guide 2016-11-07 14:10:49 +01:00
Tan Jiang
da3862aa1f update db migration guide to use image on docker hub 2016-11-07 20:13:20 +08:00
Tan Jiang
bb7ed3db7c update configure https guide 2016-11-07 18:38:19 +08:00
xuxinkun
758d063514 fix responses for /repositories/tags.
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2016-11-07 17:29:01 +08:00
Daniel Jiang
eb44e889c3 Merge pull request #1008 from yhua123/dev
Dev
2016-11-07 11:33:21 +08:00
yhua
158550a02a change some describe in docs/compile_guide.md and fix one makefile issue 2016-11-04 15:25:06 +08:00
yhua
102bb888be update docs/compile_guide.md 2016-11-03 17:50:40 +08:00
Henry Zhang
a011c84e19 install ova 2016-11-03 17:44:14 +08:00
yhua
07b9e5e326 modify the directory of dev docker-compose.yml 2016-11-03 15:21:58 +08:00
Henry Zhang
c18b276d07 installation guide for ova 2016-11-02 21:18:29 +08:00
Henry Zhang
a811a53d3a installation guide 2016-11-02 20:58:48 +08:00
yhua
88b122a777 add document for make process and build local golang image into Makefile 2016-11-02 17:29:12 +08:00
Daniel Jiang
bc63c46b2d Merge pull request #996 from ywk253100/161102_nginx_upgrade
Upgrade nginx to 1.11.5
2016-11-02 17:14:22 +08:00
Wenkai Yin
4fcfffeb47 upgrade nginx to 1.11.5 2016-11-02 15:49:28 +08:00
Henry Zhang
1cb7b1a54b update docs 2016-11-01 23:50:59 +08:00
Henry Zhang
e366c31d83 update docs 2016-11-01 23:45:47 +08:00
Henry Zhang
3ed8225935 update docs 2016-11-01 23:09:25 +08:00
Henry Zhang
67f27fae00 update docs 2016-11-01 23:03:39 +08:00
Henry Zhang
136e0bbda3 update docs 2016-11-01 22:52:34 +08:00
Wenkai Yin
52edcd8f23 1.add self_registration attr 2.update docs 2016-10-31 13:46:00 +08:00
Haining Henry Zhang
7a66c2cf6e Merge pull request #917 from ywk253100/161021_ova_md
OVA installation guide
2016-10-31 00:17:26 +08:00
Daniel Jiang
ee9f09bd17 Merge pull request #957 from ywk253100/161027_fix_826
Fix #826
2016-10-28 12:44:48 +08:00
Daniel Jiang
45b32934fc Merge pull request #967 from ywk253100/161028_fix_964
Fix #964
2016-10-28 12:44:34 +08:00
Wenkai Yin
f87e609aeb fix #964 2016-10-28 12:22:27 +08:00
Wenkai Yin
231690281b fix #826 2016-10-27 15:04:03 +08:00
Daniel Jiang
2ee780a0e9 Merge pull request #951 from yhua123/dev
Update migration_guide.md
2016-10-27 14:52:29 +08:00
yhua123
d3d0d14d6e Update migration_guide.md
update for new code structure
2016-10-26 18:18:43 +08:00
supereagle
714543238d remove useless doc 2016-10-26 14:34:38 +08:00
Wenkai Yin
dd70dc89d3 ova installation guide 2016-10-24 11:29:39 +08:00
yhua
311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00
Daniel Jiang
5dafb3d684 Merge pull request #760 from wy65701436/dev
update API doc for sync registry.
2016-10-17 15:47:31 +08:00
André Cruz
bf3f408b4a Fix typos. 2016-09-30 10:24:24 +01:00
Henry Zhang
72f5f09df2 update installation guide 2016-09-22 23:57:14 +08:00
Henry Zhang
dbadce575e update installation guide 2016-09-22 23:54:12 +08:00
Henry Zhang
2136f1ad5a Merge remote-tracking branch 'hupstream/dev' into dev 2016-09-22 23:31:49 +08:00
Henry Zhang
d52cbc6cb6 update installation guide 2016-09-22 23:30:51 +08:00
yhua123
444c650606 Merge pull request #829 from wemeya/patch-1
Update swagger.yml
2016-09-22 16:38:48 +08:00
Tan Jiang
696f8994b4 use relative path 2016-09-22 15:13:57 +08:00
wemeya
a75165adc5 Update swagger.yml 2016-09-22 13:20:10 +08:00
zgdxiaoxiao
bfb5db7c97 swagger bugfix 2016-09-21 10:43:04 +08:00
Daniel Jiang
42d0f968d3 Merge pull request #819 from ywk253100/fix_for_#761
Fix #761
2016-09-20 12:46:17 +08:00
Wenkai Yin
2a2a9feee2 fix #761 2016-09-19 17:58:29 +08:00
Tan Jiang
cd3c3ede3b sync master to dev, and remove version info from environ vars 2016-09-19 16:18:50 +08:00
Henry Zhang
44aaba64ce update docs 2016-09-16 22:04:36 +08:00
Henry Zhang
2fc07a04c6 README 2016-09-13 18:21:21 +08:00
vmware
ad78449266 update ldap configuration 2016-09-09 17:28:18 +08:00
yhua123
0fc7363a4c update images in docs (#772) 2016-09-07 14:09:45 +08:00
wy65701436
052d44a218 update API doc for sync registry. 2016-09-04 22:13:54 -07:00
zgdxiaoxiao
198149599d update api test and swagger.yaml(updated) 2016-09-02 16:05:55 +08:00
Wenkai Yin
531f36810c add pagination and repository details 2016-08-26 14:32:20 +08:00
Henry Zhang
85c63eb626 update README 2016-08-20 22:58:00 +08:00
Henry Zhang
14d2d7eb42 update README 2016-08-20 22:50:21 +08:00
yhua123
fbd0c03b93 Update swagger.yaml
update repo_id
2016-08-12 15:12:35 +08:00
yhua123
b8eafdc74c Update swagger.yaml
add 0.3.0 new features' API
2016-08-11 17:39:36 +08:00
Haining Henry Zhang
a3fc9de391 Merge pull request #628 from ywk253100/docs
Add guide about configuring Harbor to listen on a customized port
2016-08-08 21:23:15 +08:00
Wenkai Yin
24471c9bbb add guide about customizing port 2016-08-08 11:29:59 +08:00
Daniel Jiang
77448551ee Merge pull request #644 from wemeya/new-ui-with-sync-image
Update configure_https.md
2016-08-05 14:00:50 +08:00
wemeya
2fe1fc44bb Update configure_https.md 2016-08-04 21:13:04 +08:00
jinpengcheng
3d324a0e3b Fixed Project describe "name" field error in swagger.yaml
The "name" field of Project's properties in swagger.yaml,
but "POST" Project API use parameter "project_name".
2016-08-03 20:14:00 -07:00
Henry Zhang
fcfbf0fe89 update installation guide 2016-07-20 10:34:15 +08:00
Henry Zhang
c4cb17e379 update README 2016-07-19 19:44:52 +08:00
Henry Zhang
2ed1883972 update README 2016-07-19 19:41:13 +08:00
Henry Zhang
19c60ebadc update readme 2016-07-19 17:56:55 +08:00
yhua
b2beef9454 fix swagger.yml online check issue: op_time definition & no use definitions 'repository' 2016-07-19 15:40:35 +08:00
yhua
226b988a5b update prepare-swagger.sh for remove swagger.ymal show error 2016-07-18 18:58:20 +08:00
Daniel Jiang
cdef6cd4bb Merge pull request #545 from yhua123/patch-1
Update installation_guide.md
2016-07-15 15:00:35 +08:00
yhua123
ec27a0f820 Update installation_guide.md 2016-07-15 14:46:26 +08:00
Henry Zhang
03b1705593 update installation guide and harbor.cfg 2016-07-14 18:44:39 +08:00
yhua123
042fc87470 Update installation_guide.md
update offline package echo and add jobservice status in the document.
2016-07-14 17:16:48 +08:00
Henry Zhang
c0ab2dbdfc update readme, migration guide 2016-07-13 15:42:47 +08:00
Henry Zhang
ef77192080 update i18n guide 2016-07-12 16:31:58 +08:00
Henry Zhang
6dad7166c2 update i18n guide 2016-07-12 16:29:40 +08:00
Henry Zhang
ac99a4c28d add i18n guide 2016-07-12 16:21:22 +08:00
Henry Zhang
09e92e6533 add i18n guide 2016-07-12 16:19:17 +08:00
Haining Henry Zhang
8c02e9b744 Merge pull request #514 from wknet123/master
Add developer i18n guide.md file.
2016-07-12 15:38:30 +08:00
kunw
917b99b224 add developer i18n guide.md file. 2016-07-11 18:24:37 +08:00
Tan Jiang
cf0674eae7 update installation guide to add infor for more attributes 2016-07-11 04:03:23 +08:00
Wenkai Yin
817c26ccea update 2016-06-30 17:27:37 +08:00
Wenkai Yin
766c9a58e1 update 2016-06-30 17:23:54 +08:00
Wenkai Yin
9f7de77bae update 2016-06-29 17:56:15 +08:00
Wenkai Yin
30b423a049 update 2016-06-29 17:41:26 +08:00
Wenkai Yin
92f28babf7 update 2016-06-29 13:30:18 +08:00
Wenkai Yin
bad78b09df update 2016-06-29 12:28:24 +08:00
Wenkai Yin
76e43e430d update 2016-06-29 12:26:36 +08:00
Wenkai Yin
9862f0e303 update 2016-06-29 12:21:42 +08:00
Wenkai Yin
232c699fda update 2016-06-29 11:23:58 +08:00
Wenkai Yin
9bca4b4397 update user guide 2016-06-28 13:47:31 +08:00
Wenkai Yin
d77a78e4d1 Merge pull request #342 from wemeya/develop
change swagger.yml
2016-06-15 11:53:38 +08:00
wemeya
a2c073e8f9 change url error 2016-06-14 18:03:20 +08:00
wemeya
5205bd2367 change url for toggle project 2016-06-13 18:51:14 +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
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
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
Henry Zhang
d2773958ac update readme 2016-06-06 12:07:30 +08:00
Tan Jiang
2a79a577e9 update swagger 2016-06-03 18:50:42 +08:00
wemeya
97b5d16e26 change dao_test file 2016-05-30 17:22:38 +08:00
wemeya
b29a41034c modify code according to review 2016-05-27 17:54:25 +08:00
wemeya
4314c244e5 add instructions for new added api 2016-05-26 16:48:49 +08:00
Henry Zhang
9f1977204b update docs 2016-05-17 22:42:22 +08:00
Henry Zhang
7a150c57c6 Merge remote-tracking branch 'hupstream/master' 2016-05-17 22:33:41 +08:00
Henry Zhang
e371b729a6 update docs 2016-05-17 22:04:16 +08:00
Henry Zhang
6b489bb689 update README and installation guide 2016-05-17 17:32:10 +08:00
kun wang
dc36ac8139 Merge pull request #241 from xiaods/master
Fix: sed compatible with mac os env
2016-05-17 16:17:36 +08:00
Deshi Xiao
6c6a694668 Fix: sed compatible with mac os env
sed -i need explicit extention on mac, but linux is optinoal.
so for developer need a compatible request on macos
2016-05-17 14:21:23 +08:00
int32bit
bbb400ed50 Resolve the merge conflict 2016-05-17 12:01:47 +08:00
Daniel Jiang
e79c1ac804 Merge pull request #213 from dieswaytoofast/master
Cleanup some of the documentation
2016-05-17 11:19:22 +08:00