Commit Graph

2694 Commits

Author SHA1 Message Date
Tan Jiang
965c7a5e70 reference the patched nginx image 2017-04-07 15:07:46 +08:00
Daniel Jiang
93f5c78b4b Merge pull request #1948 from ywk253100/170406_secretkey
Mount config to another dir, fix #1939
2017-04-07 11:35:58 +08:00
Daniel Jiang
4dddd5e9b4 Merge pull request #1944 from ywk253100/170406_ping_target
Do not return password of target
2017-04-07 11:35:07 +08:00
Daniel Jiang
1b2ad034a4 Merge pull request #1943 from ywk253100/170405_member_api
Return createtime and updatetime in GET members API
2017-04-07 11:34:44 +08:00
Daniel Jiang
dcda6fe72c Merge pull request #1942 from steven-zou/master
adjust the size of inputbox in related forms
2017-04-07 11:34:06 +08:00
Daniel Jiang
fa17103b48 Merge pull request #1941 from reasonerjt/enable-gzip
enable gzip by default
2017-04-07 11:33:51 +08:00
Daniel Jiang
7bf124735a Merge pull request #1929 from ywk253100/170405_subject
Modify the subject of resetting password email
2017-04-07 11:33:29 +08:00
Steven Zou
f7f6640a5f Merge pull request #1945 from wknet123/master-new
Update for hiding password in target.
2017-04-07 11:28:34 +08:00
Wenkai Yin
e60fd0530f mount config to another dir, fix #1939 2017-04-07 09:14:41 +08:00
Steven Zou
0c9e6755db adjust gauge css style 2017-04-06 19:12:29 +08:00
Steven Zou
74a4de6868 Merge remote-tracking branch 'upstream/master' 2017-04-06 19:08:48 +08:00
kunw
559011ce93 Update for hidding password in target. 2017-04-06 19:05:44 +08:00
Wenkai Yin
488e19f514 donot return password of target 2017-04-06 18:48:43 +08:00
ywk253100
7c64709402 modify the subject of resetting password email, fix #1919 2017-04-06 18:40:50 +08:00
Steven Zou
b640a22a66 adjust the size of inputbox in related forms 2017-04-06 18:33:00 +08:00
Wenkai Yin
3b56893f3c return createtime and updatetime, fix #1924 2017-04-06 18:18:15 +08:00
Daniel Jiang
d8a0e01214 Merge pull request #1926 from wknet123/master-new
Fix UX issues.
2017-04-06 17:59:17 +08:00
Daniel Jiang
78ce1a4ba4 Merge pull request #1940 from steven-zou/master
Fix UI/UX issues
2017-04-06 17:58:26 +08:00
Steven Zou
2bd7f10616 Merge branch 'master' of github.com:steven-zou/harbor 2017-04-06 17:26:17 +08:00
Steven Zou
4d3b0b99ef Shrink gauge size 2017-04-06 17:25:50 +08:00
kun wang
6da1268cb0 Merge branch 'master' into master 2017-04-06 03:25:32 -05:00
Steven Zou
0d9934aa40 uncomment alert close timer 2017-04-06 16:21:57 +08:00
Steven Zou
8f0285b4cb Fix UI/UX issues:
Use blur event to instead focusout
Fix mail/ldap server testing spinner and button disabling issues
Fix content area/more info margins and make alert as overlay
fix reset password form issues
fix reset password style issue
fix tootip display inssue on reset form
commit index.html change
2017-04-06 16:12:22 +08:00
Tan Jiang
a2726b55a8 Merge remote-tracking branch 'upstream/master' into enable-gzip 2017-04-06 15:28:41 +08:00
kunw
782caa69bb Merge remote-tracking branch 'origin/master-new' into master-new 2017-04-06 15:07:24 +08:00
kunw
86097a07cb Merge branch 'master' of https://github.com/vmware/harbor into master-new 2017-04-06 15:06:34 +08:00
kunw
26a2582553 Refine expression. 2017-04-06 15:06:05 +08:00
wy65701436
a6f88aaac8 fix issue 1916 2017-04-06 15:06:05 +08:00
Steven Zou
d7f8317382 change free to used 2017-04-06 15:06:05 +08:00
Steven Zou
a1769ac6dc fix free storage info bug 2017-04-06 15:06:05 +08:00
Steven Zou
dfda6b4772 fix gauge bug 2017-04-06 15:06:04 +08:00
kunw
7510a136da Merge remote-tracking branch 'upstream/master' into master-new 2017-04-06 14:51:27 +08:00
Tan Jiang
d527a543bd enable gzip by default 2017-04-06 14:47:41 +08:00
Daniel Jiang
85b8b496be Merge pull request #1938 from wy65701436/master
fix issue 1916
2017-04-06 14:15:37 +08:00
wy65701436
f6c4137af1 fix issue 1916 2017-04-05 22:53:09 -07:00
Daniel Jiang
69ebc92f87 Merge pull request #1927 from steven-zou/master
Fix issue 1915
2017-04-05 19:26:26 +08:00
Steven Zou
b361e6332d change free to used 2017-04-05 19:11:16 +08:00
Steven Zou
39cfaf4be3 fix free storage info bug 2017-04-05 19:00:02 +08:00
kunw
503a332937 Fix UX issues. 2017-04-05 18:51:37 +08:00
Steven Zou
9afd0c9c3c fix gauge bug 2017-04-05 18:37:27 +08:00
Daniel Jiang
b7a196f7aa Merge pull request #1916 from vmware/dev
merge dev branch to master.
2017-04-05 17:18:54 +08:00
Daniel Jiang
7d6d641827 Merge branch 'master' into dev 2017-04-05 17:01:27 +08:00
Daniel Jiang
f703315226 Merge pull request #1914 from wy65701436/dev
update make file
2017-04-05 16:32:02 +08:00
wy65701436
40ae3694f6 update make file 2017-04-05 01:00:39 -07:00
Steven Zou
7137e0c26c Merge pull request #1913 from wknet123/dev-sync
Fix some UX issues.
2017-04-05 15:32:56 +08:00
kunw
6b322a6e00 Fix some UX issues. 2017-04-05 15:20:21 +08:00
Daniel Jiang
85233a9b16 Merge pull request #1910 from wy65701436/dev
use gzip to save docker images.
2017-04-05 15:15:16 +08:00
wy65701436
b827fdd5a5 use gzip to save docker images. 2017-04-04 23:48:29 -07:00
kun wang
3028fe5a71 Merge pull request #1907 from steven-zou/dev
Fix minor style issues
2017-04-05 01:06:24 -05:00
Yan
2ec55e493c Merge pull request #1906 from wknet123/dev-sync
Remove unused images
2017-04-04 22:33:36 -07:00