Commit Graph
1698 Commits
Author SHA1 Message Date
王怡栋 82968630b0 Merge branch 'master_xieqiyu_53671' into 'master'
Master xieqiyu 53671

See merge request easycorp/zentaopms!3322
2022-05-11 05:17:05 +00:00
xieqiyu 5c23f91a05 * Code for task#53671. 2022-05-11 11:29:03 +08:00
xieqiyu f821b92e7f * Modify review code. 2022-05-11 10:44:00 +08:00
xieqiyu c77a6505d3 * Finish task#53671. 2022-05-11 09:01:17 +08:00
孙广明 e6ba9acf68 Merge branch 'sprint/tianshujie_task53668' into 'master'
Sprint/tianshujie task53668

See merge request easycorp/zentaopms!3310
2022-05-10 09:09:34 +00:00
tianshujie 5bdb7f521c * Finish task #53668. 2022-05-10 17:05:49 +08:00
孙广明 9d8f4b4f21 Merge branch 'task_sunjun_53665' into 'master'
sprint_sunjun_53665

See merge request easycorp/zentaopms!3306
2022-05-10 08:23:21 +00:00
sunjun 631601a39b sprint_sunjun_53665 2022-05-10 06:42:34 +00:00
wangyidong c9bc2ba86f * code for task #53592. 2022-05-10 13:48:37 +08:00
tianshujie 5c00aa823c * Modify language item error. 2022-05-10 11:24:17 +08:00
tianshujie 896e36c90c * Finish task #53667. 2022-05-10 10:50:02 +08:00
tianshujie c3fdb74a24 * Finish task #53668. 2022-05-10 10:12:48 +08:00
daitingting a71cf1d280 Merge branch 'branch/workflow' of https://gitlab.zcorp.cc/easycorp/zentaopms into branch/workflow 2022-05-10 01:44:47 +00:00
daitingting d577d57a33 * Add id for checking unique field. 2022-05-09 17:02:23 +08:00
wangyuting2 a607161591 * Finish task #53549. 2022-05-09 17:00:41 +08:00
daitingting e30acad1f2 * Add id for checking unique field. 2022-05-09 07:56:17 +00:00
daitingting 96e460c47d * Finish task #53549. 2022-05-09 06:41:35 +00:00
xieqiyu 88fbdad2fd * Fix bug#22114. 2022-04-29 11:29:40 +08:00
孙广明 1cb36eb72c Merge branch 'liyuchun_fixbug_22074' into 'master'
* Fix bug #22075.

See merge request easycorp/zentaopms!3185
2022-04-28 06:22:29 +00:00
liyuchun 81903f2fe5 * Fix bug #15563. 2022-04-28 06:05:39 +00:00
孙广明 50f4cf9236 Merge branch 'fixbug_sunjun_22007' into 'master'
*Fixbug_sunjun_22007

See merge request easycorp/zentaopms!3176
2022-04-28 02:52:46 +00:00
sunjun c2d9f7b240 *Fixbug_sunjun_22007 2022-04-28 02:48:11 +00:00
王怡栋 ec08b7bfcc Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug #22008

See merge request easycorp/zentaopms!3162
2022-04-27 09:29:23 +00:00
王怡栋 56f4a1a6df Merge branch 'fixbug' into 'master'
* Fix bug #15677.

See merge request easycorp/zentaopms!3156
2022-04-27 09:28:49 +00:00
tanghucheng c781eadd94 * Fix bug. 2022-04-27 17:28:08 +08:00
sunjun 0495a32a20 *Fixbug_sunjun_22007 2022-04-27 07:59:37 +00:00
lanzongjun edb3c69e87 * fix bug #22008 2022-04-27 15:27:05 +08:00
tanghucheng f4666d8384 * Fix bug #15677. 2022-04-27 14:21:00 +08:00
lanzongjun e348c77a7a * fix bug #15814 2022-04-26 16:43:38 +08:00
lanzongjun 68270a031b * fix bug #15834 2022-04-26 10:50:44 +08:00
tanghucheng bc1a55d155 * Fix bug #14850. 2022-04-24 13:39:19 +08:00
tanghucheng 76c0462119 * Fix bug #21439. 2022-04-24 01:53:07 +00:00
Zongjun Lan c6678ed77b * fix bug undefined from 2022-04-22 14:16:08 +08:00
Zongjun Lan e2cfcf4e8d * fix param name 2022-04-22 10:34:12 +08:00
Zongjun Lan 1a4d40bae0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-04-22 08:47:36 +08:00
Zongjun Lan 6ff7ac0d24 * fix bug #18933 2022-04-21 16:49:56 +08:00
王怡栋 7ae35d4a12 * fix bug #21806. 2022-04-21 15:38:33 +08:00
王怡栋 6c46a39ca1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-20 11:27:06 +08:00
王怡栋 eec155064a * fix bug #20933. 2022-04-20 11:26:32 +08:00
孙广明 740e124a5c Merge branch 'master_xieqiyu_21640' into 'master'
* Fix bug#21640.

See merge request easycorp/zentaopms!3013
2022-04-19 09:17:32 +00:00
xieqiyu 8f849cc8c3 * Fix bug#21640. 2022-04-19 16:06:27 +08:00
李玉春 dc8063428a Merge branch 'sunhuawei_fixbug_18898' into 'master'
Sunhuawei fixbug 18898

See merge request easycorp/zentaopms!3011
2022-04-19 07:40:38 +00:00
孙华伟 dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
tianshujie c595eaa0d5 * Fix bug #21830. 2022-04-19 10:49:03 +08:00
Hao Sun b411c07de8 * bug #19078, hide scrollbar on dragging card in ".kanban". 2022-04-18 17:34:44 +08:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
zhouxudong 89bfe585c8 * Fix bug #20867. 2022-04-18 15:31:00 +08:00
Hao Sun e1a11341c6 * refactor: format. 2022-04-18 10:34:14 +08:00
Hao Sun af43ca6bb3 * bug #6910, optimize helper "text-limit" and support for displaying html. 2022-04-18 10:25:28 +08:00
朱金勇 1ad5accfce Merge branch 'sprint/sunhao/bug19052' into 'master'
* bug #19052, fix width for some models.

See merge request easycorp/zentaopms!2965
2022-04-18 00:10:55 +00:00