Commit Graph
32843 Commits
Author SHA1 Message Date
孙广明 1dd0b6c022 Merge branch 'sprint/197_tianshujie_bug23213' into 'master'
* Fix bug #23213.

See merge request easycorp/zentaopms!3725
2022-06-02 08:04:56 +00:00
liumengyi 7a14f8a946 * Fix bug #23213. 2022-06-02 16:03:40 +08:00
tianshujie 653e681ed2 * Fix bug #23213. 2022-06-02 16:02:19 +08:00
liumengyi 4d2c34c122 * Fix bug #23213. 2022-06-02 15:59:57 +08:00
孙广明 61ad544156 Merge branch 'zentaopms_198' 2022-06-02 15:04:56 +08:00
孙广明 cf5dbf0f23 * Remove unused code. 2022-06-02 14:53:51 +08:00
孙广明 23d19bd6b3 * Code for export users. 2022-06-02 14:52:16 +08:00
李玉春 66ca553dad Merge branch 'sprint/master_zhouxudong_23111' into 'master'
Sprint/master zhouxudong 23111 19265

See merge request easycorp/zentaopms!3722
2022-06-02 06:32:26 +00:00
zhouxudong 3e4db334a5 * Fix bug #19265. 2022-06-02 06:24:53 +00:00
孙广明 716c7ca6e6 Merge branch 'fixbug_sunjun_23182' into 'master'
fixbug_sunjun_23182

See merge request easycorp/zentaopms!3703
2022-06-02 06:17:56 +00:00
孙广明 38b9119de9 Merge branch 'fixbug_sunjun_22971' into 'master'
fixbug_sunjun_22971

See merge request easycorp/zentaopms!3721
2022-06-02 06:17:36 +00:00
孙广明 9fe2c296a5 Merge branch 'sprint/198_mayue_task#55852' into 'master'
* Finish task #55852.

See merge request easycorp/zentaopms!3716
2022-06-02 06:16:12 +00:00
孙广明 b99385ee25 Merge branch 'fixbug_sunjun_22959' into 'master'
fixbug_sunjun_22959

See merge request easycorp/zentaopms!3717
2022-06-02 06:15:41 +00:00
孙广明 df1c3d0556 Merge branch 'liyuchun_fixbug' into 'master'
* Finish task #55841.

See merge request easycorp/zentaopms!3718
2022-06-02 06:15:25 +00:00
sunjun 136d48f85e fixbug_sunjun_22971 2022-06-02 06:14:57 +00:00
liumengyi 4e71cb29a8 * Fix bug #23031. 2022-06-02 14:12:00 +08:00
liyuchun 620aa77d04 * Finish task #55841. 2022-06-02 06:02:58 +00:00
孙广明 ea678a3736 Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #23132.

See merge request easycorp/zentaopms!3710
2022-06-02 05:55:29 +00:00
sunjun d3c0e96b98 fixbug_sunjun_22959 2022-06-02 05:40:49 +00:00
zenggang c95c50021d * Adjust code 2022-06-02 05:33:38 +00:00
zenggang 982d1c72aa * Adjust code 2022-06-02 05:32:33 +00:00
李玉春 88da2f7565 Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
Sprint/197 tianshujie fixbug

See merge request easycorp/zentaopms!3714
2022-06-02 05:27:06 +00:00
tianshujie d8f8e9cce0 * Modify variable name. 2022-06-02 13:26:10 +08:00
zhouxudong 0e6fc10f0b * Fix bug #23111. 2022-06-02 05:24:18 +00:00
mayue 1965426827 * Finish task #55852. 2022-06-02 13:22:13 +08:00
zenggang fe5ec04749 * Code for task#55851 2022-06-02 05:22:12 +00:00
孙广明 5d4bffef24 Merge branch 'master_xieqiyu_23185' into 'master'
* Fix bug#23185.

See merge request easycorp/zentaopms!3713
2022-06-02 05:21:32 +00:00
李玉春 d36ec41688 Merge branch 'master' into 'sprint/sunhao/fix_kanban_fullscreen'
# Conflicts:
#   www/js/zui/kanban/min.js
2022-06-02 05:20:38 +00:00
tianshujie c170d62313 * Resoled issue #656. 2022-06-02 13:16:37 +08:00
tianshujie fb239cfa06 * Fix bug #23194. 2022-06-02 12:22:58 +08:00
Hao Sun c1abc19882 * fix virtual rendering not work when kanban enter fullscreen 2022-06-02 04:11:59 +00:00
朱金勇 f8e47338fc Merge branch 'sprint/197_tianshujie_fixbug' into 'master'
* Fixed editing RD Kanban error.

See merge request easycorp/zentaopms!3711
2022-06-02 04:00:38 +00:00
李玉春 fd269a4777 Merge branch 'master' into 'sprint/sunhao/fix_kanban'
# Conflicts:
#   www/js/zui/kanban/min.css
#   www/js/zui/kanban/min.js
2022-06-02 03:29:40 +00:00
Hao Sun 96454565b2 * adjust cards size in kanban. 2022-06-02 03:02:45 +00:00
tianshujie 6837b79449 * Fixed editing RD Kanban error. 2022-06-02 10:51:32 +08:00
liyuchun 29ceb63023 * Fix bug #23132. 2022-06-02 02:49:27 +00:00
sunjun 5b35fab5f6 fixbug_sunjun_23182 2022-06-02 01:43:24 +00:00
xieqiyu 6fdcc5f826 * Modify review code for bug#23185. 2022-06-01 23:34:48 +08:00
xieqiyu b0bac9dfae * Fix bug#23185. 2022-06-01 23:21:22 +08:00
xieqiyu 6e6d83b814 * Fix bug#23185. 2022-06-01 21:36:15 +08:00
xieqiyu 1a24cdbc80 * Fix bug#23185. 2022-06-01 21:29:30 +08:00
xieqiyu c1bc3c7d41 * Fix bug of select main branch. 2022-06-01 20:44:31 +08:00
hufangzhou b4fd618491 * Add the new version. 2022-06-02 09:10:04 +08:00
zhujinyong 9a2933df72 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-06-02 08:33:12 +08:00
zhujinyong cc42a0e685 Merge branch 'sprint/sunhao/fix_picker' 2022-06-02 08:33:01 +08:00
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08:00
Hao Sun c9febeb72b * fix picker not work in page story-create. 2022-06-01 09:14:49 +00:00
sunjun 1c8db1da3a fixbug_sunjun_22531 2022-06-01 09:14:12 +00:00
zhouxin fd6fe986ad * Fix bug #23168. 2022-06-01 09:14:08 +00:00
孙广明 c671cc3186 Merge branch 'sprint/197_zhouxin_55674' into 'sprint/197'
Sprint/197 zhouxin 55674

See merge request easycorp/zentaopms!3691
2022-06-01 08:57:31 +00:00