Commit Graph
2879 Commits
Author SHA1 Message Date
liuyongkai 80bd2c745c * Resolve feedback #1461. 2022-12-01 14:25:21 +08:00
zenggang 9b63267e10 * Fix bug#30309 2022-11-29 03:01:45 +00:00
孙广明 c40b00d760 Merge branch 'master_xieqiyu_30186' into 'master'
* Fix bug#30186.

See merge request easycorp/zentaopms!6382
2022-11-25 05:24:38 +00:00
xieqiyu 03705737f7 * Fix bug#30186. 2022-11-25 13:20:07 +08:00
王怡栋 e90baa91f9 Merge branch 'znetaopms_263_bug#30265' into 'master'
* Fix bug #30265.

See merge request easycorp/zentaopms!6381
2022-11-25 05:02:58 +00:00
wangyuting a4cc3fd11a * Fix bug #30265. 2022-11-25 03:25:52 +00:00
孙广明 1d9b2ce11c Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Bug #30028#30240#30245

See merge request easycorp/zentaopms!6376
2022-11-25 03:09:48 +00:00
lanzongjun 4223c7a7f1 * Fix Bug #30235 2022-11-25 08:49:01 +08:00
王怡栋 eb84b76b2c * fix bug. 2022-11-25 08:35:00 +08:00
王怡栋 994015ade9 * fix bug #30229. 2022-11-25 08:34:59 +08:00
xieqiyu 657eb39302 * Fix bug#30203. 2022-11-24 14:52:47 +08:00
liuhong c0852057c5 * Adjust code. 2022-11-24 06:38:23 +00:00
liuhong 2204d0e30c * Adjust code #30172. 2022-11-24 06:34:11 +00:00
liuhong b928b40f02 * Adjust code.. 2022-11-24 06:25:19 +00:00
liuhong c91024ecf3 * Fix bug #30172 #30178. 2022-11-24 06:19:48 +00:00
孙广明 86aa6ec66c Merge branch 'master_xieqiyu_77253' into 'master'
* Fix bug#30032.

See merge request easycorp/zentaopms!6338
2022-11-23 08:45:38 +00:00
王怡栋 c2c238ecc1 Merge branch 'master_bug_23269' into 'master'
* Fix bug #30162.

See merge request easycorp/zentaopms!6339
2022-11-23 08:31:05 +00:00
liuhong 9b70804cfd * Fix bug #30162. 2022-11-23 08:23:51 +00:00
xieqiyu e6e37d4b20 * Fix bug#30032. 2022-11-23 16:17:01 +08:00
王怡栋 2cd292eedf Merge branch 'zentaopms_263_bug#29641' into 'master'
* Fix bug #29641.

See merge request easycorp/zentaopms!6321
2022-11-23 05:45:06 +00:00
王怡栋 d98c9413f0 * fix bug #30074. 2022-11-23 11:09:47 +08:00
wangyuting c2887ff921 * Fix bug #29641. 2022-11-23 03:02:07 +00:00
王怡栋 cc0fb8eeef Merge branch 'master_bug_23269' into 'master'
* Fix bug #23269.

See merge request easycorp/zentaopms!6306
2022-11-23 01:55:01 +00:00
liuhong 6f272700be * Fix bug #23269. 2022-11-23 00:48:31 +00:00
lanzongjun 284b748e7a Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-11-22 15:45:19 +08:00
lanzongjun a3f8f5f437 * Fix Task #77278 2022-11-22 14:23:01 +08:00
王怡栋 18d88bad03 Merge branch 'tianshujie_fixbug' into 'master'
* Fixed pager jump error in the use case list.

See merge request easycorp/zentaopms!6294
2022-11-22 06:01:41 +00:00
孙广明 f29f4aede8 Merge branch 'master_xieqiyu_77250' into 'master'
* Fix bug#30050.

See merge request easycorp/zentaopms!6295
2022-11-22 05:38:46 +00:00
xieqiyu 95b35e03a2 * Fix bug#30050. 2022-11-22 13:21:38 +08:00
tianshujie 672bbadffe * Removes the type prompt on the project list page name under the product. 2022-11-22 13:18:49 +08:00
mayue 1654280bbf * Fix bug #30031. 2022-11-22 11:07:10 +08:00
xieqiyu 46879558bb * Fix bug#30027. 2022-11-22 09:52:08 +08:00
王怡栋 52c59a98e0 * fix bug #30005. 2022-11-22 09:01:12 +08:00
孙广明 074d4c0e78 Merge branch 'master_bug_#29980' into 'master'
* Fix bug #29980.

See merge request easycorp/zentaopms!6274
2022-11-21 05:47:34 +00:00
wangjianhua 902a88f0e3 * Fix bug #29980. 2022-11-21 11:31:06 +08:00
tanghucheng bacdc498f8 * Fix bug #30011. 2022-11-21 11:19:59 +08:00
wangyuting 5df0b941b1 * Fix bug #29959. 2022-11-18 02:51:50 +00:00
xieqiyu 86812c33bf * Fix bug#29742. 2022-11-18 09:17:39 +08:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
wangyuting 362580122f * Fix bug #29929. 2022-11-17 02:17:51 +00:00
wangyuting b441fd0a4c * Fix bug #29840. 2022-11-16 01:13:08 +00:00
王怡栋 154e5fa81f Merge branch 'zentaopms_261_bug_#29614' into 'master'
* Fix bug #29614.

See merge request easycorp/zentaopms!6151
2022-11-15 03:15:33 +00:00
王怡栋 66be15c00f * fix bug #29736. 2022-11-15 11:13:04 +08:00
daitingting 175dd773cb * Fix bug #29614. 2022-11-15 03:12:33 +00:00
王怡栋 8d1cacab6f * fix bug. 2022-11-15 10:23:46 +08:00
xieqiyu 6263f5a84f * Fix bug#29618. 2022-11-11 13:12:34 +08:00
王怡栋 66b9e6b116 Merge branch 'master' into 'zentaopms258_wyd'
# Conflicts:
#   framework/base/router.class.php
2022-11-11 02:49:32 +00:00
wangyidong 8a178c72fe * adjust for project release link story and bug. 2022-11-11 10:47:01 +08:00
孙广明 b21f84513b Merge branch 'master_xieqiyu_fixbug' into 'master'
Master xieqiyu fixbug

See merge request easycorp/zentaopms!6104
2022-11-11 00:28:11 +00:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00