Commit Graph
3852 Commits
Author SHA1 Message Date
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
王怡栋 cf737b035e Merge branch 'bugfix/33127_lmy' into 'master'
* Fix bug #33139, #33127

See merge request easycorp/zentaopms!7255
2023-03-21 05:27:39 +00:00
liumengyi 346ce0c994 * Fix bug #33140. 2023-03-21 03:25:20 +00:00
hufangzhou f6ec44cd06 * Fix bug #33128. 2023-03-21 10:20:06 +08:00
hufangzhou 277fe6b473 * Fix bug #33080. 2023-03-20 13:22:07 +08:00
王怡栋 8d98b6fc98 Merge branch 'wxp_bug33027' into 'master'
* Fix bug 33027.

See merge request easycorp/zentaopms!7221
2023-03-20 02:24:37 +00:00
hufangzhou 868dda193c * Add close btn for requirement under project app. 2023-03-17 13:50:06 +08:00
tianshujie bd8dc27a36 * Code for bug #32987. 2023-03-17 11:07:00 +08:00
wangxuepeng 3728a41230 * Fix bug 33027. 2023-03-17 01:20:43 +00:00
王怡栋 e0946d24b1 Merge branch 'bugfix/32991_lmy' into 'master'
* Fix bug #32991, #33018.

See merge request easycorp/zentaopms!7212
2023-03-16 08:30:21 +00:00
王怡栋 031a63a433 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/story/control.php
2023-03-16 08:27:36 +00:00
hufangzhou 15c0a07a93 * Code for bug #32960. 2023-03-16 16:22:37 +08:00
hufangzhou 131dcf5f24 * Fix bug #32960. 2023-03-16 15:54:11 +08:00
liumengyi c7bd19144f * Fix bug #32991. 2023-03-16 06:27:23 +00:00
caoyanyi 8949e97078 * Modify story page collapsed. 2023-03-16 13:42:01 +08:00
tianshujie 68bad00edc * Code for fix bug #32989. 2023-03-16 11:11:26 +08:00
liumengyi b283c30895 * Fix bug #32995. 2023-03-16 02:47:20 +00:00
tianshujie 1b7aaf7e6b * Code for Bug #32987. 2023-03-16 10:03:36 +08:00
tianshujie 0964904dda * Fix bug 32952. 2023-03-15 15:23:57 +08:00
孙广明 d235b8e924 Merge branch 'feature/38477' into 'master'
* Finish task #87013, #87014, and fix bug #32881.

See merge request easycorp/zentaopms!7184
2023-03-14 09:15:08 +00:00
liumengyi a33306bf90 * Fix bug #32881. 2023-03-14 05:05:46 +00:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00:00
guofeilong c2fde80cda * Adjust code . 2023-03-13 15:41:40 +08:00
tianshujie c524e23d7e * Skip form staging. 2023-03-13 14:00:16 +08:00
tianshujie 7a77fce8e4 * Fix bug #29923. 2023-03-09 11:05:26 +08:00
caoyanyi eeafdf7671 * Revmoe console code. 2023-03-08 17:18:26 +08:00
tianshujie 99f3ccee79 * Modify language item for product common. 2023-03-07 13:49:20 +08:00
tianshujie e1b6e852af * Unified filter label format. 2023-03-06 14:02:09 +08:00
王怡栋 3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
王怡栋 461c4f8b23 Merge branch 'liuhong_bug' into 'master'
Liuhong bug

See merge request easycorp/zentaopms!7130
2023-03-02 06:55:47 +00:00
tianshujie bf3081471d * Optimized creating requirements page. 2023-03-02 13:48:04 +08:00
liuhong 426e369ef1 * Fix the lack of story data 2023-03-02 00:22:30 +00:00
caoyanyi edc301d455 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 15:24:30 +08:00
tianshujie 745151425c * Code for fix bug #32528. 2023-03-01 11:17:30 +08:00
liumengyi 2a8ef84795 * Finish task #85644. 2023-03-01 02:33:48 +00:00
tianshujie 9e4fa093d8 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 10:14:51 +08:00
胡方舟 c1110cc668 Merge branch 'sprint/294_liumengyi_fixbug' into 'master'
* Fix bug #32466.

See merge request easycorp/zentaopms!7095
2023-03-01 00:38:10 +00:00
tianshujie 872137cea6 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:35:21 +08:00
王怡栋 97feb59658 Merge branch 'master_xieqiyu_28400' into 'master'
* Code for bug#28400.

See merge request easycorp/zentaopms!7090
2023-03-01 00:30:04 +00:00
liumengyi d410fe9931 * Fix bug #32466. 2023-02-28 09:15:40 +00:00
caoyanyi 0eb7b70d48 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 17:07:32 +08:00
liumengyi cf7fda21fd * Fix bug #32484. 2023-02-28 06:12:49 +00:00
xieqiyu a028eaea16 * Code for bug#28400. 2023-02-28 14:11:52 +08:00
hufangzhou d1f2700812 * Finish task #85629. 2023-02-28 05:16:43 +00:00
wangxuepeng 2ddb027efe * Finish task #85628. 2023-02-28 05:09:55 +00:00
wangxuepeng 9500e3cf82 * Finish task #85628. 2023-02-28 02:58:48 +00:00
tianshujie 20b129e8c4 * Code for finish task #85504. 2023-02-27 14:11:40 +08:00
孙广明 fccd283453 Merge branch 'sprint/292_liumengyi_32202' into 'master'
* Fix bug #32202,#32281, and finish task #42089.

See merge request easycorp/zentaopms!7051
2023-02-24 03:22:19 +00:00