Commit Graph
3300 Commits
Author SHA1 Message Date
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
王怡栋 00312f6d4f Merge branch 'sprint/feedback1358' into 'master'
Sprint/feedback1358

See merge request easycorp/zentaopms!6431
2022-12-01 07:56:07 +00:00
王怡栋 7013e19604 Merge branch 'sprint/feedback1403' into 'master'
Sprint/feedback1403

See merge request easycorp/zentaopms!6428
2022-12-01 07:54:50 +00:00
chaideqing 3c3ce67354 * Refactor code. 2022-12-01 13:35:05 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
wangyidong b2f9f3460b * fix bug #29637. 2022-11-30 16:19:15 +08:00
chaideqing 9fcb9099a7 * Fix feedback #1358. 2022-11-30 11:13:12 +08:00
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
lanzongjun edbf6b4307 * Fix Bug #30245 2022-11-25 10:37:19 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zenggang 748323efe0 * Fix bug#27991 and adjust code 2022-11-23 02:55:03 +00:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
Yagami 9e0c890def * Fix task list bug. 2022-11-22 15:05:04 +08:00
Yagami cac547b21a * Finish task #76948. 2022-11-21 15:11:44 +08:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
王怡栋 5ae28179c6 Merge branch 'zentaopms_258_bug#29720' into 'master'
* Fix bug #29720.

See merge request easycorp/zentaopms!6167
2022-11-16 01:55:36 +00:00
wangyuting 6a204a32c0 * Fix bug #29720. 2022-11-15 09:35:10 +00:00
xieqiyu 864ed7a391 * Fix bug#29445. 2022-11-15 09:04:14 +08:00
mayue e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
mayue 03ff3c3b36 * Optimize page style. 2022-11-14 10:55:28 +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
王怡栋 3beb994fe8 Merge branch 'master_bug_29451' into 'master'
* Fix bug #29451

See merge request easycorp/zentaopms!6095
2022-11-10 06:24:33 +00:00
zenggang fd5682fbdc * Fix bug #29460 2022-11-09 07:48:08 +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 8ee88df5de Merge branch 'zentaopms_252' 2022-11-08 09:23:23 +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 280a37559e * Fix bug #29293. 2022-11-07 10:03:47 +08:00
tianshujie 91f6d1b9f0 * Fix bug #29293. 2022-11-07 09:54:41 +08:00
tianshujie 5ea7567745 * Fix bug #27975. 2022-11-07 09:39:52 +08:00
tianshujie 2176378af6 * Fix bug #29339. 2022-11-07 09:11:40 +08:00
liumengyi 0159cabcff * Fix bug #29272. 2022-11-07 09:05:56 +08:00
tianshujie 26efc38fbb * Fix bug #29293. 2022-11-04 15:54:29 +08:00
liuhong 1b7c9a9897 * Fix bug #29290. 2022-11-04 07:32:00 +00:00
mayue 2be0a1f96c * Optimize code. 2022-11-04 09:57:30 +08:00
mayue 4e87bd0ffa * Fix bug #29238 and finsih feedback#1339. 2022-11-04 09:49:33 +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
王怡栋 5827759d8b Merge branch 'master_feedback_1302' into 'master'
* Fix create task display of execution default no choose.

See merge request easycorp/zentaopms!6009
2022-11-03 05:30:05 +00:00
liuhong 8f967da638 * Fix create task display of execution default no choose. 2022-11-03 02:12:06 +00:00
tianshujie dd98b3e2de * Fix bug #28783. 2022-11-03 09:58:45 +08:00
tianshujie ff4593f9d2 * Fix bug #28783. 2022-11-03 09:49:47 +08:00
liuhong ad6ee6377b * Resolved feedback #1302. 2022-11-02 05:51:09 +00:00