Commit Graph
31362 Commits
Author SHA1 Message Date
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
孙广明 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
zhouxin 6097b53514 * Fix bug. 2022-04-18 08:35:55 +00: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
王怡栋 7155d82189 Merge branch 'sprint/fixbug_hufangzhou_21822' into 'master'
* Fix bug #21822.

See merge request easycorp/zentaopms!2988
2022-04-18 07:19:13 +00:00
王怡栋 0b1e89ea93 Merge branch 'sprint/fixbug_hufangzhou_11808' into 'master'
* Fix bug #11808.

See merge request easycorp/zentaopms!2984
2022-04-18 07:18:27 +00:00
王怡栋 610d0b435d Merge branch 'sprint/fixbug_hufangzhou_21770' into 'master'
* Fix bug #21770.

See merge request easycorp/zentaopms!2972
2022-04-18 07:17:42 +00:00
孙广明 10d95940b6 Merge branch 'master_xieqiyu_14454' into 'master'
* Fix bug#14454.

See merge request easycorp/zentaopms!2981
2022-04-18 07:12:34 +00:00
hufangzhou ddb4ab243a * Remove the unused code. 2022-04-18 15:00:51 +08:00
hufangzhou 281fa51fc1 * Fix bug #21822. 2022-04-18 14:58:06 +08:00
王怡栋 9d8e96b829 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 14:54:42 +08:00
王怡栋 c2e9328d77 * adjust for refresh page. 2022-04-18 14:54:18 +08:00
孙广明 317b12da7b Merge branch 'sprint/master_zhouxudong_20178' into 'master'
Sprint/master zhouxudong 20178

See merge request easycorp/zentaopms!2982
2022-04-18 06:49:50 +00:00
zhouxudong 36946a8fb1 * Fix bug #20178. 2022-04-18 14:47:04 +08:00
sunjun 0aa9ee7db1 *Fixbug_sunjun_19262 2022-04-18 14:21:57 +08:00
sunjun efb1b2eee2 *Fixbug_sunjun_19262 2022-04-18 14:16:04 +08:00
hufangzhou cc140db6a1 * Fix bug #11808. 2022-04-18 14:08:31 +08:00
zhouxudong c449b53e4b * Fix bug #20178. 2022-04-18 13:59:09 +08:00
xieqiyu 8ce20cb746 * Fix bug#14454. 2022-04-18 13:45:46 +08:00
王怡栋 a1e72ace5e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 13:26:47 +08:00
王怡栋 323f7366ba * code for bug #21020. 2022-04-18 13:26:25 +08:00
zhouxudong 532920579e * Fix bug #20178. 2022-04-18 13:20:44 +08:00
孙广明 6703d17651 Merge branch 'fixbug_sunjun_qijian' into 'master'
Fixbug sunjun qijian

See merge request easycorp/zentaopms!2970
2022-04-18 05:20:23 +00:00
liyuchun c5eddbe19b * Fix bug #21565. 2022-04-18 11:49:44 +08:00
liyuchun 13d354ba8c * Fix bug #21518. 2022-04-18 11:35:36 +08:00
王怡栋 0d0fcb0c2e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-04-18 11:30:31 +08:00
李玉春 4334eca80d Merge branch 'sprint/tianshujie_fixbug' into 'master'
Sprint/tianshujie fixbug

See merge request easycorp/zentaopms!2978
2022-04-18 03:30:09 +00:00
王怡栋 a481ba2959 * adjust for check priv. 2022-04-18 11:26:21 +08:00
tianshujie ab1ad4051b * Fix bug #21682. 2022-04-18 11:21:54 +08:00
zhouxudong 9f50c3abaa * Fix bug #20178. 2022-04-18 11:18:33 +08:00
孙广明 df7235355c Merge branch 'sunhuawei_fixbug_20316' into 'master'
* Fix bug #20316.

See merge request easycorp/zentaopms!2976
2022-04-18 02:59:35 +00:00
孙华伟 a5d6663342 * Fix bug #20316. 2022-04-18 10:55:42 +08:00
tianshujie 685a583d99 * Fix bug #17551. 2022-04-18 10:50:50 +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
caoyanyi b27e1f76d7 * Modify field name. 2022-04-18 10:06:35 +08:00
caoyanyi e98d1ac4ab * Fix bug #21763. 2022-04-18 10:03:47 +08:00
hufangzhou 80ac96b791 * Fix bug #21770. 2022-04-18 09:19:34 +08:00