Commit Graph
1492 Commits
Author SHA1 Message Date
lanzongjun a835220fe1 resolve conflict master 2022-12-02 10:28:31 +08:00
chaideqing ca3adef629 * Refactor code. 2022-12-01 11:15:52 +08:00
chaideqing 6c3e107f78 * Refactor code. 2022-12-01 10:16:26 +08:00
xieqiyu c9bcbe74ae * Code for task#78030. 2022-11-30 22:29:51 +08:00
chaideqing bf3e8e33b3 * Fix feedback #1403 . 2022-11-30 21:07:12 +08:00
Yagami 2f98f46365 * Finish task #77275. 2022-11-23 09:25:48 +08:00
王怡栋 5dcbebeaf1 Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6178
2022-11-16 01:54:53 +00:00
王怡栋 62312f55b8 * fix bug #29798. 2022-11-16 09:53:17 +08:00
daitingting cc12e45755 g * Adjust import release list. 2022-11-15 08:26:43 +00:00
wangyuting 0afdea4382 * Fix bug #29759. 2022-11-15 05:50:07 +00:00
mayue e45a22f25d * Fix bug #29410. 2022-11-14 14:47:50 +08:00
wangyidong 9761648d59 Merge branch 'zentaopms_239' 2022-11-08 08:41:28 +08:00
tianshujie f6d526d916 * Fix bug #29376. 2022-11-07 15:12:30 +08:00
tianshujie 4ee897dc0d * Fix bug #27494. 2022-11-07 10:50:32 +08:00
王怡栋 586eeb073c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #26290#29273

See merge request easycorp/zentaopms!6036
2022-11-04 03:14:03 +00:00
lanzongjun d1b7c675ba * fix bug #29273 2022-11-04 11:12:51 +08:00
tianshujie 2000dc8df2 * Fix bug #29278. 2022-11-04 10:31:04 +08:00
tianshujie 3d40cba711 * Fix bug #29278. 2022-11-04 10:20:58 +08:00
tianshujie a87a088581 * Fix bug #29207. 2022-11-04 08:26:04 +08:00
李玉春 7d48342cbd Merge branch 'sprint/254_tianshujie_program' into 'master'
Sprint/254 tianshujie program

See merge request easycorp/zentaopms!6010
2022-11-03 02:39:55 +00:00
tianshujie f946c35e83 * Fix bug #29207. 2022-11-03 10:24:11 +08:00
liyuchun b60ba43c37 * Fix bug #29192. 2022-11-02 16:51:46 +08:00
tianshujie 5e495264df * Fix bug #29188. 2022-11-02 15:47:29 +08:00
tianshujie f7a1df8da4 * Change the minimum range of kanban columns. 2022-11-02 15:34:02 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
tianshujie 2879079ec6 * Fix bug #29113. 2022-11-01 14:11:48 +08:00
tianshujie 2ca6c0cc0c * Fix bug #28050. 2022-10-31 16:19:17 +08:00
caoyanyi 6f07a5aa0c * Modify kanban page pri style. 2022-10-28 09:23:20 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong d6dc22d7e0 * adjust for scroll to selected. 2022-10-26 09:39:05 +08:00
tianshujie 1c7c989d1c * Fix bug #28892. 2022-10-25 13:23:55 +08:00
孙广明 768aa9ba1b Merge branch 'biz13_mayue_bug' into 'master'
* Optimize code.

See merge request easycorp/zentaopms!5849
2022-10-21 03:44:34 +00:00
mayue bd13e39ade * Add product column. 2022-10-21 11:42:43 +08:00
mayue 9c958e3b9a * Optimize code. 2022-10-21 11:06:52 +08:00
孙广明 bc6716dcdb Merge branch 'sprint/zentaobiz14_feedback_lanzongjun' into 'master'
fix icon-ticket

See merge request easycorp/zentaopms!5848
2022-10-21 02:58:53 +00:00
lanzongjun 6d540cc1cb fix icon-ticket 2022-10-21 10:45:52 +08:00
tianshujie c9331a121c * Fix bug #28764. 2022-10-20 17:22:36 +08:00
mayue 670ffbe0ca * Fix bug #28740. 2022-10-20 14:36:47 +08:00
mayue 06e4a05403 * Add the status column of Kanban import ticket. 2022-10-19 16:36:01 +08:00
mayue 1221260f0b * Fix bug #28666. 2022-10-19 15:13:16 +08:00
lanzongjun 3d2667f818 remove line 2022-10-18 09:32:16 +08:00
lanzongjun aa6546a2ee resolve conflict 2022-10-18 09:26:14 +08:00
mayue c683d09a3f * Add importticket.html. 2022-10-14 14:46:01 +08:00
mayue 2ff57dabd6 * Add other lang. 2022-10-14 14:35:19 +08:00
mayue 6b517a3b8e * Finish task #71837. 2022-10-14 14:27:57 +08:00
mayue 25626c1ec7 * Add code for task #71837. 2022-10-13 18:00:22 +08:00
sunguangming 7567930c6c * Fix bug #28404. 2022-10-11 13:56:17 +08:00
sunguangming 6b344a804e * Fix bug #28404. 2022-10-11 13:49:07 +08:00
sunguangming f9d7ec6857 * Fix code error. 2022-10-11 09:37:06 +08:00
王怡栋 abcdde7ea3 Merge branch 'zentaopms_239_wangyuting' into 'zentaopms_239'
* Fix systemMode bug.

See merge request easycorp/zentaopms!5710
2022-10-10 09:18:50 +00:00