Commit Graph
2549 Commits
Author SHA1 Message Date
李玉春 a5cd8d997e Merge branch 'sprint/wangzemei/28231' into 'master'
* Fix bug 28231

See merge request easycorp/zentaopms!5632
2022-09-30 01:29:39 +00:00
李玉春 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
王怡栋 846ee00dd2 Merge branch 'master_xieqiyu_27048' into 'master'
* Fix bug#27048.

See merge request easycorp/zentaopms!5626
2022-09-30 00:29:21 +00:00
wangzemei 69debf9c11 * Fix bug 28231 2022-09-29 17:52:23 +08:00
tianshujie badfc68859 * Fix bug #28165. 2022-09-29 17:42:36 +08:00
wangzemei 4270f963ae * Fix bug #28234 2022-09-29 17:42:34 +08:00
xieqiyu 100c4359dd * Fix bug#27048. 2022-09-29 08:34:34 +00: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
曹延义 d972797ed2 * Modify kanban set validate. 2022-09-29 11:23:20 +08:00
wangzemei 769d447a78 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 10:52:29 +08:00
曹延义 885121c725 * Modify classic model style. 2022-09-29 10:27:45 +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
曹延义 2160b5efff Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244_wangzemei_71075 2022-09-29 09:18:42 +08:00
wangzemei 363c906500 * add kanban setting input limit 2022-09-28 15:05:40 +08:00
tianshujie 4778db197d * Finish task #70017. 2022-09-28 13:39:06 +08:00
tianshujie 7b2980726e Merge branch 'sprint/244' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/244 2022-09-28 11:59:37 +08:00
李玉春 d401ef9626 Merge branch 'sprint/241_tianshujie_70015' into 'sprint/244'
Sprint/241 tianshujie 70015

See merge request easycorp/zentaopms!5577
2022-09-28 03:25:16 +00:00
wangzemei bcd3d36418 * modify backend logic 2022-09-27 17:10:18 +08:00
liuyongkai 7567b5b499 * Fix bug #28056. 2022-09-27 08:16:01 +00:00
wangzemei b25fa909ce * finish front show about task#71075 2022-09-27 11:28:50 +08:00
tianshujie 074120b27c * Fix bug #27976. 2022-09-27 09:04:39 +08:00
liuhong 55700db5f3 *Fix bug #27970. 2022-09-26 13:39:56 +00:00
tianshujie 92eb14d26e * Finish task #70015. 2022-09-26 16:13:39 +08:00
tianshujie 0e0d13b0a0 * Finish task #70015. 2022-09-26 10:52:36 +08:00
王怡栋 7cbc6a53f0 Merge branch 'sprint/241_dyl_70025' into 'master'
Sprint/241 dyl 70025

See merge request easycorp/zentaopms!5531
2022-09-23 09:19:03 +00:00
dingyongliang 4ef4195d34 * center c-confirmed. 2022-09-23 08:30:24 +00: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
dingyongliang 5525ee47a4 * set confirmed field center. 2022-09-22 07:03:57 +00: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
王怡栋 0801b4a668 Merge branch 'master_liuhong_27183' into 'master'
Master liuhong 27183

See merge request easycorp/zentaopms!5388
2022-09-19 05:36:46 +00:00
dingyongliang 5ceb75a7c2 * tash #68929, center the kanban title. 2022-09-14 06:04:57 +00:00
tianshujie ba5eb3f915 * Finish task #68942,68941. 2022-09-13 14:39:01 +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
王怡栋 ceeda8a41e Merge branch 'master_xieqiyu_67693' into 'master'
* Add delay label.

See merge request easycorp/zentaopms!5277
2022-09-07 02:34:47 +00:00
xieqiyu bb38728a54 * Add delay label. 2022-09-06 16:01:45 +08:00
xieqiyu 4f9128b9c1 * Fix bug#27288. 2022-09-06 15:51:03 +08:00