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

300 Commits

Author SHA1 Message Date
nkorange
534995a405 Resolve conflicts 2018-10-18 18:59:45 +08:00
zhichen
1fdd763b8d fix pageSize bug 2018-10-18 17:16:32 +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
王彦民
4ae610d2cc Merge branch '0.3.0' of github.com:alibaba/nacos into 0.3.0 2018-10-18 14:27:30 +08:00
王彦民
cc4dc419f6 fix: Service Detail i18n 2018-10-18 14:26:53 +08:00
王彦民
1441561ae3 fix: Service Detail i18n 2018-10-18 14:26:05 +08:00
zhichen
5430de8565 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-10-18 14:10:25 +08:00
zhichen
9d6e57af5c fix ConfigEditor bugs 2018-10-18 14:10:18 +08:00
water.lyl
d4a5fb2bd1 [motify info] fix dataId cannot show problem 2018-10-18 12:46:56 +08:00
wyp12
251b2f01d8 merge master 2018-10-17 19:45:35 +08:00
zhichen
9c6b1dec4f modify the architecture of pages and components 2018-10-17 15:11:59 +08:00
zhichen
01918ec9e5 Fixes #128 2018-10-17 11:16:37 +08:00
nkorange
fb84f039fb Fix service detail page error 2018-10-16 21:45:48 +08:00
nkorange
e8c81e24ed Modify page display 2018-10-16 17:28:19 +08:00
hanxie
d3f59f3b87 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 
# Conflicts:
#	console/src/main/resources/static/src/menu.js
 2018-10-16 14:23:01 +08:00
hanxie
92148babe7 fix navlist 2018-10-16 14:19:09 +08:00
LoadChange
bf285912dc fix: metadata to text bug 2018-10-15 21:18:23 +08:00
nkorange
216007ff97 Fix update metadata failed bug, modify health status display words 2018-10-15 20:16:55 +08:00
王彦民
c824b2a463 fix: cluster update API to add parameters 2018-10-15 18:04:04 +08:00
王彦民
9d527c3810 fix: Add the return button to the Service Detail page 2018-10-15 11:05:45 +08:00
王彦民
0e2e59c2e0 fix: Health check pattern Key/Value 2018-10-14 21:26:29 +08:00
王彦民
a95ac5179e feat: Service Detail page API docking 2018-10-14 17:41:16 +08:00
王彦民
5ba7a5c492 fix: Fix Instance list display 2018-10-12 23:43:58 +08:00
王彦民
2f4616aaa5 feat: Service details page API docking 2018-10-12 20:28:53 +08:00
王彦民
148c12972b fix: Service Details page dialog form style beautification 2018-10-05 22:11:31 +08:00
王彦民
38c4baf9e0 refactor: 服务详情国际化重构 2018-10-05 17:51:12 +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
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
adaf5f54d1 Polish alibaba/nacos#95 : add "standalone" profile 2018-10-02 11:20:54 +08:00
mercyblitz
be8f3c2052 Polish alibaba/nacos#103 2018-10-01 10:58:27 +08:00
王彦民
65339452af chore: Move files 2018-09-30 20:42:05 +08:00
王彦民
a91ec6197b refactor: Service list style extraction, set row color 2018-09-30 20:41:42 +08:00
mercyblitz
85df9e077f Fixed alibaba/nacos#98 2018-09-30 16:41:40 +08:00
王彦民
fceda89fe3 feat: service detail page 2018-09-30 12:57:31 +08:00
zhichen
daca668d84 fix namespace bug 2018-09-28 19:33:37 +08:00
nkorange
b603b2ca39 Add naming console api 2018-09-28 16:23:55 +08:00
王彦民
6d2345fec8 Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-28 15:41:59 +08:00
王彦民
acea58c082 feat: 服务列表接口对接 2018-09-28 15:41:43 +08:00
water.lyl
a57a6f41ee [motify info] change menu 2018-09-28 15:30:43 +08:00
zhichen
e68f5ca9ca add ServiceManagement i18n and remove some variable which never be used 2018-09-28 14:44:04 +08:00
water.lyl
165bce8ade [motify info] fix namespace cannot save problem 2018-09-28 14:36:28 +08:00
zhichen
22b8e605c5 fix doc site url 2018-09-28 14:35:00 +08:00
water.lyl
802979e27b [motify info] recovery static file 2018-09-28 11:48:40 +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
fc44a1264b [motify info] update namespace config 2018-09-27 22:54:19 +08:00
water.lyl
386d3cc1ad [motify info] namespace manage 2018-09-27 22:44:13 +08:00
nkorange
44cf03db2d Update version to 0.2.1 2018-09-27 14:22:19 +08:00
王彦民
3d5b4b91d4 feat: service page 2018-09-27 10:59:32 +08:00
nkorange
adafaf7086 Merge branch 'master' into 0.2.2 2018-09-26 21:20:22 +08:00
xuechaos
d24f8680d9 fix mvn -B clean apache-rat:check 
close #79
 2018-09-26 20:05:17 +08:00
