Commit Graph

777 Commits

Author SHA1 Message Date
baoliang 516ae195d3 Merge remote-tracking branch 'upstream/branch-1.0.2' into 102 2019-05-07 10:49:16 +08:00
qiaozhanwei 77971bd5f7 t_escheduler_worker_group character set problem 2019-05-05 16:31:18 +08:00
baoliang d9bf605684 Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2-up 2019-04-30 18:24:20 +08:00
baoliang 17584a5991 update 1.0.2 2019-04-30 18:24:07 +08:00
bao liang ce94add662
Merge pull request #241 from lenboo/branch-1.0.2
project index date update
2019-04-30 15:46:04 +08:00
qiaozhanwei 0a8e0d1c61 project index date update 2019-04-30 15:28:13 +08:00
bao liang 2690340bff
Merge pull request #239 from lenboo/branch-1.0.2
fix bug: error command id is 0.
2019-04-30 15:21:36 +08:00
baoliang fce91b15e1 fix bug: error command id is 0. 2019-04-30 15:07:41 +08:00
baoliang 84d95eef92 Merge remote-tracking branch 'upstream/dev-20190415' into dev-up 2019-04-29 14:50:54 +08:00
millionfor 8205e7e2e4
Merge pull request #225 from millionfor/dev-20190415
Dev 20190415
2019-04-29 10:51:03 +08:00
gongzijian 9da5ca9df1 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-29 10:50:24 +08:00
gongzijian 5782824055 修复删除节点未删除locations节点信息bug 2019-04-29 10:50:12 +08:00
乔占卫 92862dc8d6
Merge pull request #224 from qiaozhanwei/dev-20190415
admin user update
2019-04-29 10:48:23 +08:00
qiaozhanwei 07014b593d admin user update 2019-04-29 10:20:40 +08:00
bao liang 29e3d67631
Merge pull request #223 from lenboo/dev-20190415
update documents
2019-04-28 19:52:05 +08:00
baoliang fbbeef143d update documents 2019-04-28 19:51:15 +08:00
bao liang 69e8ea6d27
Merge pull request #222 from lenboo/dev-20190415
update documents
2019-04-28 19:44:15 +08:00
baoliang fbd7ac921c update documents 2019-04-28 19:39:11 +08:00
baoliang ebacdfaab5 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-28 18:57:51 +08:00
millionfor 9bab24c292
Merge pull request #221 from millionfor/dev-20190415
Dev 20190415
2019-04-28 18:48:15 +08:00
gongzijian 5b6c43d10c Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-28 18:47:42 +08:00
gongzijian 099550bd76 隐藏任务记录 2019-04-28 18:46:37 +08:00
millionfor 76468b6179
Merge pull request #220 from millionfor/dev-20190415
Dev 20190415
2019-04-28 18:24:23 +08:00
gongzijian e441e124ec Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-28 18:23:33 +08:00
gongzijian b2eb9eb268 build 2019-04-28 18:23:14 +08:00
gongzijian c222386ddd 文档 用户编辑bug 中英 2019-04-28 18:21:30 +08:00
bao liang 652ec2b6ee
Merge pull request #218 from lenboo/dev
merge from dev-20190415
2019-04-28 17:49:02 +08:00
baoliang b664be5714 update en_US.js 2019-04-28 17:46:20 +08:00
baoliang f4450b35a5 Merge remote-tracking branch 'upstream/dev' into dev
# Conflicts:
#	docs/zh_CN/images/mysql_edit.png
2019-04-28 17:05:44 +08:00
baoliang 2f73394489 merge from dev-20190415 2019-04-28 16:55:58 +08:00
lgcareer 7518a94f33
Merge pull request #217 from lgcareer/dev-20190415
update introduction to the initial database in version 1.0.2
2019-04-28 16:27:59 +08:00
ligang ab40443b03 update introduction to the initial database in version 1.0.2 2019-04-28 16:26:34 +08:00
baoliang 18c7876f28 merge from upstream/dev 2019-04-28 16:01:37 +08:00
easyscheduler fb33270857
Merge pull request #215 from lidongdai/dev-20190415
delete Easyscheduler文档.pdf
2019-04-28 15:17:05 +08:00
baoliang 1c74a7897b update commit process 2019-04-28 14:59:16 +08:00
bao liang 07c801beed
Merge pull request #213 from lenboo/dev-20190415
add upgrade document
2019-04-28 14:18:20 +08:00
baoliang e35357ce70 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-28 14:04:50 +08:00
baoliang b4066cb541 Merge remote-tracking branch 'origin/dev-20190415' into dev-20190415 2019-04-28 14:03:20 +08:00
baoliang 92e61a9e94 add upgrade document 2019-04-28 14:02:59 +08:00
lgcareer 2da66a7ec5
Merge pull request #212 from lgcareer/dev-20190415
remove tab in line 11
2019-04-28 14:02:34 +08:00
ligang 404d134f5c remove tab in line 11 2019-04-28 14:00:45 +08:00
millionfor d37c77e454
Merge pull request #209 from millionfor/dev-20190415
Dev 20190415
2019-04-28 11:31:37 +08:00
gongzijian 3bb0026164 bug1 2019-04-28 11:30:22 +08:00
gongzijian ad2f2bc053 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 23:09:44 +08:00
dailidong 0022392715 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 20:37:24 +08:00
ligang 2c4c4cc0c0 [maven-release-plugin] prepare for next development iteration 2019-04-26 20:10:33 +08:00
ligang 5f396232d6 [maven-release-plugin] prepare release 1.0.2 2019-04-26 20:07:39 +08:00
baoliang 43b553d9e6 Merge remote-tracking branch 'remotes/upstream/master' into dev-20190415 2019-04-26 20:06:47 +08:00
baoliang 4b73c719b8 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 20:01:15 +08:00
dailidong 7e35c96d4c 1.0.2文档发布 2019-04-26 19:58:00 +08:00