Commit Graph
981 Commits
Author SHA1 Message Date
李玉春 5e719e9a48 Merge branch 'sprint/wangzemei/28234' into 'master'
* fix bug 28234 & 28215

See merge request easycorp/zentaopms!5635
2022-09-30 01:29:10 +00:00
tianshujie ecdfcffa58 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_tianshujie_70505 2022-09-30 09:18:19 +08:00
wangzemei 5c579dc137 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/wangzemei/28234 2022-09-30 09:09:10 +08:00
wangzemei 7c6d631ee8 * fix bug 28215 2022-09-30 09:08:42 +08:00
李玉春 7d24a5ce0d Merge branch 'sprint/244_tianshujie_fixbug' into 'master'
Sprint/244 tianshujie fixbug

See merge request easycorp/zentaopms!5633
2022-09-30 00:58:12 +00:00
tianshujie 750e7c41d0 * Fix bug #28161. 2022-09-30 08:48:51 +08:00
xieqiyu 45791d127b * Fix bug#27125. 2022-09-29 08:22:59 +00:00
tianshujie 01c194668b * Finish task #70505. 2022-09-29 15:59:43 +08:00
wangzemei ac72fe5540 * extract common variable for kanban colWidth 2022-09-29 13:24:23 +08:00
wangzemei e38d934cbd * extract common variable for kanban colWidth 2022-09-29 12:20:54 +08:00
wangzemei 45ec08b5e1 * add placeholder 2022-09-29 10:26:20 +08:00
wangzemei 7b222116eb * kanban setting: add isset 2022-09-29 09:58:36 +08:00
wangzemei 363c906500 * add kanban setting input limit 2022-09-28 15:05:40 +08:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00
wangzemei b25fa909ce * finish front show about task#71075 2022-09-27 11:28:50 +08:00
wangzemei 92a61c069f * fix style 2022-09-23 16:07:17 +08:00
王怡栋 c77ee31e31 Merge branch 'sprint/hufangzhou_feedback_863' into 'master'
* Handle feedback #863.

See merge request easycorp/zentaopms!5438
2022-09-23 01:23:43 +00:00
hufangzhou 0fdb6ddcf8 * Format the code. 2022-09-23 09:21:30 +08:00
hufangzhou 2b85f8cd1a * Use the php to operate cookie for safe. 2022-09-22 09:41:53 +08:00
tianshujie 23f5c939ae * Finish task #68934. 2022-09-21 10:10:14 +08:00
hufangzhou 0dad4d834f * Handle feedback #863. 2022-09-21 09:46:38 +08:00
liuhong b3812880ae *Fix bug #27183. 2022-09-13 05:22:04 +00:00
xieqiyu 4d439f7337 * Fix bug#26180. 2022-09-09 14:33:29 +08:00
xieqiyu bb38728a54 * Add delay label. 2022-09-06 16:01:45 +08:00
xieqiyu 36dc478de5 * Finish task#67693. 2022-09-06 10:21:24 +08:00
liumengyi aaa08018f5 * Fix bug #23401. 2022-09-06 08:30:09 +08:00
liumengyi 4274a50e94 * Fix bug #27034. 2022-09-02 16:25:51 +08:00
mayue b9efaee057 * Optimize code. 2022-08-31 13:39:59 +08:00
mayue 197e3d6ec4 * Fix error tips. 2022-08-31 13:16:22 +08:00
mayue b03bdfa09e * Finish task #66993. 2022-08-30 16:11:54 +08:00
liumengyi 3da9fdd18c * Fix bug #26916. 2022-08-26 09:49:54 +08:00
tianshujie 5eb41bedef * Fixed bug where Kanban prompts for newline under execution. 2022-08-19 15:53:08 +08:00
曾刚 3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
liuyongkai 4f60c73ab5 * Fix bug #26364 2022-08-12 08:52:29 +00:00
王怡栋 8901f60b25 Merge branch 'sprint/224_liumengyi_fixbug' into 'master'
* Fix bug #26246.

See merge request easycorp/zentaopms!4917
2022-08-11 02:26:49 +00:00
mayue b7310d4748 * Fix bug 25891. 2022-08-11 10:12:23 +08:00
liumengyi 845b829aaa * Fix bug #26246. 2022-08-11 10:08:06 +08:00
tianshujie 6c0c3a3cda * Fix bug #26110. 2022-08-11 09:30:06 +08:00
liuyongkai fd46c9fd62 * Fix bug of xiangmu 2022-08-10 09:15:36 +00:00
liumengyi 986ff8cb6c * Fix bug #26109. 2022-08-10 11:09:20 +08:00
李玉春 016ef434ab Merge branch 'sprint/224_tianshujie_63692' into 'master'
Sprint/224 tianshujie 63692

See merge request easycorp/zentaopms!4866
2022-08-09 08:19:33 +00:00
tianshujie 93d0a62707 * Finish task #63692. 2022-08-09 11:47:27 +08:00
liumengyi 20a208f1f6 * Finish task #63691. 2022-08-08 13:43:16 +08:00
sunguangming 1e05476b43 * Code for kanban action. 2022-08-05 17:35:29 +08:00
zhouxudong f6f6dbe5a1 * Fix bug. 2022-08-05 05:34:12 +00:00
王怡栋 3cc4c75950 Merge branch 'sprint/221_tianshujie_issue' into 'master'
Sprint/221 tianshujie issue

See merge request easycorp/zentaopms!4810
2022-08-05 02:34:09 +00:00
孙广明 7cc56886e3 Merge branch 'lyk_25876' into 'master'
* Fix bug 25876.

See merge request easycorp/zentaopms!4793
2022-08-05 02:32:36 +00:00
tianshujie f4147a73a1 * Resolve issue #708. 2022-08-05 10:24:12 +08:00
wangyidong 7796bc8499 Merge branch 'sprint/devplat_30' 2022-08-05 08:46:26 +08:00
wangyuting2 f477e3cf1c * Add execution bug approval menu. 2022-08-04 14:48:51 +08:00