Commit Graph

4803 Commits

Author SHA1 Message Date
gongzijian
fdac47b3f7 add monitor/router,edit dag bug, edit udfc 2019-04-19 11:16:50 +08:00
qiaozhanwei
563423767e Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415 2019-04-19 10:20:11 +08:00
ligang
3cfb5d9824 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-18 20:06:19 +08:00
millionfor
74f51a56b5
Merge pull request #82 from millionfor/dev-20190415
Dev 20190415
2019-04-18 17:25:30 +08:00
gongzijian
be6770e9eb Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-18 17:23:55 +08:00
gongzijian
f4dcc468c5 整理所有list列表结构/增加监控中心路由/增加令牌管理 2019-04-18 17:23:39 +08:00
qiaozhanwei
472ce9f277 Merge remote-tracking branch 'remotes/upstream/dev-20190415' into dev-20190415 2019-04-18 17:12:57 +08:00
qiaozhanwei
0e0e9b59ac api access token dev update 2019-04-18 17:12:23 +08:00
乔占卫
267df899c3
Merge pull request #81 from qiaozhanwei/dev-20190415
dev merge
2019-04-18 16:53:36 +08:00
qiaozhanwei
1ab8234ca5 Merge branch 'dev-20190415' of https://github.com/qiaozhanwei/EasyScheduler-1 into dev-20190415 2019-04-18 16:50:08 +08:00
乔占卫
cd60898a61
Merge pull request #1 from qiaozhanwei/branch-1.0.0
Branch 1.0.0 merge dev
2019-04-18 16:49:21 +08:00
bao liang
9df5d43ef5
Merge pull request #80 from lenboo/dev-20190415
update
2019-04-18 16:34:14 +08:00
baoliang
8591fde30c update 2019-04-18 16:33:35 +08:00
bao liang
2589e6f45a
Merge pull request #78 from lenboo/dev-20190415
add history command
2019-04-18 16:28:49 +08:00
baoliang
947389299e merge from upstream 2019-04-18 16:26:40 +08:00
乔占卫
dd1be123ed
Merge pull request #76 from qiaozhanwei/dev-20190415
api access token dev
2019-04-18 16:07:08 +08:00
乔占卫
897400e4ee
Merge pull request #75 from qiaozhanwei/dev-20190415
api access token dev
2019-04-18 16:03:54 +08:00
qiaozhanwei
da03ff1740 api access token dev update 2019-04-18 15:41:18 +08:00
qiaozhanwei
3118a7626c api access token dev update 2019-04-18 15:22:31 +08:00
easyscheduler
2aca5ff503
Merge pull request #74 from lidongdai/dev
Simplified deployment documentation
2019-04-18 15:13:00 +08:00
dailidong
4760be8862 简化部署文档 2019-04-18 15:09:02 +08:00
dailidong
b46d5fab2f 简化部署文档 2019-04-18 15:08:52 +08:00
qiaozhanwei
d1b6cbf1ee update accesstokenservice 2019-04-18 15:01:48 +08:00
qiaozhanwei
5d23ba710e api access token dev update 2019-04-18 14:55:20 +08:00
qiaozhanwei
2cdc791f8c api access token dev 2019-04-18 14:08:28 +08:00
baoliang
d7fdd8ca95 merge from upstream 2019-04-18 10:12:49 +08:00
dailidong
6e86a9a662 简化部署文档 2019-04-17 23:26:25 +08:00
dailidong
ef8ee993df 简化部署文档 2019-04-17 23:21:33 +08:00
lgcareer
226f53fb90
Merge pull request #73 from lgcareer/dev-20190415
Dev 20190415 
add upgrade and create script
2019-04-17 20:16:39 +08:00
ligang
94f10977a8 add upgrade and create script 2019-04-17 20:14:42 +08:00
ligang
abd4355af3 update sql **/*.* to **/* 2019-04-17 20:13:28 +08:00
baoliang
654131fe72 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-17 20:11:13 +08:00
baoliang
babc838987 update exception 2019-04-17 20:10:36 +08:00
lgcareer
db3f7a3097
Merge pull request #72 from lgcareer/dev-20190415
Dev 20190415 add upgrade function
2019-04-17 18:03:54 +08:00
ligang
3a4b152b1f Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-17 17:56:46 +08:00
ligang
0cfeb4b9a2 add upgrade function 2019-04-17 17:35:43 +08:00
ligang
d2ca062197 add sql create and upgrade 1.0.2 2019-04-17 17:33:38 +08:00
millionfor
0e4c86513d
Merge pull request #71 from millionfor/dev-20190415
Dev 20190415
2019-04-17 17:25:58 +08:00
gongzijian
4bdb60f268 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-17 17:25:06 +08:00
gongzijian
3fde5cefea 队列国际化 2019-04-17 17:24:49 +08:00
gongzijian
6dc8a4d3f1 解决分页url带参数问题/创建用户增加队列 2019-04-17 17:21:30 +08:00
baoliang
9d6c9b4519 update exception 2019-04-17 16:51:19 +08:00
baoliang
9c5270e4ca merge from upstream
add error command
2019-04-17 16:22:31 +08:00
乔占卫
fb0cc5b37d
Merge pull request #69 from qiaozhanwei/dev-20190415
user-specified queue function development
2019-04-17 13:57:04 +08:00
qiaozhanwei
2888907376 user-specified queue function development 2019-04-17 13:55:25 +08:00
escheduler
34d6234d8b
Merge pull request #66 from millionfor/dev
Dev
2019-04-17 11:33:14 +08:00
lgcareer
60f8d58b9e
Update CONTRIBUTING.md 2019-04-16 20:14:07 +08:00
乔占卫
222c7ca476
Merge pull request #68 from qiaozhanwei/branch-1.0.0
scheduler command type update and add log
2019-04-16 19:54:53 +08:00
qiaozhanwei
5c40a3efa0 scheduler command type update and add log 2019-04-16 19:54:10 +08:00
millionfor
6c1cbef18f
Merge pull request #67 from millionfor/dev-20190415
Dev 20190415
2019-04-16 18:26:16 +08:00