Commit Graph
25144 Commits
Author SHA1 Message Date
tianshujie98 3369449307 * Fix bug #13519. 2021-07-07 10:39:00 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong 396954c678 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-06 17:41:22 +08:00
wangyidong 353529bb6c * adjust for ci-commitResult. 2021-07-06 17:37:03 +08:00
qiyu-xie ed019b72f5 * Fix bug#13287. 2021-07-06 16:21:09 +08:00
qiyu-xie 81c1c0927f * Fix bug#13474. 2021-07-06 14:34:32 +08:00
tianshujie98 3e5e6cf6e2 * Fix bug #13508. 2021-07-06 14:23:27 +08:00
qiyu-xie d9fb8d7af0 * Fix bug#13473. 2021-07-06 14:14:37 +08:00
wangyidong 001e93c1f9 Merge branch '15.0' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0 2021-07-06 13:50:50 +08:00
wangyidong 3f0aeaf173 * finish task #39793. 2021-07-06 13:34:44 +08:00
qiyu-xie 4347cc014e * Fix bug#13385. 2021-07-06 13:16:39 +08:00
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
holan20180123 1d11be7552 * Fix bug #13483. 2021-07-05 15:41:13 +08:00
tianshujie98 53f21df6d2 * Fix bug #13250. 2021-07-05 15:29:09 +08:00
holan20180123 ff332737ff * Fix bug #13272. 2021-07-05 15:07:36 +08:00
holan20180123 3d6bed2475 * Fix bug #13272. 2021-07-05 14:56:47 +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
holan20180123 d6368e99a6 * Fix bug #13271. 2021-07-05 14:46:03 +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
holan20180123 3909169288 * Adjust code style of import to lib. 2021-07-05 10:35:13 +08:00
Yagami 7a4dd087a1 * Finish task #38791. 2021-07-05 09:28:49 +08:00
qiyu-xie 3b84be4f99 * Adjust action when import from library. 2021-07-02 16:41:37 +08:00
wangyidong 790dcefa53 * remove ztCloud. 2021-07-02 16:16:22 +08:00
holan20180123 9679c84a90 * Fix import to story lib error. 2021-07-02 15:25:10 +08:00
wangyidong f3681dc1f6 * adjust for gitlab. 2021-07-02 15:00:07 +08:00
qiyu-xie 37241468cc * Fix bug#13425. 2021-07-02 14:47:45 +08:00
guanxiying de2662ade7 * Fix an error. 2021-07-02 14:40:30 +08:00
guanxiying 05d63b5bd2 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-02 14:33:57 +08:00
guanxiying ac0ecdb07f * Fix an error. 2021-07-02 14:33:53 +08:00
qiyu-xie e7bec99dc7 * Fix a bug when import story from library. 2021-07-02 14:31:15 +08:00
wangyidong 6c250a97f9 * finish task #39794. 2021-07-02 14:08:08 +08:00
tianshujie98 07c4cf8887 * Adjust code. 2021-07-02 13:52:33 +08:00
guanxiying b72c17b291 * Remove the branch in storylib search. 2021-07-02 13:05:16 +08:00