Commit Graph

24650 Commits

Author SHA1 Message Date
qiyu-xie
7f84c6da14 * Fix bug#13079. 2021-07-06 10:17:51 +08:00
tianshujie98
90056bbe7c * Fix bug #13495. 2021-07-06 10:16:30 +08:00
tianshujie98
085811d8d4 * Fix bug #13495. 2021-07-06 09:25:38 +08:00
tianshujie98
480c6e4afc * Adjust code. 2021-07-06 08:19:15 +08:00
tianshujie98
c4191da835 * Fix bug #13485. 2021-07-06 08:11:11 +08:00
guanxiying
63ff976e8f Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 15:49:36 +08:00
guanxiying
5013c8b2c6 * Fix bug #13252. 2021-07-05 15:49:32 +08:00
holan20180123
c88110d8fc * Fix bug #13483. 2021-07-05 15:49:03 +08:00
holan20180123
baecfc2c22 * Fix bug #13272. 2021-07-05 15:45:51 +08:00
tianshujie98
53f21df6d2 * Fix bug #13250. 2021-07-05 15:29:09 +08:00
tianshujie98
51ff47c095 * Fix bug #13057. 2021-07-05 14:52:33 +08:00
guanxiying
26be168ace Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 14:47:18 +08:00
guanxiying
bc3bd8316c * Fix bug #12828. 2021-07-05 14:47:15 +08:00
tianshujie98
ecb988b495 * Fix bug #13360. 2021-07-05 14:32:31 +08:00
Hao Sun
5654030da5 * update zui: force pages to open in app tab in workflow and related modules. 2021-07-05 14:29:48 +08:00
tianshujie98
98f7e592ad * Fix bug #13443. 2021-07-05 13:39:04 +08:00
wangyidong
79c27570e8 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 13:27:12 +08:00
wangyidong
b49812bfb6 * finish task #39793. 2021-07-05 13:26:30 +08:00
Hao Sun
81e73ff548 * update zui: force pages in workflow module open in app tab. 2021-07-05 13:11:32 +08:00
wangyidong
d49a333837 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-05 11:45:27 +08:00
wangyidong
2d47b0e755 * finish task #39793. 2021-07-05 11:45:02 +08:00
Yagami
7a4dd087a1 * Finish task #38791. 2021-07-05 09:28:49 +08:00
wangyidong
790dcefa53 * remove ztCloud. 2021-07-02 16:16:22 +08:00
wangyidong
f3681dc1f6 * adjust for gitlab. 2021-07-02 15:00:07 +08:00
wangyidong
6c250a97f9 * finish task #39794. 2021-07-02 14:08:08 +08:00
wangyidong
5016d4751d * finish task #39796. 2021-07-02 11:26:13 +08:00
wangyidong
04faa67fc7 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-02 10:54:43 +08:00
wangyidong
6f4b4588ab * fix for gitlab. 2021-07-02 10:54:24 +08:00
zenggang
38f01b13ff Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-02 00:56:22 +00:00
zenggang
ec4bdc3477 * finish task#39797 2021-07-02 00:54:16 +00:00
wangyidong
c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
zenggang
c74a1f483d * fix bug 13182 2021-07-01 03:33:20 +00:00
wangyidong
f98d12dee8 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-01 08:20:21 +08:00
wangyidong
f407f70700 * adjust for book. 2021-07-01 08:19:49 +08:00
Yagami
26ec63969d * Fix code details. 2021-06-29 16:24:26 +08:00
Yagami
18acf1cef6 * Fix progress block logic. 2021-06-29 16:24:26 +08:00
wangyidong
69e62a08da * adjust for style. 2021-06-29 16:01:06 +08:00
wangyidong
cefd614900 * fix bug and adjust for createLink params. 2021-06-29 14:31:58 +08:00
wangyidong
bfb6b438dc * adjust for gitlab. 2021-06-29 13:07:56 +08:00
wangyidong
9aec0e4450 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-29 09:11:11 +08:00
wangyidong
5fb6d97efd * adjust error. 2021-06-29 09:10:57 +08:00
holan20180123
203f0984d9 * Adjust execution link plan. 2021-06-29 08:57:48 +08:00
holan20180123
6f7b82a051 * Fix bug #12406. 2021-06-28 16:37:02 +08:00
Yagami
c36f697aef * Fix bug. 2021-06-28 12:02:57 +08:00
wangyidong
18d9724e14 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-25 09:37:41 +08:00
wangyidong
d8d49be51f * adjust for check compile status. 2021-06-25 09:36:52 +08:00
tianshujie98
e3087ad9fb Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-06-24 15:03:50 +08:00
tianshujie98
e6b9ec682f * Fix bug. 2021-06-24 15:03:35 +08:00
wangyidong
b77d480ce0 * fix bug. 2021-06-24 15:00:01 +08:00
wangyidong
aedf5935d1 + add version and upgrade. zentaopms_15.0.3_20210624 2021-06-24 13:17:04 +08:00