Wenkai Yin
2b5fd6ffe8
Merge remote-tracking branch 'upstream/master' into 170408_target
2017-04-10 17:27:10 +08:00
Wenkai Yin
228ecf9b78
bug fix
2017-04-10 17:25:10 +08:00
Wenkai Yin
ad02cab82a
Merge pull request #1975 from ywk253100/170408_target
...
Modify ping targat and put target api
2017-04-10 14:45:57 +08:00
Daniel Jiang
870cf29b68
Merge branch 'master' into 170408_target
2017-04-10 14:24:08 +08:00
Wenkai Yin
ac77ee3bc4
modify ping targat and put target api
2017-04-10 13:45:24 +08:00
Daniel Jiang
dec26eed91
Merge pull request #1977 from wy65701436/master
...
fix issue 1932
2017-04-10 11:27:26 +08:00
wy65701436
6b2b9cdc83
fix issue 1932
2017-04-09 05:16:52 -07:00
Daniel Jiang
3543a4742f
Merge pull request #1967 from ywk253100/170407_role
...
Fixes out of range bug when listing projects
2017-04-07 20:09:30 +08:00
Wenkai Yin
5c2bd7eecc
fix bug
2017-04-07 19:47:08 +08:00
Daniel Jiang
8fee726fc4
Merge pull request #1963 from ywk253100/170407_harborcfg
...
Fix word mistake in harbor.cfg
2017-04-07 19:19:29 +08:00
Daniel Jiang
49377c5bc8
Merge pull request #1962 from ywk253100/170407_adminserver_log_leak
...
Fix logs leak
2017-04-07 19:19:17 +08:00
Daniel Jiang
642dbe329e
Merge pull request #1961 from wknet123/master-new
...
Make role name consistent.
2017-04-07 19:18:58 +08:00
Daniel Jiang
9327fd2c66
Merge pull request #1960 from ywk253100/170407_role
...
Donot add projectadmin role to sysadmin when return roles, fix #1957
2017-04-07 19:16:33 +08:00
Daniel Jiang
554c57fc19
Merge pull request #1958 from steven-zou/master
...
update message files
2017-04-07 19:15:46 +08:00
Wenkai Yin
746667bb38
donot add projectadmin role to sysadmin when return roles, fix #1957
2017-04-07 19:09:59 +08:00
Steven Zou
c5f88d6085
Fix UI related issue and update message files:
...
- update message files
- fix minor UI/UX issues
- revoke inline alert fix css
- fix css style
2017-04-07 18:30:58 +08:00
kunw
3c95bbd53a
Make role name consistent.
2017-04-07 18:28:37 +08:00
Wenkai Yin
2cdd2bb659
fix word mistake
2017-04-07 18:24:08 +08:00
Wenkai Yin
cd86c50e29
donot dump response to log, fix #1950
2017-04-07 18:14:22 +08:00
Wenkai Yin
ff9a64c631
donot log sensitive message to logs, fix #1949
2017-04-07 17:58:57 +08:00
Daniel Jiang
6b8287e026
Merge pull request #1959 from reasonerjt/nginx-upgrade-openssl
...
update makefile
2017-04-07 17:48:29 +08:00
Tan Jiang
24f2f5d860
update makefile
2017-04-07 17:27:24 +08:00
Daniel Jiang
afdbcc2b62
Merge pull request #1952 from maplain/fix_typo
...
add a missing format string argument
2017-04-07 16:12:21 +08:00
Daniel Jiang
afeb6515bf
Merge pull request #1951 from reasonerjt/nginx-upgrade-openssl
...
reference the patched nginx image
2017-04-07 16:11:44 +08:00
Fangyuan Li
bc30341a76
Merge branch 'master' into fix_typo
2017-04-07 00:22:53 -07:00
maplain
be96a3b17c
add a missing format string argument
2017-04-07 00:21:08 -07:00
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
