Commit Graph
3361 Commits
Author SHA1 Message Date
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie dbad8ab513 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-14 08:52:02 +08:00
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
Yagami 7097550950 * Fix bug #32069. 2023-02-13 13:50:12 +08:00
hufangzhou 8d26dceb4b * Compatible with php5.3. 2023-02-09 05:54:15 +00:00
Yagami 877435e6e6 * Code for error. 2023-02-08 11:01:09 +08:00
Yagami 3673d7f4b0 * Code for task #83947. 2023-02-08 10:24:01 +08:00
Yagami 243316723f * Remove unused code. 2023-02-08 08:33:58 +08:00
Yagami 4403b96bf8 * Finish task #83947. 2023-02-07 16:05:18 +08:00
liuhong 27a5843cad * Adjuct code for feedback #1836. 2023-02-03 06:09:53 +00:00
wangyidong 81820d5145 * fix bug #31887. 2023-02-02 16:00:42 +08:00
xieqiyu 2468300051 * Fix bug#30968. 2023-02-02 10:06:33 +08:00
王怡栋 f98b046674 Merge branch 'master_bug_30814' into 'master'
* Fix bug #30814

See merge request easycorp/zentaopms!6833
2023-02-02 01:24:04 +00:00
liuhong da4d42781d * Fix bug #30814 2023-02-01 02:09:36 +00:00
zhouxin c5570bf560 * Fix bug for feedback #2015. 2023-02-01 09:18:27 +08:00
hufangzhou cf98bf89df * Make assignee null when create multi mode task for task #83206. 2023-01-31 13:17:53 +08:00
hufangzhou 73df98376a * Finish task #83205, and fix bug of task #83206. 2023-01-31 10:35:06 +08:00
zhouxin d207715804 * Resolve feedback #2015. 2023-01-31 09:02:38 +08:00
hufangzhou dfa423b29c * Fix bug for task #83206. 2023-01-30 17:14:56 +08:00
孙广明 6d0110a732 Revert "Merge branch 'lyk_ticket_287' into 'master'"
This reverts merge request !6797
2023-01-30 07:40:49 +00:00
hufangzhou a8e7b0e2a1 * Finish task #83206. 2023-01-30 15:03:22 +08:00
hufangzhou f2684559d6 * Finish task #83207. 2023-01-30 14:13:09 +08:00
liuyongkai f1030b3c5e * Resolve ticket #287. 2023-01-30 13:27:38 +08:00
hufangzhou 89537c0186 * Finish task #83208. 2023-01-30 13:16:46 +08:00
xieqiyu 62215c84b0 * Fix bug#30264. 2023-01-18 17:08:31 +08:00
daitingting 2003a9bf99 * Finish task #82067. 2023-01-08 02:31:02 +00:00
xieqiyu 21dedcfd1a * Fix bug#31504. 2023-01-05 15:43:47 +08:00
liuyongkai d0db3a7e88 * Reslve feedback #1322. 2023-01-03 10:43:24 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
田淑杰 b790198243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/272 2022-12-30 08:46:01 +08:00
孙广明 137953e0ae Merge branch 'zentaopms_277' 2022-12-30 08:45:34 +08:00
xieqiyu 63149fd719 * Finish task#81540. 2022-12-29 15:53:34 +08:00
liuhong 8c1b9bf90d * Fix bug #30940. 2022-12-26 04:15:11 +00:00
田淑杰 db2851ceae * Fix bug #28021. 2022-12-26 09:54:51 +08:00
wangyidong b8b0affbee * fix bug #30994. 2022-12-21 16:19:29 +08:00
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong d28ea77f0d * code for task #80461. 2022-12-20 09:24:07 +08:00
孙广明 47817d9153 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Fix Bug #30879

See merge request easycorp/zentaopms!6565
2022-12-15 08:10:30 +00:00
lanzongjun 9d0a087132 * Fix Bug #30879 2022-12-15 16:09:01 +08:00
孙广明 b827ae2002 Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* fix bug #30796#30765#79453#30886#30909

See merge request easycorp/zentaopms!6549
2022-12-15 07:58:29 +00:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
lanzongjun 72f9a71865 * Fix Bug #30886 2022-12-15 14:51:51 +08:00
孙广明 52ba26c18c * Fix bug #30885. 2022-12-15 14:13:32 +08:00
孙广明 ca6987d98a Merge branch 'sprint/tianshujie_fixbug' into 'master'
* Fix bug #30800.

See merge request easycorp/zentaopms!6557
2022-12-15 06:04:21 +00:00
田淑杰 6699ab0a60 * Fix bug #30800. 2022-12-15 14:02:23 +08:00
孙广明 a72aba558a * Fix bug #30875. 2022-12-15 14:00:32 +08:00
孙广明 151a08af27 * Fix bug #30795. 2022-12-15 13:38:39 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
孙广明 b654a1f43d Merge branch 'sprint/zentaopms271_lanzongjun' into 'master'
* Finish Task #79665#79466

See merge request easycorp/zentaopms!6542
2022-12-14 06:15:04 +00:00