Commit Graph

47 Commits

Author SHA1 Message Date
xuechaos
9275dd7c24 update copyright 2018-10-25 19:02:32 +08:00
mercyblitz
cc616f8d6d Revert Constants.java & testcase 2018-10-19 11:00:37 +08:00
nkorange
baa8594fe7 Merge branch 'master' into 0.3.0
# Conflicts:
#	api/pom.xml
#	config/pom.xml
#	config/src/main/java/com/alibaba/nacos/config/server/service/PersistService.java
#	console/pom.xml
#	naming/src/main/java/com/alibaba/nacos/naming/web/ApiCommands.java
#	naming/src/main/resources/application.properties
2018-10-18 17:11:32 +08:00
mercyblitz
8f7c743a00 Fixed test cases 2018-10-17 16:39:12 +08:00
mercyblitz
c0ee2f2764 Polish to resolve compilation issue 2018-10-15 17:17:25 +08:00
小马哥
5c3ebf8f9f
Merge branch 'master' into 0.2.2 2018-10-15 17:10:48 +08:00
hxy1991
074d6aa77a Fix #119 2018-10-09 20:23:33 +08:00
小马哥
55433f0995
Merge pull request #23 from javartisan/master
improving code quality
2018-10-09 10:13:58 +08:00
xiaomage
8d55b3fd33 Bug fix 2018-10-05 19:51:20 +08:00
mercyblitz
e08dca3d75 Polish alibaba/nacos#111 : Replace config module 2018-10-04 00:47:46 +08:00
mercyblitz
91e8795486 Polish alibaba/nacos#94 : fixed logback missing 2018-10-03 05:10:39 +08:00
mercyblitz
0424a4a1db Polish alibaba/nacos#94 : adapter modular logback whether current application is Spring or Spring Boot 2018-10-03 04:00:33 +08:00
mercyblitz
8a73c805d8 Polish alibaba/nacos#110 : remove application.properties and copy to META-INF/nacos-default.properties 2018-10-03 01:18:09 +08:00
mercyblitz
700a755ac5 Polish alibaba/nacos#109 : Exclude DataSourceAutoConfiguration using externalized configuration 2018-10-02 21:50:59 +08:00
mercyblitz
11204f8df6 Polish alibaba/nacos#108 : Remove duplicated banner.txt in sub-modules and move one into core module 2018-10-02 21:05:56 +08:00
mercyblitz
c4374dbf4e Polish alibaba/nacos#94 : fixed the grammar of logback xml files 2018-10-02 18:21:54 +08:00
mercyblitz
c0a25c148a Polish alibaba/nacos#105 2018-10-01 22:54:37 +08:00
mercyblitz
3b5eb060e8 Polish alibaba/nacos#103 2018-10-01 12:15:21 +08:00
mercyblitz
83f536b27d Polish alibaba/nacos#102 2018-10-01 11:43:48 +08:00
mercyblitz
a718c84d4c Polish alibaba/nacos#104 2018-10-01 10:48:34 +08:00
xiaomage
421e9a347f Bug fix 2018-10-01 10:00:29 +08:00
mercyblitz
4f273e70c5 Add Configurations for Database 2018-10-01 00:12:31 +08:00
mercyblitz
ae0feb80f4 Move the location of SQL scripts for code 2018-09-30 20:55:20 +08:00
mercyblitz
7b2549131b Move the location of SQL scripts 2018-09-30 20:54:43 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
hxy1991
77a162d671 Fix #92 2018-09-30 11:08:49 +08:00
hxy1991
d3013f800a Merge branch 'upstream' 2018-09-28 16:06:26 +08:00
nkorange
af35525850 Merge branch 'master' into 0.3.0
Conflicts:
	console/src/main/resources/static/.gitignore
	console/src/main/resources/static/.webpackrc
	console/src/main/resources/static/README.md
	console/src/main/resources/static/i18ndoc.js
	console/src/main/resources/static/index.js
	console/src/main/resources/static/package.json
	console/src/main/resources/static/public/i18ndoc.js
	console/src/main/resources/static/src/components/EditorNameSpace.js
	console/src/main/resources/static/src/components/NameSpaceList.js
	console/src/main/resources/static/src/components/NewNameSpace.js
	console/src/main/resources/static/src/components/ValidateDialog.js
	console/src/main/resources/static/src/menu.js
	console/src/main/resources/static/src/pages/Configeditor.js
	console/src/main/resources/static/src/pages/ConfigurationManagement.js
	console/src/main/resources/static/src/pages/Namespace.js
	console/src/main/resources/static/src/router.js
2018-09-28 10:29:11 +08:00
water.lyl
20a5f80956 [motify info] fix pmd 2018-09-28 09:44:29 +08:00
water.lyl
386d3cc1ad [motify info] namespace manage 2018-09-27 22:44:13 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check
close #79
2018-09-26 20:05:17 +08:00
hxy1991
b69e7da751 Eliminate warnings: Redundant array creation for calling varargs method 2018-09-24 22:18:16 +08:00
water.lyl
9839062d32 Fix #67
The configuration module log is changed to config
2018-09-19 19:15:54 +08:00
water.lyl
b9cd75b640 Fix #65
Nacos default port changed from 8080 to 8848
2018-09-19 19:06:03 +08:00
water.lyl
1083a55677 [modify info] fix notify unhealth problem 2018-09-13 20:29:49 +08:00
water.lyl
7790a2255a [motify info] push web ui,and build shell 2018-09-11 17:00:54 +08:00
water.lyl
f97adcc42a [motify info] push static result 2018-09-07 14:35:19 +08:00
water.lyl
ea45b180c8 [motify info] fix edit info 2018-09-07 14:29:16 +08:00
water.lyl
cc9c1ade5f [motify info] push build result,and fix namespace undefined problem 2018-09-07 11:32:19 +08:00
water.lyl
1228177679 [motify info] config list/ history & rollback 2018-09-05 21:15:50 +08:00
water.lyl
57d704cfc9 【motify info】 test static console 2018-08-27 10:29:24 +08:00
hxy1991
785c4236c3 Fixed #28 2018-08-10 16:30:20 +08:00
javartisan
3320de2fa2 delete useless code 2018-08-02 09:55:29 +08:00
yanlinly
9090e1d870
删除非utf-8编码sql 2018-07-22 16:10:54 +08:00
yanlinly
5f3452f568
提交utf-8编码的创表语句 2018-07-22 16:05:44 +08:00
yanlinly
10aa4fc2eb
删除无用文件 2018-07-22 16:03:54 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00