Commit Graph
1905 Commits
Author SHA1 Message Date
liumengyi 2a9f945c77 * Fix bug #23407. 2022-06-08 13:25:06 +08:00
孙广明 b896377846 * Change zentao license. 2022-06-08 10:02:29 +08:00
孙广明 b528156589 * Change license. 2022-06-08 09:34:46 +08:00
tianshujie ff8e718b37 * Fix bug #23349. 2022-06-07 16:00:28 +08:00
李玉春 0da04fca77 Merge branch 'sprint/scx_executionbug' into 'master'
* Fix bug #23291.

See merge request easycorp/zentaopms!3748
2022-06-07 01:12:52 +00:00
李玉春 61142f9f67 Update managemembers.js 2022-06-07 01:01:59 +00:00
tianshujie 020528cdbb * Fix bug #23335. 2022-06-07 08:59:51 +08:00
tianshujie d2242277e7 * Fix bug #23335. 2022-06-07 08:57:24 +08:00
李玉春 fd356fbb99 Merge branch 'sprint/sunhao/fix_kanban_col_height' into 'master'
* fix kanban lane height with auto height option.

See merge request easycorp/zentaopms!3747
2022-06-06 07:11:13 +00:00
tianshujie 814f1a597f * Fix bug #23255. 2022-06-06 15:07:57 +08:00
宋辰轩 9ff12274e2 * Fix bug #23291. 2022-06-06 15:00:09 +08:00
Hao Sun 29ae8cb398 * fix kanban lane height with auto height option. 2022-06-06 06:58:38 +00:00
zenggang c69ffb8d7d * Fix bug#23246 2022-06-06 04:30:37 +00:00
孙广明 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
liumengyi 4e71cb29a8 * Fix bug #23031. 2022-06-02 14:12:00 +08: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
李玉春 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 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
孙广明 2d572a9d14 Merge branch '197' 2022-06-02 08:32:45 +08: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
zhouxin cda4d7e809 * Adjust code. 2022-06-01 08:56:49 +00:00
liumengyi 06a0bb6f03 * Fix bug #23110, #23109. 2022-06-01 16:27:03 +08:00
zhouxin 2fcd623c62 * Adjust code. 2022-06-01 07:48:32 +00:00
zhouxin bc803e56c8 * Finish task #55676. 2022-06-01 07:34:04 +00:00
tianshujie 095c9b5501 * Finish task #55681. 2022-06-01 15:07:35 +08:00
孙广明 a8e0efeaf2 Merge branch 'sprint/197_tianshujie_55675' into 'sprint/197'
Sprint/197 tianshujie 55675

See merge request easycorp/zentaopms!3680
2022-06-01 06:50:23 +00:00
zhouxudong 5c3ac663e6 * Fix bug #23129 #23126 #23108. 2022-06-01 06:30:45 +00:00
tianshujie 78d38d7723 Merge branch 'sprint/197_tianshujie_55675' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/197_tianshujie_55675 2022-06-01 13:51:08 +08:00
tianshujie 7a70ae8481 * Finish task #55675. 2022-06-01 13:50:53 +08:00
liumengyi 384240bb75 * Finish task #55681. 2022-06-01 13:47:27 +08:00
tianshujie b076635c79 * Finish task #55675. 2022-06-01 13:32:34 +08:00
tianshujie 5d62ed5900 * Finish task #55675. 2022-06-01 13:06:26 +08:00
mayue 38bdcc9ea4 * Optimize code. 2022-06-01 11:29:41 +08:00
mayue 3c259a09d1 * Fix bug #23086. 2022-06-01 11:20:16 +08:00
tianshujie b9a37d04a2 * Finish task #55675. 2022-06-01 11:08:51 +08:00
tianshujie 2fb1cc0032 * Finish task #55675. 2022-06-01 10:57:07 +08:00
王怡栋 f64b61a487 Merge branch 'sprint/196' into 'master'
Sprint/196

See merge request easycorp/zentaopms!3677
2022-06-01 02:28:26 +00:00
王怡栋 817dffafc8 Merge branch 'sprint/196_zhouxudong_55623' into 'sprint/196'
Sprint/196 zhouxudong 55623

See merge request easycorp/zentaopms!3676
2022-06-01 02:20:14 +00:00
tanghucheng c9daed297e * Fix bug #23105. 2022-06-01 08:41:04 +08:00
xieqiyu b041e5c885 * After creating a bug in the execution bug list, you jump to the execution testcase list. 2022-05-31 20:28:13 +08:00
tanghucheng 648362bfdb * Fix bug #23095. 2022-05-31 17:22:15 +08:00