millionfor
|
98130014c7
|
Merge pull request #359 from millionfor/branch-1.0.2
.env
|
2019-05-25 11:22:13 +08:00 |
|
gongzijian
|
6628259bed
|
.env
|
2019-05-25 11:21:24 +08:00 |
|
millionfor
|
a52ce69d2e
|
Merge pull request #358 from millionfor/branch-1.0.2
add remove Timing
|
2019-05-25 11:17:10 +08:00 |
|
gongzijian
|
3b4c32514f
|
add remove Timing
|
2019-05-25 11:16:37 +08:00 |
|
millionfor
|
bb471a960b
|
Merge pull request #357 from millionfor/branch-1.0.2
Branch 1.0.2
|
2019-05-25 10:51:49 +08:00 |
|
gongzijian
|
7b3ab01e8c
|
edit udp.vue
|
2019-05-25 10:50:49 +08:00 |
|
baoliang
|
04e591c7be
|
Merge remote-tracking branch 'upstream/branch-1.0.2' into 102
|
2019-05-25 10:24:51 +08:00 |
|
gongzijian
|
e7d4ce569b
|
Merge remote-tracking branch 'upstream/branch-1.0.2' into branch-1.0.2
|
2019-05-25 10:14:02 +08:00 |
|
bao liang
|
5545de4f48
|
Merge pull request #356 from lenboo/branch-1.0.2
add today for dependent item
|
2019-05-24 19:59:45 +08:00 |
|
baoliang
|
8033a6304c
|
update sql for dependent
|
2019-05-24 19:58:11 +08:00 |
|
baoliang
|
6e5742ff08
|
add depend item interval "today"
|
2019-05-24 19:07:00 +08:00 |
|
bao liang
|
a666efa048
|
Merge pull request #355 from lenboo/branch-1.0.2
update user document
|
2019-05-24 18:50:08 +08:00 |
|
baoliang
|
488c3959ca
|
add quick start
|
2019-05-24 18:48:18 +08:00 |
|
baoliang
|
39bc4f81e4
|
add quick start
|
2019-05-24 18:47:33 +08:00 |
|
乔占卫
|
9ab399e909
|
Merge pull request #354 from qiaozhanwei/branch-1.0.2
creating a user queue is not required
|
2019-05-24 18:23:52 +08:00 |
|
qiaozhanwei
|
b3feb1f6ef
|
creating a user queue is not required
|
2019-05-24 18:22:19 +08:00 |
|
lgcareer
|
e28862d8e8
|
Merge pull request #353 from lgcareer/branch-1.0.2
Determine if a node exists before deleting it
|
2019-05-24 17:48:30 +08:00 |
|
ligang
|
8a4fe1d86e
|
Determine if a node exists before deleting it
|
2019-05-24 17:46:19 +08:00 |
|
乔占卫
|
ae8076a72f
|
Merge pull request #351 from qiaozhanwei/branch-1.0.2
mail support ssl and install.sh update and user queue display
|
2019-05-24 16:52:51 +08:00 |
|
qiaozhanwei
|
6b5706d6b3
|
master startup lock dev update
|
2019-05-24 16:50:47 +08:00 |
|
baoliang
|
85b632ca5c
|
add images
|
2019-05-24 16:08:58 +08:00 |
|
baoliang
|
6063ec73c8
|
add images
|
2019-05-24 16:08:26 +08:00 |
|
qiaozhanwei
|
d385c5c4a1
|
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
|
2019-05-24 15:02:23 +08:00 |
|
bao liang
|
7972225242
|
Merge pull request #350 from lenboo/branch-1.0.2
change jsonToList return empty list
|
2019-05-24 14:52:15 +08:00 |
|
baoliang
|
501795a5a7
|
update
|
2019-05-24 14:48:30 +08:00 |
|
baoliang
|
9f4e6438db
|
Merge remote-tracking branch 'upstream/branch-1.0.2' into 102
|
2019-05-24 14:35:53 +08:00 |
|
baoliang
|
dc1c4d0255
|
fix bug: cannot delete global_params field when updating definition
|
2019-05-24 14:35:25 +08:00 |
|
baoliang
|
950deba4c7
|
change return null to empty list
|
2019-05-24 14:31:09 +08:00 |
|
lgcareer
|
761bd8b35e
|
Merge pull request #348 from lgcareer/branch-1.0.2
add monitorServerState in 1.0.3
|
2019-05-24 11:33:26 +08:00 |
|
ligang
|
983fefc13c
|
add monitorServerState in 1.0.3
|
2019-05-24 11:28:29 +08:00 |
|
qiaozhanwei
|
df0083224d
|
mail support ssl and install.sh update
|
2019-05-24 10:26:09 +08:00 |
|
lgcareer
|
ec3c0f26db
|
Merge pull request #344 from lgcareer/branch-1.0.2
compress content in alert_mail_template.ftl
|
2019-05-23 17:41:40 +08:00 |
|
ligang
|
199c972968
|
remove init basepath
|
2019-05-23 17:38:48 +08:00 |
|
ligang
|
8f7018f60a
|
compress content
|
2019-05-23 17:33:43 +08:00 |
|
ligang
|
9f67b55a25
|
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
|
2019-05-23 17:32:11 +08:00 |
|
乔占卫
|
02635b2c34
|
Merge pull request #343 from qiaozhanwei/branch-1.0.2
remove dockerfile and update install.sh
|
2019-05-23 16:35:37 +08:00 |
|
qiaozhanwei
|
5ecbee36c9
|
remove dockerfile
|
2019-05-23 16:34:34 +08:00 |
|
qiaozhanwei
|
c08ae2413f
|
install.sh and alert.properties update
|
2019-05-23 16:29:55 +08:00 |
|
乔占卫
|
7f4c49364b
|
Merge pull request #342 from qiaozhanwei/branch-1.0.2
master startup lock dev
|
2019-05-23 15:58:16 +08:00 |
|
qiaozhanwei
|
2d617b56c8
|
master startup lock dev update
|
2019-05-23 15:56:54 +08:00 |
|
qiaozhanwei
|
8f52e7e7c8
|
Merge remote-tracking branch 'remotes/upstream/branch-1.0.2' into branch-1.0.2
|
2019-05-23 15:25:53 +08:00 |
|
qiaozhanwei
|
362fb0e752
|
master startup lock dev
|
2019-05-23 15:24:23 +08:00 |
|
乔占卫
|
e689fb7bb3
|
Merge pull request #340 from qiaozhanwei/branch-1.0.2
escheduler-common protobuffer remove and api,dao,server exclusion pro…
|
2019-05-23 14:35:41 +08:00 |
|
qiaozhanwei
|
d2498ad02d
|
Merge branch 'branch-1.0.2' of https://github.com/qiaozhanwei/EasyScheduler-1 into branch-1.0.2
|
2019-05-23 14:34:41 +08:00 |
|
qiaozhanwei
|
2e0cf4d071
|
escheduler-common protobuffer remove and api,dao,server exclusion protobuffer
|
2019-05-23 14:23:22 +08:00 |
|
bao liang
|
7b96f330be
|
Merge pull request #339 from lenboo/branch-1.0.2
remove checking definition state when stop/pause.
|
2019-05-23 13:54:23 +08:00 |
|
baoliang
|
e7a479cbca
|
remove checking definition state when stop/pause.
|
2019-05-23 13:51:54 +08:00 |
|
bao liang
|
21eb6f70a3
|
Merge pull request #338 from lenboo/branch-1.0.2
add tolerance tasks when start failure task
|
2019-05-23 13:45:41 +08:00 |
|
millionfor
|
298fc6f1d7
|
Merge pull request #337 from millionfor/branch-1.0.2
edit home test
|
2019-05-23 13:43:34 +08:00 |
|
gongzijian
|
18307e1152
|
edit home test
|
2019-05-23 13:42:42 +08:00 |
|