Commit Graph
31990 Commits
Author SHA1 Message Date
朱金勇 55d19cecb2 Merge branch 'sprint/178_xieqiyu_branch' into 'master'
Fix bug#17791.

See merge request easycorp/zentaopms!1132
2021-12-24 05:01:05 +00:00
孙广明 d79b331d83 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1134
2021-12-24 03:21:45 +00:00
tianshujie ff3a24fdbb * Fix bug #17928. 2021-12-24 11:18:22 +08:00
孙广明 8b96fbfaf2 Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master'
* Fix bug #17920.

See merge request easycorp/zentaopms!1133
2021-12-24 03:12:53 +00:00
liumengyi 6863cd05b8 * Fix bug #17920. 2021-12-24 11:11:33 +08:00
xieqiyu 65aa1aebdf * Fix bug#17791. 2021-12-24 11:11:15 +08:00
朱金勇 d263704ef3 Merge branch 'sprint/179_sunhao/bug17911' into 'master'
* Bug #17911, add title attribute to kanban column header.

See merge request easycorp/zentaopms!1127
2021-12-24 03:09:42 +00:00
朱金勇 16d68b5a46 Merge branch 'sprint/179_sunhao/bug17795' into 'master'
* Bug #17795, hide contextmenu when scrolling kanban.

See merge request easycorp/zentaopms!1131
2021-12-24 03:09:21 +00:00
tianshujie 686af2b592 * Fix the problem of copy region error. 2021-12-24 11:02:52 +08:00
Hao Sun 272c5c0f40 * Bug #17795, hide contextmenu when scrolling kanban. 2021-12-24 10:58:46 +08:00
李玉春 0aa3c0fac0 Merge branch 'devops17_17910' into 'master'
* Fix bug#17909,17910

See merge request easycorp/zentaopms!1130
2021-12-24 02:56:34 +00:00
zenggang 4955bd5450 * Fix bug#17909,17910 2021-12-24 02:46:49 +00:00
王怡栋 790b1d5d81 Merge branch 'sprint/liyuchun_devops' into 'master'
* Fix bug #17912.

See merge request easycorp/zentaopms!1129
2021-12-24 02:41:22 +00:00
liyuchun b94a067297 * Fix bug #17912. 2021-12-24 10:39:18 +08:00
孙广明 e5024013fe Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1128
2021-12-24 02:24:02 +00:00
tianshujie 4554b20b3c * Fix bug #17923. 2021-12-24 10:21:54 +08:00
tianshujie 464dd4f439 * Fix bug #17921. 2021-12-24 10:04:30 +08:00
王怡栋 287b4906ae Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-24 09:58:48 +08:00
王怡栋 be6ff893dd * finish task #46219. 2021-12-24 09:58:27 +08:00
xieqiyu c9eaa1cb0d * Add a period. 2021-12-24 09:51:07 +08:00
Hao Sun f824d08922 * Bug #17911, add title attribute to kanban column header. 2021-12-24 09:45:03 +08:00
李玉春 c2009c72de Merge branch 'devops17_zenggang' into 'master'
* Code for task#46005

See merge request easycorp/zentaopms!1124
2021-12-24 00:50:18 +00:00
王怡栋 f41f8de32a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-24 08:42:02 +08:00
王怡栋 0d2f111a67 * fix error for php8.0. 2021-12-24 08:40:34 +08:00
李玉春 76821df642 Merge branch 'sprint/178_hufangzhou_17903' into 'master'
* Fix bug #17903.

See merge request easycorp/zentaopms!1125
2021-12-23 09:55:10 +00:00
hufangzhou 5a8966c8e8 * Fix bug #17903. 2021-12-23 17:28:29 +08:00
zenggang b9e46558c5 * Code for task#46005 2021-12-23 09:21:51 +00:00
朱金勇 53eb9cd702 Merge branch 'sprint/178_songchenxuan_17399' into 'master'
*Fix bug #17399.

See merge request easycorp/zentaopms!1123
2021-12-23 09:19:39 +00:00
songchenxuan 5e8b17d6df *Fix bug #17399. 2021-12-23 17:11:35 +08:00
王怡栋 0c1ef02491 Merge branch 'sprint/liyuchun_devops' into 'master'
* Add unit testcase of delete tag.

See merge request easycorp/zentaopms!1122
2021-12-23 09:03:46 +00:00
zhujinyong a5cb10a6da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-23 17:01:43 +08:00
liyuchun f13fbc6f5b * Add unit testcase of apiDeleteTag. 2021-12-23 17:01:30 +08:00
zhujinyong 8efde58482 Merge branch 'sprint/178_songchenxuan_17682' 2021-12-23 17:01:30 +08:00
liyuchun aba26e05ac * Add unit testcase of delete tag. 2021-12-23 17:00:24 +08:00
孙广明 40d0b988d7 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1121
2021-12-23 08:59:45 +00:00
tianshujie 827b4ed3b5 * Fix bug #17694. 2021-12-23 16:56:33 +08:00
孙广明 b603c6186e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Modify css style.

See merge request easycorp/zentaopms!1120
2021-12-23 08:53:50 +00:00
liumengyi e04d64126a * Modify css style. 2021-12-23 16:51:54 +08:00
tianshujie 2cda67d63e * Fix bug #17892,#17899. 2021-12-23 16:35:31 +08:00
孙广明 129bf0e524 Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*Code english title wrap.

See merge request easycorp/zentaopms!1111
2021-12-23 08:31:05 +00:00
孙广明 a967a70574 Merge branch 'sprint/178_hufangzhou_tutorial' into 'master'
* Fix bug #17447.

See merge request easycorp/zentaopms!1117
2021-12-23 08:28:58 +00:00
songchenxuan 2507b9ba75 *Fix bug 17682. 2021-12-23 16:24:11 +08:00
孙广明 50315f2bf3 Merge branch 'sprint/179_tianshujie_bug' into 'master'
Sprint/179 tianshujie bug

See merge request easycorp/zentaopms!1118
2021-12-23 08:15:11 +00:00
李玉春 97d3de7b7e Merge branch 'sprint/179_liumengyi_fixbug' into 'master'
* Fix bug #17890, #17888.

See merge request easycorp/zentaopms!1115
2021-12-23 08:12:59 +00:00
tianshujie fe9c5aeaf1 * Fix the problem of creating a region error. 2021-12-23 16:10:03 +08:00
tianshujie fb1027b47d * Fix bug #17898. 2021-12-23 15:54:41 +08:00
liumengyi 7f2eb13792 * Fix bug for #17894. 2021-12-23 15:50:20 +08:00
hufangzhou 9c31edcd60 * Fix bug #17447. 2021-12-23 15:35:19 +08:00
tianshujie 090194c8ba * Fix bug #17892. 2021-12-23 15:29:39 +08:00
zhujinyong f2e9a6c7a0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-12-23 15:28:03 +08:00