Commit Graph

550 Commits

Author SHA1 Message Date
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
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
乔占卫 4e3f9cbc64
Update 前端部署文档.md 2019-04-26 19:54:19 +08:00
乔占卫 b728b409f8
Update 后端部署文档.md 2019-04-26 19:53:03 +08:00
easyscheduler 627c4ac6fe
Merge pull request #179 from lidongdai/dev-20190415
1.0.2 release docs
2019-04-26 19:53:00 +08:00
dailidong 96402a1c85 1.0.2文档发布 2019-04-26 19:51:06 +08:00
baoliang 40e6a3b8a3 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 19:13:58 +08:00
ligang a5ba3eccb9 [maven-release-plugin] prepare for next development iteration 2019-04-26 18:53:28 +08:00
ligang b5efd57150 [maven-release-plugin] prepare release 1.0.2 2019-04-26 18:50:35 +08:00
lgcareer 4524a434c2
Merge pull request #177 from lgcareer/dev-20190415
add worker_group_id in t_escheduler_process_instance
2019-04-26 17:13:45 +08:00
ligang 85ffa20acf add ac_escheduler_T_t_escheduler_process_instance_C_worker_group_id 2019-04-26 17:11:16 +08:00
lgcareer 0cef5dd4cc
Merge pull request #176 from analysys/branch-1.0.0
Branch 1.0.0 fix graphHasCycle
2019-04-26 16:44:43 +08:00
lgcareer 9b1d48b615
Merge pull request #175 from lgcareer/dev-20190415
remove development filters
2019-04-26 16:39:25 +08:00
ligang 1539035b3c remove development filters 2019-04-26 16:31:08 +08:00
millionfor 7c5bd75c03
Merge pull request #173 from millionfor/dev-20190415
Dev 20190415
2019-04-26 15:12:06 +08:00
gongzijian 19bfe50ec7 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 15:11:20 +08:00
gongzijian 05ba84e61a 文字修改 2019-04-26 15:11:09 +08:00
乔占卫 d6c707d0fe
Merge pull request #172 from qiaozhanwei/dev-20190415
HttpClientTest update
2019-04-26 15:02:24 +08:00
qiaozhanwei 0641ded386 HttpClientTest update 2019-04-26 15:01:31 +08:00
乔占卫 cefdb29834
Merge pull request #171 from qiaozhanwei/dev-20190415
doc update
2019-04-26 14:54:00 +08:00
qiaozhanwei c2ce0fd80c doc update 2019-04-26 14:53:05 +08:00
lgcareer d6937af227
Merge pull request #170 from lgcareer/dev-20190415
Dev 20190415 update upgrade ddl.sql
2019-04-26 14:31:24 +08:00
ligang 29431ce53f update upgrade ddl.sql 2019-04-26 14:30:09 +08:00
ligang aa6c0f56bf Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415 2019-04-26 14:14:40 +08:00
ligang 29d2d9f36e Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 14:11:48 +08:00
millionfor 47587da254
Merge pull request #169 from millionfor/dev-20190415
Dev 20190415
2019-04-26 14:10:19 +08:00
gongzijian 2633bbcb09 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-26 14:09:40 +08:00
gongzijian dbc658b25f 编码问题 2019-04-26 14:09:17 +08:00
乔占卫 ba2fe6ad0e
Merge pull request #168 from qiaozhanwei/dev-20190415
tenant code  check update
2019-04-26 14:05:42 +08:00