Commit Graph

5584 Commits

Author SHA1 Message Date
baoliang
d654c29c4d update install document 2019-04-11 14:48:29 +08:00
baoliang
36eca53c12 update install document 2019-04-11 14:46:45 +08:00
baoliang
170a625ded update install document 2019-04-11 14:42:38 +08:00
baoliang
0dc1f45a16 delete tar
update install document
2019-04-11 13:39:21 +08:00
baoliang
7e65dda7db fix bug, update action would change the user of definition. 2019-04-11 11:55:12 +08:00
baoliang
cbcffb33df fix bug, update action would change the user of definition. 2019-04-11 11:23:43 +08:00
baoliang
8641c8b10b fix bug, update action would change the user of definition. 2019-04-11 11:22:04 +08:00
baoliang
f4640e87b9 update install document 2019-04-11 11:20:21 +08:00
baoliang
c075d26aff fix bug, update action would change the user of definition. 2019-04-11 11:17:40 +08:00
millionfor
6fcfb7b20e
Merge pull request #33 from millionfor/dev
Dev
2019-04-10 17:19:39 +08:00
gongzijian
f76ea2c028 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-10 17:17:22 +08:00
gongzijian
192b476b74 update doc/icon/dist 2019-04-10 17:17:02 +08:00
baoliang
cba13a1fee fix bug, update action would change the user of definition. 2019-04-10 16:21:58 +08:00
qiaozhanwei
135b7de886 Merge remote-tracking branch 'upstream/dev' into dev
20190410
2019-04-10 10:09:30 +08:00
bao liang
e7a57b69ac
Add an experience address
Add an experience address
2019-04-09 18:56:09 +08:00
bao liang
9c79a0f9f6
Merge pull request #30 from lenboo/dev
Dev add address for having a taste
2019-04-09 17:54:17 +08:00
baoliang
42e2a1bfa5 fix bug, update action would change the user of definition. 2019-04-09 17:52:16 +08:00
baoliang
3eb08d9ad6 fix bug, update action would change the user of definition. 2019-04-09 17:48:14 +08:00
baoliang
ebbe6a468e add address for having a taste 2019-04-09 17:46:42 +08:00
qiaozhanwei
a0665a4954 Merge remote-tracking branch 'upstream/dev' into dev
20190409
2019-04-09 16:59:14 +08:00
millionfor
a84a16f861
Merge pull request #27 from millionfor/dev
Dev
2019-04-09 09:35:58 +08:00
gongzijian
1a42d0be43 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-09 09:33:05 +08:00
gongzijian
f9b1ef0bf5 http://jr.analysys.cn/browse/AR-100 2019-04-09 09:32:54 +08:00
gongzijian
e8bb86e26c edit ico 2019-04-09 09:14:20 +08:00
millionfor
32e414ac7c
Merge pull request #25 from millionfor/dev
Dev
2019-04-08 16:57:43 +08:00
gongzijian
03ee2fcc73 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-08 16:54:07 +08:00
gongzijian
e0ede9ef6e edit install file name 2019-04-08 16:53:35 +08:00
millionfor
7e54873256
Merge pull request #24 from millionfor/dev
update .gitignore
2019-04-08 16:44:10 +08:00
gongzijian
a6f9044b22 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-08 16:09:31 +08:00
gongzijian
fb19ddce07 update .gitignore 2019-04-08 15:48:10 +08:00
easyscheduler
011eca5d79
Merge pull request #19 from lenboo/dev
fix bug spelling error in process dao
2019-04-08 14:33:46 +08:00
baoliang
94ea607f06 fix bug, update action would change the user of definition. 2019-04-08 14:32:31 +08:00
dailidong
6acb51d772 Merge remote-tracking branch 'upstream/dev' into dev 2019-04-08 14:18:08 +08:00
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