Commit Graph
51075 Commits
Author SHA1 Message Date
liumengyi 7170af3b44 * Finish task #84586. 2023-02-17 00:52:32 +00:00
Yagami f6dfccc9cd Merge branch 'zentaopms_284' 2023-02-16 17:22:15 +08:00
Yagami af25c582d7 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 17:07:00 +08:00
Yagami b737d1df40 * Remove unused code. 2023-02-16 17:06:35 +08:00
tianshujie 052d72e4a5 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 16:18:14 +08:00
tianshujie 5e2ac749af * Fix bug #32233. 2023-02-16 16:17:48 +08:00
Yagami 58fb367739 * Adjust dtable scroll bar and pager z-index. 2023-02-16 16:11:53 +08:00
Yagami 06696bcd0e * Add setCookie for execution export. 2023-02-16 16:05:28 +08:00
Yagami 7616c02f17 * Redirect old project to new project. 2023-02-16 15:35:30 +08:00
zhujinyong 08a6439103 * Expand tree of extensions. 2023-02-16 15:09:35 +08:00
liumengyi 93a890663c * Fix bug of task #84584. 2023-02-16 07:01:13 +00:00
tianshujie 355cf1c597 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 14:58:53 +08:00
tianshujie a2435c006a * Code for finish task #84575. 2023-02-16 14:58:36 +08:00
Yagami ae5dcc21ab * Finish task #84589. 2023-02-16 14:55:45 +08:00
王怡栋 761a7ee0a2 Merge branch 'zentaopms_max4.2_wangyuting' into 'master'
* Fix bug #27133.

See merge request easycorp/zentaopms!6971
2023-02-16 06:44:20 +00:00
王怡栋 0e107103c9 Update helper.class.php 2023-02-16 06:44:03 +00:00
tianshujie 951de75b0a Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 14:42:42 +08:00
tianshujie ad1d1631a3 * Code for finish task #84593. 2023-02-16 14:42:27 +08:00
liumengyi 7501362a58 * Finish task #84591. 2023-02-16 06:34:10 +00:00
王怡栋 b14b1806be Merge branch 'zentaopms_biz8.2_wangyuting' into 'master'
* Fix bug #26855.

See merge request easycorp/zentaopms!6972
2023-02-16 06:26:54 +00:00
王怡栋 4f64ce13d7 Merge branch 'master_xieqiyu_26434' into 'master'
* Code for bug#26434.

See merge request easycorp/zentaopms!6973
2023-02-16 06:25:22 +00:00
王怡栋 96f6bff0bd Merge branch 'master_xieqiyu_28673' into 'master'
* Code for bug#28673.

See merge request easycorp/zentaopms!6974
2023-02-16 06:24:56 +00:00
王怡栋 64acd2dced Merge branch 'master_xieqiyu_25082' into 'master'
* Code for bug#25082.

See merge request easycorp/zentaopms!6976
2023-02-16 06:24:38 +00:00
xieqiyu 7ceb69b370 * Code for bug#25082. 2023-02-16 13:57:39 +08:00
Yagami 38a68912ff Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 13:56:28 +08:00
Yagami 15ff524a7d * Finish task #84590. 2023-02-16 13:56:15 +08:00
liumengyi cd7cdbb6a8 * Fix bug of task #84592. 2023-02-16 05:35:10 +00:00
liumengyi 9be6fa2fd2 * Finish task #84584. 2023-02-16 05:28:39 +00:00
王怡栋 3b777eeb4e Merge branch 'sprint/feedback2203' into 'master'
* Fix feedback feedback2204.

See merge request easycorp/zentaopms!6970
2023-02-16 05:08:28 +00:00
chaideqing b3eeb70b26 * Fix feedback feedback2204. 2023-02-16 11:59:17 +08:00
wangyuting2 3196ef5d19 * Fix bug #26855. 2023-02-16 10:26:53 +08:00
tianshujie 020b742dc7 * Code for finish task #84593. 2023-02-16 10:24:53 +08:00
tianshujie fcc4837af0 * Code for finish task #84578. 2023-02-16 10:01:44 +08:00
tianshujie be00a4a8ae * Code for finish task #84580. 2023-02-16 09:29:05 +08:00
xieqiyu 86308137c7 * Code for bug#28673. 2023-02-16 08:59:37 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
Yagami 8de77be199 * Adjust dtable style. 2023-02-16 08:40:26 +08:00
胡方舟 d2de5abe26 Merge branch 'zenops_61' into 'master'
* Fix delete node fail.

See merge request easycorp/zentaopms!6967
zentaopms_18.1
2023-02-16 00:20:13 +00:00
zhaoke eee007f88f * Fix delete node fail. 2023-02-15 17:43:14 +08:00
王怡栋 3a6bca8dc2 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.

See merge request easycorp/zentaopms!6966
2023-02-15 09:22:38 +00:00
朱金勇 004ab38be6 Merge branch 'sprint/hufangzhou_changeCompanyName' into 'master'
* Change the Easy Soft to ZenTao Software.

See merge request easycorp/zentaopms!6965
2023-02-15 09:20:48 +00:00
wangyuting2 a86eb599d9 * Fix project extend priv bug. 2023-02-15 17:20:35 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liumengyi b9ae54ede7 * Fix bug of task #84592. 2023-02-15 08:58:18 +00:00
zhujinyong fd6df950a8 * Only show leaf executions for switcher. 2023-02-15 16:35:39 +08:00
tianshujie c3d7d4cda3 Merge branch 'zentaopms_284' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 16:31:53 +08:00
tianshujie 4f65445e8e * Code for finish task #84576. 2023-02-15 16:31:18 +08:00
liumengyi e2a8d207cb * Fix bug of task #84599. 2023-02-15 08:26:32 +00:00
xieqiyu dbe3aa32f8 * Code for bug#26434. 2023-02-15 16:20:12 +08:00
liumengyi af5fbbab18 * Fix bug of task #84584. 2023-02-15 08:17:12 +00:00