zhuyijun/nacos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
903 Commits 2 Branches 3 Tags 58 MiB
0e0900bfa9
Commit Graph

903 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
qingliang.ql
def3c196a1 add url 2019-01-18 14:24:53 +08:00
nkorange
d064fe36bb Merge branch 'develop' into feature_naming_ap 2019-01-18 11:38:20 +08:00
Fury Zhu
780bd18f1a
Merge pull request #647 from alibaba/feature_multi_tenant 
Fix CMDB JVM option error
 2019-01-18 11:13:31 +08:00
nkorange
47b7423153 Merge branch 'develop' into feature_multi_tenant 2019-01-18 10:58:30 +08:00
nkorange
a889642ca9 Fix CMDB JVM option error in JDK 9 2019-01-18 10:57:44 +08:00
Keep
ed4c41fdad
Merge pull request #642 from wuyoushan/fix_jwtAuth_npe 
fix JwtAuthenticationTokenFilter NPE bug
 2019-01-18 10:40:22 +08:00
Keep
606bd1d47b
Merge pull request #641 from wuyoushan/remove_useless_semicolon 
remove useless semicolon
 2019-01-18 10:30:50 +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
wuyoushan
e589b29351 fix JwtAuthenticationTokenFilter NPE bug 2019-01-17 20:39:20 +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
nkorange
38e84cfb62 #502 Fix PMD 2019-01-17 19:50:57 +08:00
wuyoushan
938666c7b8 remove useless semicolon 2019-01-17 18:02:44 +08:00
nkorange
cc1f6647b0 #502 Fix error log print 2019-01-17 17:12:44 +08:00
nkorange
0e76f55a3f #502 Fix health check processor inject bean failed problem 2019-01-17 16:42:15 +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
nkorange
806e7030d2 #502 Fix bean inject error 2019-01-17 10:15:51 +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
nkorange
7fa9c3afee #502 merge code 2019-01-16 18:24:06 +08:00
nkorange
980e2a62ef Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftCore.java
#	naming/src/main/java/com/alibaba/nacos/naming/consistency/persistent/simpleraft/RaftStore.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
#	naming/src/main/java/com/alibaba/nacos/naming/core/VirtualClusterDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/Switch.java
#	naming/src/main/java/com/alibaba/nacos/naming/misc/SwitchDomain.java
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
 2019-01-16 18:12:54 +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
nkorange
b5f09f63db #502 make build pass 2019-01-16 10:46:22 +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
nkorange
425a80167b Merge branch 'feature_multi_tenant' into feature_naming_ap 
# Conflicts:
#	naming/src/main/java/com/alibaba/nacos/naming/core/ServiceManager.java
 2019-01-15 18:15:55 +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
nkorange
65408a6194 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-15 11:41:59 +08:00