Commit Graph

7601 Commits

Author SHA1 Message Date
baoliang
c146620435 revert from upstream dev 2019-04-08 11:34:39 +08:00
baoliang
447189622c fix bug spelling error in process dao 2019-04-08 11:26:58 +08:00
baoliang
2265e7e9e1 Merge remote-tracking branch 'origin/dev' into dev 2019-04-04 18:36:19 +08:00
baoliang
2faf09d462 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-04 18:35:25 +08:00
baoliang
9faa12f80a Merge remote-tracking branch 'upstream/dev' into dev 2019-04-04 18:35:05 +08:00
乔占卫
f17dff70a9
Merge pull request #17 from qiaozhanwei/dev
1,Outlook TLS support
2,Worker performs the creation of a tenant if the tenant does not exist
3,Protobuf conflict resolution
4,Servlet conflict resolution
2019-04-04 14:06:35 +08:00
qiaozhanwei
a3952ea6cc update servlet jar conflict 2019-04-04 13:56:49 +08:00
qiaozhanwei
813c0c65f3 1,outllok email TLS support
2,api-server and master-server start jar conflict
3,gRPC jar conflict
4,tenant create if not exists
2019-04-04 11:38:34 +08:00
baoliang
246fb2219f Merge remote-tracking branch 'upstream/dev' into dev 2019-04-04 10:41:49 +08:00
乔占卫
c08496d8b1
Merge pull request #13 from qiaozhanwei/dev
update backend deployment doc
2019-04-03 12:36:54 +08:00
qiaozhanwei
23a4765a5e update backend deployment doc 2019-04-03 11:55:44 +08:00
qiaozhanwei
fce277d1e6 update comment 2019-04-03 11:29:45 +08:00
baoliang
7b98618068 change image of shell in readme 2019-04-03 11:23:12 +08:00
easyscheduler
1909fa2da9
Merge pull request #7 from analysys/dev
Dev
2019-04-01 19:35:41 +08:00
easyscheduler
576fa3ab72
Merge pull request #6 from analysys/branch-1.0.0
merge from branch 1.0 to dev
2019-04-01 19:34:30 +08:00
easyscheduler
59e9c542f1
Merge pull request #5 from analysys/dev
merge from dev
2019-04-01 19:29:21 +08:00
bao liang
f92b444b81
Merge pull request #3 from lenboo/dev
Dev
2019-04-01 18:01:20 +08:00
baoliang
454283cc15 change image of shell in readme 2019-04-01 17:39:44 +08:00
baoliang
d319db12b1 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-01 17:37:43 +08:00
escheduler
ed7264c0f6
Merge pull request #2 from lidongdai/dev
Dev
2019-04-01 16:50:12 +08:00
dailidong
d8a2f4990d update README 2019-04-01 16:44:26 +08:00
dailidong
704f5d99c3 update README 2019-04-01 16:39:21 +08:00
dailidong
58be2e2fda Merge branch 'dev' of https://github.com/lidongdai/EasyScheduler into dev
update
2019-04-01 16:33:45 +08:00
ligang
7f01ac626d merge 2019-04-01 16:29:38 +08:00
ligang
4645614a49 [maven-release-plugin] prepare for next development iteration 2019-03-30 11:12:58 +08:00
ligang
76371ee46b [maven-release-plugin] prepare release 1.0.0 2019-03-30 11:12:38 +08:00
ligang
8973a6157f [maven-release-plugin] prepare for next development iteration 2019-03-30 11:07:50 +08:00
ligang
f9379e41d8 [maven-release-plugin] prepare branch branch-1.0.0 2019-03-30 11:07:24 +08:00
dailidong
321d14500d update install.sh 2019-03-30 09:42:12 +08:00
乔占卫
e08086400e
Update install.sh
update install.sh remove ' '
2019-03-30 09:12:37 +08:00
escheduler
d9d070974c
Create .gitattributes 2019-03-29 23:51:32 +08:00
dailidong
0e349fefac Merge remote-tracking branch 'origin/master' 2019-03-29 23:22:29 +08:00
dailidong
a60f42b96b update install.sh 2019-03-29 23:20:22 +08:00
escheduler
d434bf6684
Update README.md 2019-03-29 19:26:23 +08:00
dailidong
ffdab1baf8 修改sh 2019-03-29 18:30:03 +08:00
ligang
940f2d802a remove unusable readme.txt 2019-03-29 17:09:18 +08:00
ligang
e36c4b95c3 update version value 2019-03-29 16:47:10 +08:00
dailidong
cdeaeb5c80 update docs 2019-03-29 16:42:44 +08:00
dailidong
d9923ca3d1 update docs 2019-03-29 16:38:35 +08:00
qiaozhanwei
2fc7efb3fe Merge remote-tracking branch 'origin/master' 2019-03-29 16:05:07 +08:00
qiaozhanwei
3c615d0b0c update tar project name 2019-03-29 16:04:41 +08:00
baoliang
41bfaa0c9a delete unused docs 2019-03-29 15:52:12 +08:00
ligang
0a514ceb33 Initial install config,script and sql commit 2019-03-29 14:37:07 +08:00
ligang
756a3316d6 Initial module escheduler-rpc commit 2019-03-29 14:29:40 +08:00
ligang
c7d13d2557 Initial module escheduler-ui commit 2019-03-29 14:12:18 +08:00
ligang
5c45f92f46 Initial module escheduler-server commit 2019-03-29 13:49:42 +08:00
ligang
b825b9c513 Initial module escheduler-dao commit 2019-03-29 13:37:35 +08:00
ligang
e6f14cf33d Initial module escheduler-common commit 2019-03-29 13:25:29 +08:00
ligang
ae32da3262 Initial module escheduler-api commit 2019-03-29 13:17:21 +08:00
ligang
a2dccd16f7 Initial escheduler-alert commit 2019-03-29 13:08:18 +08:00