Commit Graph

842 Commits

Author SHA1 Message Date
wangyidong
b670a47863 * fix bug #27958. 2022-10-08 15:32:49 +08:00
xieqiyu
eed9d18857 * Fix bug#27359. 2022-09-23 09:02:39 +00:00
tianshujie
6a7c69e14e * Finish task #70008. 2022-09-23 10:22:32 +08:00
tianshujie
073c3fc987 * Finish task #70008. 2022-09-22 10:27:55 +08:00
tianshujie
a8bdc9bc6c * Finish task #70008. 2022-09-22 09:07:11 +08:00
tanghucheng
714dffe615 * Fix bug for bug export. 2022-09-14 14:42:44 +08:00
tianshujie
226029f1e5 * Fix bug #27451. 2022-09-09 16:34:08 +08:00
tianshujie
b5630098eb * Fix bug #27449. 2022-09-09 16:10:34 +08:00
xieqiyu
dfe4de62a5 * Fix bug#26179. 2022-09-09 14:14:53 +08:00
xieqiyu
5c3ff64ce7 * Code for task#67691. 2022-09-08 11:14:53 +08:00
xieqiyu
97b4bb9487 * Code for task#67691. 2022-09-08 11:03:44 +08:00
xieqiyu
592a109bed * Code for task#67691. 2022-09-08 09:09:03 +08:00
lanzongjun
f7922c8c70 * fix bug #27198 2022-09-05 11:03:26 +08:00
xieqiyu
6bcc09aeca * Fix bug#27244. 2022-09-02 14:42:22 +08:00
lanzongjun
91da8c65f6 remove feedback action 2022-09-02 13:17:27 +08:00
王怡栋
58c0d43da5 Merge branch 'master_xieqiyu_66955' into 'master'
Master xieqiyu 66955

See merge request easycorp/zentaopms!5219
2022-09-01 03:05:12 +00:00
xieqiyu
16094e64d4 * Optimize code. 2022-09-01 11:04:08 +08:00
xieqiyu
d552aa67f9 * Code for task#66955. 2022-09-01 10:47:58 +08:00
lanzongjun
07c97f4072 modify processed 2022-09-01 09:40:57 +08:00
lanzongjun
71cd04f05d modify processed 2022-09-01 09:37:59 +08:00
lanzongjun
11ace1e2da Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/master_lanzongjun_fixbug 2022-09-01 09:11:23 +08:00
lanzongjun
1a65713332 * finish task #66992 2022-09-01 09:11:10 +08:00
xieqiyu
e6bc611d14 * Finish task#66955. 2022-08-31 19:20:02 +08:00
xieqiyu
b026b7c494 * Code for task#66955. 2022-08-31 18:27:42 +08:00
李玉春
0bc581b21c Merge branch 'sprint/235' into 'master'
Sprint/235

See merge request easycorp/zentaopms!5216
2022-08-31 08:19:32 +00:00
tianshujie
b9190b8d92 * Solve bug link bug search all products reported errors. 2022-08-30 15:14:36 +08:00
lanzongjun
c26a7c3a3a * fix bug #26990 2022-08-29 13:28:13 +08:00
zenggang
494474d349 * Fix sprint231 bugs 2022-08-26 05:10:26 +00:00
王怡栋
297a416762 Merge branch 'master' into 'sprint/231_zg_65782'
# Conflicts:
#   module/story/control.php
2022-08-25 00:51:00 +00:00
王怡栋
00b8ffc6f7 Merge branch 'sprint/unittest_liumengyi_bug' into 'master'
* Unit test of bug.

See merge request easycorp/zentaopms!4993
2022-08-24 05:47:55 +00:00
zenggang
c424e450cb * Adjust code 2022-08-24 03:28:59 +00:00
zenggang
73c8091a82 * Finish task#65782,65779 2022-08-24 03:24:03 +00:00
tianshujie
3a99afd287 * Finish task #65808,65807. 2022-08-23 16:12:52 +08:00
tianshujie
44d270da18 * Finish task #65808. 2022-08-23 15:48:20 +08:00
tianshujie
dca2784559 * Finish task #65808. 2022-08-23 15:02:57 +08:00
liumengyi
545d74f7d0 * Optimize code for task #65808, #65807. 2022-08-23 14:50:40 +08:00
tianshujie
4e1ca8bd60 * Finish task #65808. 2022-08-23 13:40:34 +08:00
liumengyi
20041ea696 * Fix bug #26723. 2022-08-22 11:12:38 +08:00
曾刚
3172961404 Sprint/228 zg tasks and units 2022-08-18 07:15:14 +00:00
liumengyi
63c69a104e * Unit test of bug. 2022-08-17 14:35:27 +08:00
tianshujie
6bd27a7aeb * Finish task #63687. 2022-08-15 19:33:12 +08:00
tianshujie
4f08c31607 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-15 10:48:36 +08:00
tanghucheng
935cb51b5b * Fix bug for port showimport. 2022-08-14 13:14:48 +08:00
tianshujie
4cc14dfe59 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/224_tianshujie_63687 2022-08-11 11:04:58 +08:00
liumengyi
61b7e90275 * Load language file. 2022-08-10 15:44:06 +08:00
王怡栋
d51846a966 Merge branch 'importExport' into 'master'
* Code for port.

See merge request easycorp/zentaopms!4875
2022-08-10 01:32:04 +00:00
王怡栋
1ef8043796 Merge branch 'sprint/devplat_31' into 'master'
* Finish task #63896.

See merge request easycorp/zentaopms!4877
2022-08-10 01:08:40 +00:00
tianshujie
1838710b42 * Finish task #63696,63695,63687. 2022-08-10 09:02:49 +08:00
tanghucheng
5544a9ded5 * Code for port. 2022-08-09 21:11:36 +08:00
daitingting
088a414920 * Finish task #63896. 2022-08-09 09:21:43 +00:00