Commit Graph
1196 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
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
xieqiyu 21dedcfd1a * Fix bug#31504. 2023-01-05 15:43:47 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +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
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
孙广明 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
田淑杰 6699ab0a60 * Fix bug #30800. 2022-12-15 14:02:23 +08:00
孙广明 cfd9e136bc * Fix bug #30878. 2022-12-15 10:42:59 +08:00
lanzongjun afd4d269a2 * Finish Task #79665 2022-12-14 09:33:20 +08:00
孙广明 55c79e0399 * Code for task #79664. 2022-12-13 15:20:09 +08:00
孙广明 81d54c790e * Finish task #79664. 2022-12-13 13:43:24 +08:00
lanzongjun c3d53daa5a * Finish Task #79665 2022-12-12 16:36:32 +08:00
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
xieqiyu 864ed7a391 * Fix bug#29445. 2022-11-15 09:04:14 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
mayue c92e9f119a * Finish task #75649. 2022-11-11 17:02:17 +08:00
wangyuting 152364d338 * Finish task #29562. 2022-11-11 02:12:03 +00:00
liuhong f12632a8fb * Fix bug #29451 2022-11-09 02:15:23 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
caoyanyi 90331724dc Merge branch 'master' into zenops_46 2022-11-07 14:00:34 +08:00
tianshujie 32c5c0550b * Adjust the page of the multiplayer task. 2022-11-07 13:30:17 +08:00
tianshujie 8e67ec5de9 * Optimize the form for recording work hours for multi-person tasks. 2022-11-07 11:04:45 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
李玉春 f36d8a321d Merge branch 'tianshujie_fixbug' into 'master'
Tianshujie fixbug

See merge request easycorp/zentaopms!6027
2022-11-04 00:35:50 +00:00
Yagami 16fdf991db * Fix bug #29253. 2022-11-03 16:47:52 +08:00
tianshujie 808c99f318 * Fix bug #29230. 2022-11-03 15:43:39 +08:00
liuhong 8f967da638 * Fix create task display of execution default no choose. 2022-11-03 02:12:06 +00:00
liuhong ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00
caoyanyi 13f53cc5bc * Fix bug #28998. 2022-11-01 14:28:03 +08:00
tianshujie 5fdc7eff1a Modify the maintenance task team action button style. 2022-10-28 16:05:22 +08:00
caoyanyi 7716ba592e * Adjust code. 2022-10-28 10:39:24 +08:00
caoyanyi 284cade04a * Fix bug #28170. 2022-10-28 10:10:41 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
tianshujie 354e8c129b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/247 2022-10-26 08:42:00 +08:00
liyuchun 11a4983080 Merge branch 'master' into zenops_46 2022-10-25 11:28:43 +08:00
liyuchun 00547dc0f5 Merge branch 'master' into zenops_46 2022-10-24 09:18:10 +08:00
caoyanyi 380777ecf8 * Fix bug #28788. 2022-10-21 13:19:54 +08:00