Commit Graph

1007 Commits

Author SHA1 Message Date
qiaozhanwei
c9c91a45e3 remove double quotes 2019-07-02 20:02:34 +08:00
qiaozhanwei
96de536181 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 19:59:42 +08:00
qiaozhanwei
46bf965f81 update 2019-07-02 18:26:14 +08:00
lgcareer
8464c3e074
Merge pull request #506 from lgcareer/dev-1.1.0
update the ability for administrators to view all data sources by type
2019-07-02 16:34:02 +08:00
lgcareer
49d0690a7d Added the ability for administrators to view all data sources by type 2019-07-02 16:29:02 +08:00
lgcareer
e34a38d347
Merge pull request #505 from lgcareer/dev-1.1.0
Added the ability for administrators to view all data sources
2019-07-02 16:22:06 +08:00
qiaozhanwei
30dbbad637 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 16:18:54 +08:00
bao liang
660b325f6d
Merge pull request #504 from lenboo/dev-1.1.0
update tenant id
2019-07-02 16:18:09 +08:00
lenboo
b8a9ef55de update tenant in ui 2019-07-02 16:13:02 +08:00
lenboo
f21dd49ded update tenant id 2019-07-02 16:01:53 +08:00
lgcareer
9429e24a12 Added the ability for administrators to view all data sources 2019-07-02 15:57:03 +08:00
qiaozhanwei
a4ca7501fc Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 15:50:48 +08:00
hymzcn
e1207b0d7b
Merge pull request #503 from hymzcn/dev-1.1.0
the start time must not be the same as the end
2019-07-02 15:32:20 +08:00
huyuanming
889721b567 Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 15:30:17 +08:00
huyuanming
c90a2af902 the start time must not be the same as the end 2019-07-02 15:29:53 +08:00
qiaozhanwei
6f90ccda00 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 15:18:11 +08:00
bao liang
d5aff2be3b
Merge pull request #502 from lenboo/dev-1.1.0
update tenant in ui
2019-07-02 15:09:56 +08:00
lenboo
f55fd51ff2 update tenant in ui 2019-07-02 15:07:48 +08:00
lenboo
7d2b9e5925 remove the auth for query list. 2019-07-02 14:58:34 +08:00
qiaozhanwei
cceb70d737 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 14:47:22 +08:00
huyuanming
88d82b27dc Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 14:45:14 +08:00
lgcareer
3786e74539
Merge pull request #501 from lgcareer/dev-1.1.0
add preview escheduler function
2019-07-02 14:15:47 +08:00
lgcareer
6d26e7ac0d update from upstream/dev-1.1.0 2019-07-02 14:10:03 +08:00
lgcareer
5d1e8eb871 update install.sh from upstream/dev-1.1.0 2019-07-02 14:07:29 +08:00
qiaozhanwei
f940c86997 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 13:57:23 +08:00
lgcareer
68e822e4dd modify previewTimes 2019-07-02 12:07:44 +08:00
lgcareer
f912ee5cda Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 12:06:28 +08:00
lgcareer
94cff3b7ff Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 12:01:29 +08:00
huyuanming
367cde0639 Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 11:50:25 +08:00
bao liang
a4fec4e890
Merge pull request #500 from lenboo/dev-1.1.0
add tenant id..
2019-07-02 11:49:04 +08:00
lenboo
671c296da6 add tenant id.. 2019-07-02 11:48:17 +08:00
huyuanming
a6dbc1a1b5 Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 11:45:45 +08:00
qiaozhanwei
b9413f8a10 Merge remote-tracking branch 'remotes/upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 11:38:47 +08:00
bao liang
d060821060
Merge pull request #499 from lenboo/dev-1.1.0
add tenant id filed in mysql
2019-07-02 11:16:26 +08:00
qiaozhanwei
9c9c940f48 sql task add kerbos auth 2019-07-02 11:10:44 +08:00
lenboo
50e36b5ece remove the auth for query list. 2019-07-02 10:59:35 +08:00
lenboo
2deb222234 add tenant_id field in mysql 2019-07-02 10:57:33 +08:00
bao liang
c873bb6551
Merge pull request #498 from lenboo/dev-1.1.0
pull request from bl dev-1.1.0
2019-07-02 10:26:16 +08:00
hymzcn
af81080892
Merge pull request #497 from hymzcn/dev-1.1.0
enter key event of search input, the width of the mr project type input
2019-07-02 09:58:26 +08:00
huyuanming
18f8064060 Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0 2019-07-02 09:55:15 +08:00
huyuanming
d07916e1b6 enter key event of search input, the width of the mr project type input 2019-07-02 09:54:48 +08:00
lenboo
867048892a remove the auth for query list. 2019-07-01 19:00:07 +08:00
hymzcn
6e00435ffa
Merge pull request #496 from hymzcn/dev-1.1.0
the email input
2019-07-01 18:10:39 +08:00
huyuanming
8feb245e72 the email input 2019-07-01 18:08:08 +08:00
lenboo
430dc81c0f Merge remote-tracking branch 'upstream/dev-1.1.0' into dev-1.1.0
# Conflicts:
#	escheduler-ui/src/js/module/i18n/locale/en_US.js
#	escheduler-ui/src/js/module/i18n/locale/zh_CN.js
2019-07-01 17:29:08 +08:00
lenboo
85caad3c72 Merge remote-tracking branch 'upstream/branch-1.0.2' into dev110_up 2019-07-01 15:02:18 +08:00
lenboo
ec7406ddab add tenant id in process definition 2019-07-01 10:14:04 +08:00
lenboo
a67bc60872 add tenant id in process definition 2019-06-30 10:40:03 +08:00
lenboo
ddb34cb6c8 add tenant id in process definition 2019-06-28 19:03:58 +08:00
lenboo
1b2153a338 add tenant id in process definition 2019-06-28 18:44:16 +08:00