Commit Graph
31399 Commits
Author SHA1 Message Date
孙广明 e4738c50ea * Add required to workflow field. 2022-04-20 13:08:20 +08:00
孙广明 313e39712c * Fix workflow bug. 2022-04-20 10:17:16 +08:00
孙广明 0ebd84cd0d Merge branch 'master_xieqiyu_21848' into 'master'
* Fix bug#21848.

See merge request easycorp/zentaopms!3017
2022-04-19 09:18:05 +00: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 f100564e6a * Fix bug#21848. 2022-04-19 17:08:49 +08:00
王怡栋 d5b56b2119 Merge branch 'sgm_fixqiqibug' into 'master'
* Fix export bug.

See merge request easycorp/zentaopms!3015
2022-04-19 08:59:08 +00:00
孙广明 18fa7382dd * Fix workflow bug. 2022-04-19 16:39:44 +08:00
xieqiyu 8f849cc8c3 * Fix bug#21640. 2022-04-19 16:06:27 +08:00
王怡栋 ec6b8f86fd Merge branch 'sprint/fixbug_hufangzhou_17933' into 'master'
* Fix bug #17933.

See merge request easycorp/zentaopms!3012
2022-04-19 07:50:20 +00:00
王怡栋 ed8bea2a98 Merge branch 'sprint/fixbug_hufangzhou_18295' into 'master'
* Fix bug #18295.

See merge request easycorp/zentaopms!3010
2022-04-19 07:49:48 +00:00
hufangzhou 9b6857a689 * Fix bug #17933. 2022-04-19 15:47:26 +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
孙华伟 4464536c1f Update control.php 2022-04-19 07:34:10 +00:00
孙华伟 bce4e3267b * Fix bug #18898. 2022-04-19 15:27:58 +08:00
孙华伟 dcfe09867f *Fix bug#18898. 2022-04-19 15:17:50 +08:00
hufangzhou 8303f2f39d * Fix bug #18295. 2022-04-19 15:04:06 +08:00
孙广明 49bbc9c0a2 * Fix export bug. 2022-04-19 14:41:52 +08:00
孙广明 28222990e4 Merge branch 'master_xieqiyu_13863' into 'master'
* Fix bug#13863.

See merge request easycorp/zentaopms!3008
2022-04-19 05:53:00 +00:00
xieqiyu 0eb4023b74 * Fix bug#13863. 2022-04-19 11:25:05 +08:00
李玉春 338cffae53 Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!3006
2022-04-19 03:07:53 +00:00
tianshujie 5b1c7675de * Delete extra Spaces. 2022-04-19 11:03:08 +08:00
tianshujie c595eaa0d5 * Fix bug #21830. 2022-04-19 10:49:03 +08:00
liyuchun ade40aaa75 * Fix bug #12931. 2022-04-19 09:26:41 +08:00
tianshujie bc6866d47f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/tianshujie_fixbug 2022-04-19 09:02:28 +08:00
朱金勇 681c7cf470 Merge branch 'sprint/sunhao/bug19078' into 'master'
* bug #19078, hide scrollbar on dragging card in ".kanban".

See merge request easycorp/zentaopms!3002
2022-04-19 00:58:15 +00:00
王怡栋 667439ab4c Merge branch 'sprint/fixbug_hufangzhou_21829' into 'master'
* Fix bug #21829.

See merge request easycorp/zentaopms!2995
2022-04-19 00:43:36 +00:00
王怡栋 c068a88b3c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* fix bug *12982

See merge request easycorp/zentaopms!2983
2022-04-19 00:42:57 +00:00
王怡栋 1ca6c94525 Merge branch 'sprint/fixbug_hufangzhou_21833' into 'master'
* Fix bug #21833.

See merge request easycorp/zentaopms!2997
2022-04-19 00:29:51 +00:00
王怡栋 da2f83f1c2 Merge branch 'sunhuawei_fixbug_21824' into 'master'
* Fix bug #21824.

See merge request easycorp/zentaopms!3001
2022-04-19 00:29:18 +00:00
Hao Sun b411c07de8 * bug #19078, hide scrollbar on dragging card in ".kanban". 2022-04-18 17:34:44 +08:00
孙华伟 9b66c7a458 *Optimize the code. 2022-04-18 17:20:45 +08:00
zhujinyong 864694faab Merge branch 'sprint/sunhao/bug6910' 2022-04-18 17:16:17 +08:00
孙华伟 caacc3811c * Fix bug #21824. 2022-04-18 17:15:27 +08:00
孙广明 95faa5d390 Merge branch 'sprint/unitTest_liumengyi_branch' into 'master'
* Add unit test of branch.

See merge request easycorp/zentaopms!2998
2022-04-18 09:01:51 +00:00
liumengyi bdbf43362d * Add unit test of branch. 2022-04-18 17:00:06 +08:00
孙广明 b89d214665 Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #20852.

See merge request easycorp/zentaopms!2994
2022-04-18 08:58:59 +00:00
hufangzhou bc381ede7d * Fix bug #21833. 2022-04-18 16:45:12 +08:00
Zongjun Lan b3c2d454b3 * fix bug *12982 2022-04-18 16:42:57 +08:00
zhouxin 6097b53514 * Fix bug. 2022-04-18 08:35:55 +00:00
hufangzhou bdc7323b19 * Fix bug #21829. 2022-04-18 16:32:30 +08:00
liyuchun 6ce3a616db * Fix bug #20852. 2022-04-18 15:56:26 +08:00
孙广明 878f310f3d Merge branch 'liyuchun_fixbug_21518' into 'master'
* Fix bug #21518.

See merge request easycorp/zentaopms!2979
2022-04-18 07:55:45 +00:00
李玉春 0cbc15a93c Merge branch 'cyy_16738' into 'master'
* Fix bug #16738.

See merge request easycorp/zentaopms!2993
2022-04-18 07:55:20 +00:00
李玉春 5e008aab35 Merge branch 'zenggang_18642' into 'master'
Fix bug#18642,21572

See merge request easycorp/zentaopms!2991
2022-04-18 07:53:52 +00:00
李玉春 e13aed8c7c Merge branch 'fixbug_sunjun_19262' into 'master'
*Fixbug_sunjun_19262

See merge request easycorp/zentaopms!2985
2022-04-18 07:52:30 +00:00
zenggang b19b84e0c5 * Adjust code 2022-04-18 07:52:10 +00:00
caoyanyi 561ced0819 * Fix bug #16738. 2022-04-18 15:51:15 +08:00
孙广明 f14b947f2d Merge branch 'sprint/mastr_zhouxudong_20867' into 'master'
* Fix bug #20867.

See merge request easycorp/zentaopms!2992
2022-04-18 07:35:03 +00:00
zhouxudong 89bfe585c8 * Fix bug #20867. 2022-04-18 15:31:00 +08:00
zenggang 1c8c50724d * Fix bug#18642,21572 2022-04-18 07:25:46 +00:00