Commit Graph

831 Commits

Author SHA1 Message Date
pbting
e9bbe492bb code format with idea 2019-02-13 16:12:16 +08:00
pbting
1a6fa9e69c support ans 2019-02-13 15:42:41 +08:00
yanlinly
489efb3292
Merge pull request #644 from alibaba/develop
0.8.0-SNAPSHOT
2019-01-17 23:37:10 +08:00
yanlinly
a6666582bd
Merge branch 'master' into develop 2019-01-17 23:15:24 +08:00
zhichen
5f9790962b build js 2019-01-17 19:54:49 +08:00
zhichen
98454d6abd fix namespace bugs 2019-01-17 19:51:08 +08:00
water.lyl
920ff30961 Fix HmacSHA256 not available,change -Djava.ext.dirs 2019-01-17 16:39:38 +08:00
zhichen
8f5c6b0b3e update i18n 2019-01-17 10:56:32 +08:00
water.lyl
fcbb582e53 1、Fix HmacSHA256 not available,change -Djava.ext.dirs
2、update jjwt to newest version
3、longger security key,and change hs512 to hs256
2019-01-16 22:54:51 +08:00
yanlinly
3149aabfc4
Merge pull request #632 from wfnuser/enhancement/login-ui-enhancement
Enhancement/login ui enhancement
2019-01-16 22:39:34 +08:00
wfnuser
4d711788a5 fix styles of login page 2019-01-16 20:14:29 +08:00
Fury Zhu
07d92f6174
Merge pull request #628 from alibaba/feature_multi_tenant
Feature multi tenant
2019-01-16 15:08:55 +08:00
nkorange
5c7b2a2690 Merge branch 'develop' into feature_multi_tenant 2019-01-16 14:54:08 +08:00
nkorange
dee6857d28 #498 fix bug 2019-01-16 14:52:18 +08:00
LoadChange
65d9ecf421 Update fe build 2019-01-16 11:39:37 +08:00
LoadChange
ceb86d61a1 fix: API request method 2019-01-16 11:38:26 +08:00
LoadChange
a4b1e38ff6 Update fe build 2019-01-15 21:20:04 +08:00
LoadChange
f19a67fca6 fix: fe done #498 2019-01-15 21:18:36 +08:00
xiaochun.xxc
9e652a21df Revert "service list testcases"
This reverts commit 94eb697e45.
2019-01-15 19:27:55 +08:00
xiaochun.xxc
5c4662ae48 Revert "rename service list IT case"
This reverts commit eb83e7607f.
2019-01-15 19:26:11 +08:00
xiaochun.xxc
e9f0b548c9 Revert "add api testcases”"
This reverts commit 63c704a1eb.
2019-01-15 19:25:33 +08:00
mingyixu
6b02614856
Merge pull request #626 from alibaba/master
add service list testcase
2019-01-15 17:02:03 +08:00
mingyixu
a689f0f694
Merge branch 'develop' into master 2019-01-15 17:00:43 +08:00
Fury Zhu
663ed1a2f7
Merge pull request #627 from alibaba/feature_multi_tenant
Feature multi tenant
2019-01-15 16:26:28 +08:00
xiaochun.xxc
63c704a1eb add api testcases” 2019-01-15 15:17:07 +08:00
xiaochun.xxc
eb83e7607f rename service list IT case 2019-01-15 15:00:40 +08:00
nkorange
e9811c84c6 Merge branch 'develop' into feature_multi_tenant 2019-01-15 14:55:59 +08:00
nkorange
705a47e5d2 #498 fix bug 2019-01-15 14:53:30 +08:00
xiaochun.xxc
94eb697e45 service list testcases 2019-01-15 14:40:03 +08:00
yanlinly
420141fc42
Merge pull request #624 from alibaba/login
Login merge to develop
2019-01-15 13:37:01 +08:00
wfnuser
7fe087dea2 press key enter to login 2019-01-15 13:26:23 +08:00
yanlinly
8db0420764
Merge pull request #623 from wfnuser/login
Login
2019-01-15 13:06:51 +08:00
wfnuser
973c522834 fix conflict 2019-01-15 12:48:28 +08:00
water.lyl
917ab72ca1 Fix #381 fix build problem 2019-01-15 11:47:14 +08:00
yanlinly
328fb09288
Merge pull request #622 from wfnuser/feature/login
Feature/login
2019-01-15 10:32:05 +08:00
water.lyl
c9d32ed260 Fix #381 fix findbugs 2019-01-14 23:21:32 +08:00
xxc
6815902d85
Merge pull request #620 from paderlol/develop
The version of the Nacos banner automatically references the maven version
2019-01-14 22:42:23 +08:00
zhanglong
bf305eaa0e Fix #619 2019-01-14 22:07:49 +08:00
wfnuser
65f2ab2d2c add username and password validator 2019-01-14 21:33:57 +08:00
wfnuser
90c4159d06 fix conlict 2019-01-14 21:08:34 +08:00
wfnuser
062cc07be1 the problem of locale 2019-01-14 20:48:18 +08:00
nkorange
7abee38ff4 Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
2019-01-14 16:01:58 +08:00
nkorange
fdc48028fc Merge branch 'feature_subscription_by_query_optional' into feature_multi_tenant
# Conflicts:
#	client/src/main/java/com/alibaba/nacos/client/naming/NacosNamingService.java
#	client/src/main/java/com/alibaba/nacos/client/naming/core/HostReactor.java
#	client/src/main/java/com/alibaba/nacos/client/naming/net/NamingProxy.java
#	naming/src/main/java/com/alibaba/nacos/naming/controllers/HealthController.java
#	naming/src/main/java/com/alibaba/nacos/naming/monitor/PerformanceLoggerThread.java
#	naming/src/main/java/com/alibaba/nacos/naming/push/PushService.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/raft/RaftStore.java
2019-01-14 16:01:14 +08:00
Fury Zhu
15aec2aa61
Merge branch 'develop' into feature_subscription_by_query_optional 2019-01-14 14:28:53 +08:00
pader
3683c32c66
Merge pull request #1 from alibaba/develop
Pull the latest code
2019-01-14 11:34:28 +08:00
water.lyl
78f3e44839 Fix #381 update mysql user table and security ignore url 2019-01-13 20:39:35 +08:00
water.lyl
a25e5eb650 Fix #381 disable auth config 2019-01-13 13:19:12 +08:00
nkorange
104a7c55aa #498 Fix test case bug 2019-01-12 22:46:44 +08:00
nkorange
55e1269ee1 #498 Merge develop 2019-01-12 22:43:24 +08:00
Fury Zhu
f82e080a64
Merge pull request #612 from alibaba/feature_metrics
surpport metrics
2019-01-11 19:32:14 +08:00