Commit Graph
1437 Commits
Author SHA1 Message Date
hufangzhou e74e4efae7 * Finish task #89173. 2023-03-28 11:26:20 +08:00
王怡栋 ddc616af76 Merge branch 'ticket_474' into 'master'
* Adjust code.

See merge request easycorp/zentaopms!7263
2023-03-24 00:18:39 +00:00
liuhong c1408e3edc * Adjust code. 2023-03-23 02:14:29 +00:00
wangyidong 183cb09315 * fix for sonar error. 2023-03-23 09:05:17 +08:00
wangyidong cd37890d59 * for Sonar error. 2023-03-23 08:56:57 +08:00
liuhong 1e195ef0a2 * Fix ticket_474 for product changed when edit requirement on site. 2023-03-22 06:26:29 +00:00
hufangzhou 94d2b4de67 * Fix bug for double close button. 2023-03-21 14:12:50 +08:00
hufangzhou f6ec44cd06 * Fix bug #33128. 2023-03-21 10:20:06 +08: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
王怡栋 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 0964904dda * Fix bug 32952. 2023-03-15 15:23:57 +08:00
liumengyi 0955f65414 * Finish task #87014. 2023-03-14 03:09:15 +00: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
liuhong 426e369ef1 * Fix the lack of story data 2023-03-02 00:22:30 +00: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
liumengyi d410fe9931 * Fix bug #32466. 2023-02-28 09:15:40 +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
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
xieqiyu 83737d3e63 * Delete empty line. 2023-02-13 15:04:31 +08:00
xieqiyu 6629a458a6 * Code for bug#31983. 2023-02-13 13:41:14 +08:00
liuhong fac2c81a95 * Adjust code for bug #32044. 2023-02-12 08:00:04 +00:00
王怡栋 436f7a3313 Merge branch 'ticket_326' into 'master'
code for Ticket 326 bug 31981

See merge request easycorp/zentaopms!6891
2023-02-08 09:17:24 +00:00
王怡栋 2a6360f45f Merge branch 'ticket_329' into 'master'
Ticket 329

See merge request easycorp/zentaopms!6886
2023-02-08 08:28:54 +00:00
liuhong 534b5e6471 * Adjust code for ticket #326 2023-02-08 08:25:27 +00:00
liuhong ffd0c2ce7f * Adjust for ticket 326. 2023-02-08 06:58:27 +00:00
liuhong e16cf8278c * Resolved feedback #1855 2023-02-08 05:26:58 +00:00
liuhong 7342444023 * Adjust code for 329. 2023-02-08 02:24:05 +00:00
liuhong bf85280dcd * Adjust code for 329. 2023-02-08 02:07:02 +00:00
王怡栋 d98c613ff6 Merge branch 'ticket_325' into 'master'
* Adjuct code for feedback #1836.

See merge request easycorp/zentaopms!6867
2023-02-07 03:08:48 +00:00
Yagami 33fc8fd620 * Code for php version bug. 2023-02-06 13:24:02 +08:00
xieqiyu 2ab3b9f8cb * Code for bug#28270. 2023-02-03 16:59:43 +08:00
liuhong 27a5843cad * Adjuct code for feedback #1836. 2023-02-03 06:09:53 +00:00
鲁飞 741917d2ab * Fix compatible error. 2023-02-02 03:46:31 +00:00
wangyuting2 b4efdef521 * Optimize code. 2023-01-31 08:25:31 +08:00
wangyuting2 88b0a68ee0 * Send an email to the dispatcher when closing a bug or requirement. 2023-01-30 15:41:50 +08:00