caogu.wyp@alibaba-inc.com
5dfd4b6451 update version 2018-09-26 19:59:41 +08:00
zhichen
5b27dd4221 modify README.md 2018-09-25 15:00:53 +08:00
nkorange
b54a0a9b9d Update version to 0.2.2-SNAPSHOT 2018-09-21 16:46:49 +08:00
hxy1991
357702afaa Modify the version to 0.2.1-RC1 2018-09-21 15:46:53 +08:00
xuechaos
4603fb221a update shell 2018-09-21 15:11:23 +08:00
zhichen
f04be0b7ca ignore i18ndoc.js 2018-09-20 20:31:10 +08:00
zhichen
5c04f1f274 add build.js 2018-09-20 20:15:23 +08:00
water.lyl
b9cd75b640 Fix #65 
Nacos default port changed from 8080 to 8848
 2018-09-19 19:06:03 +08:00
mercyblitz
1145260d64 Update 0.2.1 and refactor some APIs 2018-09-15 13:50:25 +08:00
water.lyl
a29bf2436f [motify info] static resource not statble, remove static resource. 0.3 realease static resource again 2018-09-14 18:14:14 +08:00
water.lyl
de1d976432 Merge remote-tracking branch 'origin/0.3.0' into v0.2 
* origin/0.3.0: (32 commits)
  [modify info] restruct equal name to void conflict
  [motify info] fix pmd
  [motify info] Api split
  fix bug and change some input style
  fix: modify wrong code
  [motify info] fix rollback problem
  update code
  [motify info] push web ui,and build shell
  gitignore add build dir
  fix: setParams decode bug
  [motify info] push static result
  [motify info] fix edit info
  [motify info] push build result,and fix namespace undefined problem
  fix tags bug
  update add index.css
  [motify info] mix useful
  [motify info] push core ui
  feat: add i18n feature
  替换白底logo
  update: update header css
  ...
 2018-09-13 15:48:24 +08:00
water.lyl
8719aea7c7 [motify info] Api split 2018-09-13 11:30:25 +08:00
zhichen
3be712c28e resolve conflict 2018-09-12 21:33:28 +08:00
zhichen
a7d4b559bd fix bug and change some input style 2018-09-12 21:25:31 +08:00
zhichen
b352f614f2 fix: modify wrong code 2018-09-12 21:09:43 +08:00
water.lyl
ef18f08c74 [motify info] fix rollback problem 2018-09-12 15:55:16 +08:00
zhichen
48fdb4d52b update code 2018-09-12 15:15:29 +08:00
nkorange
6bc052153d Update version to 0.2.0 2018-09-12 14:13:38 +08:00
water.lyl
7790a2255a [motify info] push web ui,and build shell 2018-09-11 17:00:54 +08:00
zhichen
aebac096db gitignore add build dir 2018-09-10 11:33:38 +08:00
zhichen
0fe1eb19cd Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-07 16:44:02 +08:00
zhichen
a8707f0309 fix: setParams decode bug 2018-09-07 16:41:41 +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
zhichen
e27b5f4abf fix tags bug 2018-09-07 10:48:07 +08:00
zhichen
b5998ff840 update add index.css 2018-09-07 10:00:36 +08:00
water.lyl
ff8e767228 [motify info] mix useful 2018-09-06 20:15:42 +08:00
water.lyl
e299d9ad24 [motify info] push core ui 2018-09-06 17:46:59 +08:00
zhichen
b542c5e38f resolve conflict 2018-09-06 11:59:32 +08:00
zhichen
7e0e48d687 feat: add i18n feature 2018-09-06 11:57:41 +08:00
hanxie
7bf5297fbd Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-06 11:42:53 +08:00
hanxie
665e5edde8 替换白底logo 2018-09-06 11:42:41 +08:00
zhichen
57bf55c912 update: update header css 2018-09-06 10:47:58 +08:00
zhichen
da2b6341ea Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-06 10:43:29 +08:00
zhichen
7cfc8da0e6 fix: fix listeningToQuery select bug 2018-09-06 10:43:21 +08:00
hanxie
0997b16390 添加logo的链接 2018-09-05 21:20:27 +08:00
hanxie
e7123b3e6d Merge branch '0.3.0' of https://github.com/alibaba/nacos into 0.3.0 2018-09-05 21:19:57 +08:00
hanxie
f2dd14bab9 添加nacos 吊顶 2018-09-05 21:19:41 +08:00
water.lyl
1228177679 [motify info] config list/ history & rollback 2018-09-05 21:15:50 +08:00
zhichen
85b3569a29 update: modified webpackrc 2018-09-05 11:14:11 +08:00
zhichen
7a90c57f27 update: 国际化字段更改 2018-08-30 22:39:36 +08:00
zhichen
b246c92f6c update: 删除脚本生成的多余依赖 2018-08-30 21:10:41 +08:00
zhichen
dc4ed73d72 update: 删除脚本生成的多余依赖 2018-08-29 22:54:32 +08:00
water.lyl
66427f43c7 【修改描述】alife改为alifd 
【修改人】彦林
 2018-08-29 21:13:08 +08:00
zhichen
125b999182 fix: package依赖问题 2018-08-29 20:39:51 +08:00
zhichen
d2477689e1 测试发布 2018-08-29 20:24:59 +08:00
xingxuechao
91d20f34fd nacos is coming 2018-07-21 00:27:23 +08:00