Commit Graph
3875 Commits
Author SHA1 Message Date
caoyanyi 83cf8d0972 * Modify install and story report error. 2023-04-21 11:18:02 +08:00
hufangzhou e18b37128f Merge branch 'master' into zentaopms_304 2023-04-20 13:03:30 +08:00
朱金勇 7de8f305c0 * Fix bug#34389. 2023-04-20 04:10:07 +00:00
wangyidong 107265a099 * fix bug for init js var. 2023-04-20 11:25:23 +08:00
liumengyi 168ebe2b56 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-19 09:08:44 +08:00
liumengyi 62d73d2149 * Fix bug #33143. 2023-04-18 15:08:23 +08:00
liumengyi 03ebaf7784 * Finish task #91275. 2023-04-18 09:25:32 +08:00
朱金勇 ba3feadb9d * Fix bug#34244. 2023-04-17 07:52:08 +00:00
朱金勇 bf65000aff * Fix bug#34232. 2023-04-16 14:09:36 +00:00
朱金勇 e074e17dc8 * Fix bugs of dmdb. 2023-04-16 11:53:19 +00:00
wangyidong ed0f4c3d0e * fix bug #32088. 2023-04-14 09:27:16 +08:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
Yagami 7e54b48e64 * Fix bug https://www.zentao.net/thread/293693/p1.html?rand=62#106742. 2023-03-31 09:39:19 +08:00
liumengyi d86aa233eb * Remove unused parameters. 2023-03-29 15:05:17 +08:00
hufangzhou e74e4efae7 * Finish task #89173. 2023-03-28 11:26:20 +08:00
wangyidong c87ea9131a * fix for sonar. 2023-03-27 11:34:22 +08:00
王怡栋 e59c7e0999 Merge branch 'bugfix/32643_lmy' into 'master'
* Finish task #86286.

See merge request easycorp/zentaopms!7264
2023-03-27 03:17:30 +00: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
王怡栋 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
liumengyi cdeb1c7e4c * Finish task #86286. 2023-03-17 07:07:40 +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