Commit Graph
27362 Commits
Author SHA1 Message Date
tianshujie 547fdbc3d2 * Fix bug #17935. 2021-12-24 14:23:17 +08:00
孙广明 3f3aad524b Merge branch 'sprint/179_liumengyi_modifyStyle' into 'master'
* Modify style for create card.

See merge request easycorp/zentaopms!1138
2021-12-24 06:56:31 +00:00
朱金勇 4afe02de99 Merge branch 'sprint/178_xieqiyu_branch' into 'master'
* Fix bug: batch update branch.

See merge request easycorp/zentaopms!1140
2021-12-24 05:46:31 +00:00
xieqiyu 1491db714d * Fix bug: batch update branch. 2021-12-24 13:45:05 +08:00
朱金勇 00993b8884 Merge branch 'sprint/178_hufangzhou_api' into 'master'
* Add the zentao api lib for upgrade.

See merge request easycorp/zentaopms!1126
2021-12-24 05:42:09 +00:00
liumengyi 4979f04de9 * Modify style for create card. 2021-12-24 13:31:12 +08:00
孙广明 a28772a3f6 Merge branch 'sprint/179_liumengyi_17927' into 'master'
* Fix bug #17927.

See merge request easycorp/zentaopms!1136
2021-12-24 05:21:55 +00:00
孙广明 6461596898 Merge branch 'sprint/179_zhengrunyu_codecard' into 'master'
*change position of icon-required.

See merge request easycorp/zentaopms!1135
2021-12-24 05:21:01 +00:00
liumengyi 8be143a091 * Fix bug #17927. 2021-12-24 13:20:15 +08:00
hufangzhou f043a50e5e * Code for task #17919. 2021-12-24 13:20:04 +08:00
zhengrunyu e0b585354d *change position of icon-required. 2021-12-24 13:18:54 +08:00
hufangzhou f02258f8e1 * Fix bug #17919. 2021-12-24 13:16:23 +08:00
朱金勇 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
hufangzhou e28dfd6879 * Add the zentao api lib for install. 2021-12-24 11:08:10 +08: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
hufangzhou 8b82566999 * Fix bug #17924. 2021-12-24 10:53:15 +08:00
hufangzhou 1aeccfed43 * Fix bug #17919. 2021-12-24 10:47:30 +08: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
hufangzhou be2d532c77 * Add the zentao api lib for upgrade. 2021-12-24 09:33:45 +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
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