Commit Graph

2431 Commits

Author SHA1 Message Date
Tan Jiang
0f6cfa7623 Merge branch 'master' into dev 2016-07-29 18:06:18 +08:00
Daniel Jiang
aa03a8fd3f Merge pull request #592 from tobegit3hub/fix_print_statement_in_harbor_py
Replace simplejson with json and fix missed print statement
2016-07-29 02:09:45 +08:00
Daniel Jiang
faca5d1964 Merge pull request #606 from wemeya/author
modify docker-compose.sh
2016-07-28 19:59:24 +08:00
wemeya
6ca46b5b14 modify docker-compose.sh 2016-07-28 19:19:56 +08:00
Daniel Jiang
f7502faf09 Merge pull request #602 from wemeya/author
add script to auto configure platform to pull images from
2016-07-28 18:43:33 +08:00
wemeya
09fc1f3ee0 add script to auto configure platform to pull images from 2016-07-28 16:18:24 +08:00
kun wang
5e38e84c89 Merge pull request #599 from wknet123/master
Update for toggling admin options check.
2016-07-28 12:13:20 +08:00
kunw
9b106d223d update for toggling admin options check. 2016-07-28 11:54:12 +08:00
Daniel Jiang
e7ca62f15f Merge pull request #595 from reasonerjt/dev
support redis for session
2016-07-28 11:30:34 +08:00
kunw
b0c957aefc update for toggling admin option check. 2016-07-28 11:22:16 +08:00
kun wang
5ac7f9442a Fixed toggling admin user option. (#597)
* fixed toggling admin user option.

* refine comparsion expression
2016-07-28 00:15:22 +08:00
kunw
c4d742a874 refine comparsion expression 2016-07-27 23:52:19 +08:00
kunw
b68e12b52a fixed toggling admin user option. 2016-07-27 23:18:24 +08:00
Tan Jiang
fea4419a1e support redis for session 2016-07-27 20:59:14 +08:00
Tan Jiang
41637ea559 Merge branch 'master' into dev 2016-07-27 20:08:08 +08:00
tobe
9b687f2ed6 Replace simplejson with json and fix missed print statement 2016-07-27 09:13:25 +08:00
Tan Jiang
405f013e7a remove license 2016-07-26 18:30:13 +08:00
Bobby (Jun) Zhang
707401e379 README update (#590)
README update to highlight the benefits of Harbor
2016-07-26 18:19:53 +08:00
Daniel Jiang
1c9dd6cc75 Merge pull request #586 from tobegit3hub/add_harbor_py
Add harbor-py project
2016-07-26 18:12:19 +08:00
tobe
ebb8fd6b9f Move harbor-py to contrib/sdk/ 2016-07-26 00:19:30 +08:00
tobe
1576e4caf1 Add harbor-py project 2016-07-25 23:15:36 +08:00
Tan Jiang
8eff0528db Merge branch 'master' into dev 2016-07-22 16:19:52 +08:00
Daniel Jiang
ad8496e02d Merge pull request #582 from reasonerjt/dev
Enable redis for UI session
2016-07-22 16:18:29 +08:00
Wenkai Yin
41b155dd12 add debug log for notificaions 2016-07-22 16:03:09 +08:00
Tan Jiang
a3b4b1b525 enable redis for ui session 2016-07-22 16:03:09 +08:00
Daniel Jiang
49e7012aa3 Merge pull request #578 from yhua123/patch-1
Update router.go
2016-07-21 20:38:33 +08:00
yhua123
ce4fe63a1c Update router.go
clarify project get method and project/{id} get method
2016-07-21 14:04:43 +08:00
Daniel Jiang
ebeee0d7b5 Merge pull request #572 from ywk253100/notification
add debug log for notificaions
2016-07-21 12:03:41 +08:00
Wenkai Yin
aba7b6c48d add debug log for notificaions 2016-07-20 15:49:45 +08:00
kun wang
4a5b9bac39 Merge pull request #569 from fsword/patch-1
Thanks. LGTM
2016-07-20 11:28:37 +08:00
Haining Henry Zhang
d73d85162b Merge pull request #571 from hainingzhang/master
update installation guide
2016-07-20 11:15:09 +08:00
Henry Zhang
fcfbf0fe89 update installation guide 2016-07-20 10:34:15 +08:00
fsword
e3913128cf link checkbox and its label
use standard html tag
2016-07-19 23:52:50 +08:00
Haining Henry Zhang
25bddd2922 Merge pull request #568 from hainingzhang/master
update readme
2016-07-19 21:51:57 +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
Daniel Jiang
3871a01a96 Merge pull request #567 from harryge00/fix-typo
fix typo in ldap.go
2016-07-19 17:39:15 +08:00
Daniel Jiang
cadfea643a Merge pull request #566 from yhua123/master
fix swagger.yml online check issue
2016-07-19 17:37:14 +08:00
haoyuan
57aa9685bf fix typo in ldap.go 2016-07-19 16:46:21 +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
Daniel Jiang
cf23b067a6 Merge pull request #565 from reasonerjt/master
handle DB error to return 409 when creating project
2016-07-19 15:14:08 +08:00
Daniel Jiang
23b1d55932 Merge pull request #564 from ywk253100/workaround_for_issue_561
fix #561
2016-07-19 13:42:51 +08:00
Tan Jiang
236a54f9bd handle DB error to return 409 when creating project 2016-07-19 13:35:39 +08:00
Daniel Jiang
cc41aa76e0 Merge pull request #563 from yhua123/master
update prepare-swagger.sh for remove swagger.ymal show error
2016-07-19 11:27:38 +08:00
Wenkai Yin
befc22f3f7 fix #561 2016-07-18 20:37:52 +08:00
yhua
bf28653c0d Merge remote-tracking branch 'upstream/master' 2016-07-18 19:01:40 +08:00
yhua
226b988a5b update prepare-swagger.sh for remove swagger.ymal show error 2016-07-18 18:58:20 +08:00
Daniel Jiang
4b5098aeba Merge pull request #558 from maxwell92/patch-1
Update kubernetes_deployment.md fixing text error
2016-07-18 11:38:38 +08:00
maxwell
2cdde8b586 Update kubernetes_deployment.md
fix text error
2016-07-16 19:18:56 +08:00