Commit Graph
497 Commits
Author SHA1 Message Date
xieqiyu 087b3ac65f * Code for task#54467. 2022-05-19 16:20:35 +08:00
liumengyi 1bc26d519a * Code format. 2022-05-18 16:03:25 +08:00
xieqiyu 5d73710741 * Finish task#54468. 2022-05-18 11:00:54 +08:00
王怡栋 ad6b686c0d Merge branch 'master_xieqiyu_54467' into 'master'
* Finish task#54467.

See merge request easycorp/zentaopms!3466
2022-05-18 01:52:49 +00:00
xieqiyu a68cf385bb * Finish task#54467. 2022-05-18 09:45:11 +08:00
liumengyi aa46dc6595 * Code format of bug #22582. 2022-05-18 09:13:05 +08:00
liumengyi 2b80e3d91f * Fix bug #22582. 2022-05-18 09:11:18 +08:00
李玉春 282f694f17 Merge branch 'sprint/191_tianshujie_54391' into 'master'
Sprint/191 tianshujie 54391

See merge request easycorp/zentaopms!3453
2022-05-18 00:53:44 +00:00
tianshujie 23111eff01 * Delete duplicate personnel. 2022-05-18 08:50:10 +08:00
liumengyi 7d2ab19bc4 * Code format for task #54349. 2022-05-17 17:16:53 +08:00
tianshujie c0d9625c1d * Add testcase of kanban module. 2022-05-17 17:07:36 +08:00
liumengyi dfa70c678b * Finish task #54349. 2022-05-17 16:51:19 +08:00
tianshujie e2e88e4952 * Finish task #54391. 2022-05-17 14:53:43 +08:00
liumengyi fb4e586acf * Finish task #54349. 2022-05-17 14:50:31 +08:00
liumengyi b3fd6f4f53 * Add card desc of productplan card and build card. 2022-05-12 17:22:10 +08:00
liumengyi c5ee9d9873 * Finish task #53663. 2022-05-10 15:35:32 +08:00
Hao Sun 6ea976a722 * bug #19052, fix width for some models. 2022-04-15 14:35:05 +08:00
王怡栋 6e608e2911 * adjust code for update kanban. 2022-03-31 10:43:09 +08:00
孙华伟 cbbc6be340 *Optimize the code. 2022-03-24 11:29:55 +08:00
tianshujie a4ac9d457a * Fix bug #21082. 2022-03-23 10:28:59 +08:00
tianshujie 56c777f843 * Fix bug #17668. 2022-03-22 14:10:13 +08:00
tianshujie 682eeae9e9 * Fix global add kanban error report. 2022-03-22 09:54:36 +08:00
tianshujie a8ec0be15c * Fix global add kanban error report. 2022-03-22 09:27:48 +08:00
王怡栋 fe91dc8481 Merge branch 'pailei2' 2022-03-22 09:01:03 +08:00
tianshujie 6824ee4619 * Fix bug #20891. 2022-03-17 20:28:49 +08:00
孙广明 849646477a Merge branch 'pailei2_xieqiyu_20381' into 'pailei2'
* Fix bug#20381.

See merge request easycorp/zentaopms!2321
2022-03-17 05:49:46 +00:00
tianshujie cd98938d02 * Fix bug #18344. 2022-03-17 10:05:02 +08:00
xieqiyu be11d0b786 * Fix bug#20381. 2022-03-17 09:55:37 +08:00
tianshujie ccc2b37ee9 * Fix kanban column display problem. 2022-03-16 14:56:14 +08:00
tianshujie e2af5a521e * Fix bug #18760. 2022-03-16 14:08:44 +08:00
tianshujie a9df580dec * Fix bug #19243. 2022-03-15 16:22:25 +08:00
tianshujie 3b6637b9db * Fix bug #19243. 2022-03-15 16:18:46 +08:00
tianshujie 02ef32158f * Fix bug #19243. 2022-03-15 15:28:27 +08:00
zhujinyong bebc33acb4 * Fix bug#20651. 2022-03-11 15:54:36 +08:00
zhujinyong 819fad539e * Finish story#31282, story#31284. 2022-03-10 16:21:27 +08:00
tianshujie 8cd6a13955 * Fix bug #20535. 2022-03-09 15:08:17 +08:00
孙广明 4c218d7a69 Merge branch 'pailei_zhangzilong_49888' into 'pailei2'
Pailei zhangzilong 49888

See merge request easycorp/zentaopms!2155
2022-03-09 06:41:53 +00:00
mayue 9f38f5cd10 * Fix bug #50240. 2022-03-09 13:27:42 +08:00
xieqiyu 139ea1e04a * Modify review code. 2022-03-09 11:17:36 +08:00
孙广明 382c57984e Merge branch 'pailei_sunhuawei_story31107' into 'pailei2'
Pailei sunhuawei story31107

See merge request easycorp/zentaopms!2151
2022-03-09 01:14:21 +00:00
孙华伟 4ac1b90743 Update model.php 2022-03-09 00:59:31 +00:00
xieqiyu e02951635c * Add function to find column ID. 2022-03-08 08:51:37 +08:00
liumengyi 33403652d0 * Finish task #50363. 2022-03-07 14:48:38 +08:00
王怡栋 a783b5d736 Merge branch 'master' into 'sprint/master_tanghucheng_fix'
# Conflicts:
#   db/update16.4.sql
#   module/user/view/batchcreate.html.php
2022-03-07 05:25:38 +00:00
zhangzilong 45ad8dbf96 * Code for task #49888. 2022-03-07 13:07:52 +08:00
tanghucheng 79a38cc9ad * Fix bug. 2022-03-07 13:04:06 +08:00
孙广明 91d3978a98 Merge branch 'pailei_mayue_task49305' into 'master'
* Finish task#49305.

See merge request easycorp/zentaopms!2104
2022-03-07 03:10:05 +00:00
mayue c2295b2f8e * Optimize code. 2022-03-07 11:08:23 +08:00
mayue fcb86e9728 * Finish task#49305. 2022-03-04 16:44:27 +08:00
孙广明 cc7e29e208 * Remove unused code. 2022-02-28 11:14:49 +08:00