Commit Graph

1802 Commits

Author SHA1 Message Date
kunw
2fcd649e01 Merge remote-tracking branch 'upstream/dev' into dev-originary-user-show 2016-10-26 10:57:10 +08:00
Wenkai Yin
fa703e58b5 Merge pull request #891 from wemeya/role
add project role for non-sysadmin user
2016-10-25 18:52:17 +08:00
wemeya
2924799f78 add project role for non-sysadmin user 2016-10-25 18:25:39 +08:00
kunw
bb0246910e Updates for hiding buttons against to user role. 2016-10-25 18:22:29 +08:00
yhua123
77ea3199a3 Merge pull request #939 from yhua123/dev
fix nginx:1.9.0 remove 0
2016-10-25 16:16:40 +08:00
yhua
f01c0fd870 fix nginx:1.9.0 remove 0 2016-10-25 16:10:56 +08:00
yhua123
4dd2036bdb Merge pull request #938 from yhua123/dev
improve make clean user interactions and fix one dir issue for golang…
2016-10-25 15:50:59 +08:00
yhua
2548bb06a0 improve make clean user interactions and fix one dir issue for golang image build 2016-10-25 15:45:55 +08:00
kun wang
ce7b556e84 Merge pull request #930 from wknet123/dev-admin-options
Fixed toggling admin options.
2016-10-25 13:46:43 +08:00
kun wang
b39f3ec2fe Merge pull request #932 from wknet123/dev-user-redirection
Fixed redirection when deleted user.
2016-10-25 13:41:54 +08:00
kunw
070cc30c83 Updates for changing admin options. 2016-10-25 13:39:22 +08:00
kunw
5ba1cc1f44 Updates error log. 2016-10-25 13:31:10 +08:00
Daniel Jiang
7930ca8285 Merge pull request #929 from wknet123/dev-origin
Updates for email validations.
2016-10-25 13:26:58 +08:00
yhua123
94f7e81143 Merge pull request #933 from yhua123/dev
fix golang image compile issue(1)
2016-10-25 12:09:27 +08:00
yhua
2cd11fb6b9 fix golang image compile issue(1) 2016-10-25 12:05:16 +08:00
kunw
debf482765 Fixed redirection when deleted user. 2016-10-25 11:55:27 +08:00
yhua123
4cb8e2626a Merge pull request #931 from yhua123/dev
fix golang image compile issue
2016-10-25 11:52:46 +08:00
yhua
0bd8627855 fix golang image compile issue 2016-10-25 11:48:10 +08:00
kunw
8f758120d9 Fixed toggling admin options. 2016-10-25 11:39:04 +08:00
kunw
dbe830395d Fixed log output. 2016-10-25 11:12:23 +08:00
kunw
0ba342ca96 updates for email validations. 2016-10-24 18:37:54 +08:00
Daniel Jiang
b9546e0cb0 Merge pull request #927 from reasonerjt/update-salt
update salt when updating password
2016-10-24 17:34:05 +08:00
Tan Jiang
64562b8f83 add test case to cover new password and old password are the same 2016-10-24 17:16:18 +08:00
Daniel Jiang
f31e4f3608 Merge pull request #916 from reasonerjt/dev
API should not return the salt of a user
2016-10-24 17:03:36 +08:00
kun wang
60ae6fba1b Merge pull request #926 from yhua123/dev
LGTM
2016-10-24 17:00:08 +08:00
yhua
271787dd94 update for fix #925 2016-10-24 16:51:42 +08:00
yhua
ebc852b7cc fix #924 #925 2016-10-24 16:48:48 +08:00
yhua123
3085d24bab Merge pull request #922 from yhua123/dev
rm binary
2016-10-24 14:23:15 +08:00
yhua
1043ec063d rm binary 2016-10-24 14:18:56 +08:00
yhua123
9a6f072bf9 Merge pull request #921 from yhua123/dev
fix pushimage, update .gitignore, add DEVFLAG
2016-10-24 14:14:42 +08:00
yhua
69797c30f2 fix pushimage, update .gitignore, add DEVFLAG 2016-10-24 14:06:23 +08:00
Tan Jiang
b876ea360d update salt when updating password 2016-10-24 13:40:19 +08:00
Tan Jiang
e3e0074a7f API should not return the salt of a user 2016-10-24 10:46:12 +08:00
Wenkai Yin
470649c283 Merge pull request #912 from yhua123/dev
change code 20161021
2016-10-21 19:03:29 +08:00
yhua
311cf8da07 change code 20161019 2016-10-21 18:39:10 +08:00
Daniel Jiang
579358bfed Merge pull request #899 from reasonerjt/dev
store secretkey in data volume and remove it from harbor.cfg
2016-10-19 13:29:10 +08:00
Tan Jiang
9889bdd525 store secretkey in data volume and remove it from harbor.cfg 2016-10-19 13:03:34 +08:00
yhua123
ac496e0991 Merge pull request #889 from wemeya/dev
modify log_test.go
2016-10-19 11:58:02 +08:00
Wenkai Yin
6b8d400c12 Merge pull request #896 from reasonerjt/dev
Lock user from frequent logging in
2016-10-18 17:37:44 +08:00
Tan Jiang
3cdac3161d lock users from frequently login 2016-10-18 15:08:45 +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
Tan Jiang
e6870535a6 Merge branch 'master' into dev 2016-10-17 15:37:23 +08:00
Daniel Jiang
3b02134a5c Merge pull request #872 from ywk253100/161012_sync_repo
Do not show repo which has no tag in it
2016-10-17 15:40:27 +08:00
Daniel Jiang
576c2b4310 Merge pull request #884 from wknet123/master
Updates for some UI styles.
2016-10-17 15:40:13 +08:00
wemeya
95994cd392 modify log_test.go 2016-10-17 13:57:46 +08:00
Daniel Jiang
c0fdec3a1a Merge pull request #886 from wknet123/dev
Extend password validation length.
2016-10-17 13:27:19 +08:00
Wenkai Yin
8a3c4ebc12 Merge pull request #885 from reasonerjt/prepare_https
prepare support configuring https
2016-10-17 10:56:32 +08:00
Tan Jiang
dda9c49848 fix conflict 2016-10-14 20:01:41 +08:00
Tan Jiang
86daa51c1e prepare support configuring https 2016-10-14 19:59:03 +08:00
kunw
9bf08f368c Extend password validation length. 2016-10-14 18:02:13 +08:00