Commit Graph
1001 Commits
Author SHA1 Message Date
caoyanyi 3867eb0f55 * Code for execution #3238. 2022-10-24 16:56:27 +08:00
tianshujie 17ef65813e * Modify Kanban Settings page style issues. 2022-10-20 10:37:07 +08:00
李玉春 bb90adf795 Merge branch 'sprint/247_tianshujie_fixbug' into 'master'
Sprint/247 tianshujie fixbug

See merge request easycorp/zentaopms!5759
2022-10-17 09:24:39 +00:00
tianshujie 4245745bec * Finish task #72351. 2022-10-17 16:31:40 +08:00
tianshujie 80b66aea5c * Fix bug #28490. 2022-10-17 11:12:48 +08:00
李玉春 30238c658f Merge branch 'sprint/247_tianshujie_71888' into 'master'
Sprint/247 tianshujie 71888

See merge request easycorp/zentaopms!5723
2022-10-11 06:51:55 +00:00
tianshujie 202be34c31 * Finish task #71888. 2022-10-11 13:50:58 +08:00
wangzemei b14dd4c6ed * fix 28426 2022-10-11 12:11:22 +08:00
田淑杰 f6d750c01a Merge branch 'master' into 'sprint/247_tianshujie_table'
# Conflicts:
#   module/my/view/task.html.php
#   www/theme/default/style.css
2022-10-10 08:43:18 +00:00
tianshujie ff6c9221cb * Finish task #71904. 2022-10-10 16:14:45 +08:00
tianshujie e9ebed5a6e * Finish task #71904. 2022-10-10 11:28:31 +08:00
曹延义 20a77c4811 * Modify language. 2022-10-10 11:05:49 +08:00
李玉春 7f1d674a73 Merge branch 'sprint/cyy_71876' into 'master'
Sprint/cyy 71876

See merge request easycorp/zentaopms!5683
2022-10-09 06:50:04 +00:00
曹延义 dc6b265503 * Adjust codes. 2022-10-09 14:48:37 +08:00
曹延义 b30fc65ded * Finish task #71876. 2022-10-09 13:26:43 +08:00
王怡栋 1f68a6b1e7 Merge branch 'master_xieqiyu_26098' into 'master'
* Fix bug#26098.

See merge request easycorp/zentaopms!5658
2022-10-09 05:08:34 +00:00
曹延义 84e1f0295d * Code for task #71876. 2022-10-09 11:15:44 +08:00
曹延义 162c12800b * Finish task #71886. 2022-10-09 09:36:13 +08:00
xieqiyu 57dd6eb716 * Fix bug#26098. 2022-09-30 07:19:21 +00:00
tianshujie 7e523df39b * Fix bug #28253. 2022-09-30 11:31:29 +08: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
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