Commit Graph

6739 Commits

Author SHA1 Message Date
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
gongzijian
4d9d72fec9 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-16 18:24:15 +08:00
gongzijian
914169ba11 彻底优化分页 url带参查询 保留url参数 2019-04-16 18:24:04 +08:00
乔占卫
7cb5890d54
Merge pull request #65 from qiaozhanwei/branch-1.0.0
Python task specifies path execution update
2019-04-16 18:07:07 +08:00
qiaozhanwei
10ba69db5d Python task specifies path execution update 2019-04-16 18:05:14 +08:00
bao liang
76e7013159
Merge pull request #64 from lenboo/dev-20190415
fix bug: command exception.
2019-04-16 18:01:13 +08:00
乔占卫
45e8295a02
Merge pull request #63 from qiaozhanwei/branch-1.0.0
Python task specifies path execution update
2019-04-16 17:44:03 +08:00
qiaozhanwei
cd8b51adbf update Constants 2019-04-16 17:42:41 +08:00
qiaozhanwei
a7e6f30d55 Python task specifies path execution update 2019-04-16 17:36:35 +08:00
baoliang
fed2f9c404 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-16 16:52:21 +08:00
baoliang
f555faffed fix bug:command exception. 2019-04-16 16:51:25 +08:00
easyscheduler
5943c7a26c
Update README.md 2019-04-16 15:47:47 +08:00
millionfor
4e82c77fed
Merge pull request #62 from millionfor/dev-20190415
Dev 20190415
2019-04-16 15:20:13 +08:00
gongzijian
16be0d12a4 Merge remote-tracking branch 'upstream/dev-20190415' into dev-20190415 2019-04-16 15:19:12 +08:00
gongzijian
3c5015e691 路由优化/文件目录优化/增加历史任务记录/ 2019-04-16 15:18:57 +08:00