Commit Graph
3004 Commits
Author SHA1 Message Date
chaideqing 3a919802df *Fix bug#35714, incorrect number of product-project listings displayed per page. 2023-06-02 13:58:51 +08:00
Lufei a18eb36ab3 * Optimize program-browse page, Reduce get user. 2023-06-01 10:57:44 +08:00
Lufei 596da72282 * Remove pager from getList. 2023-06-01 10:19:31 +08:00
Lufei 5e7721deb6 * Optimize product all page. 2023-06-01 10:15:54 +08:00
hufangzhou 23a2936f08 * Finish task #94076. 2023-05-30 10:59:09 +08:00
songchenxuan 2a05766fe2 * Fix bug #31321, modify product story completion rate. 2023-05-16 10:10:58 +08:00
zhujinyong d5560c2d35 + Add consumed and teamCount of projects for performance optimization. 2023-05-12 09:31:20 +08:00
caoyanyi 34011cd91d * Fix bug #34444. 2023-04-28 14:52:02 +08:00
liumengyi 233394d25a * Fix bug #34925. 2023-04-28 14:29:53 +08:00
caoyanyi aa1fca3e47 * Fix bug #34666. 2023-04-26 00:35:01 +08:00
caoyanyi 3c97630f68 * Fix bug #34686. 2023-04-26 00:20:04 +08:00
caoyanyi c4b3b74a78 Merge branch '18.4' of https://git.zcorp.cc/easycorp/zentaopms into cyy_fixbug 2023-04-24 23:19:42 +08:00
caoyanyi 4d12147600 * Modify database field. 2023-04-24 23:17:42 +08:00
wangyidong 88fa8fc839 * fix bug #34750. 2023-04-24 18:56:38 +08:00
caoyanyi e266ad301a * Fix bug #34473. 2023-04-21 11:29:00 +08:00
hufangzhou d1ef10c951 * Completion of language items. 2023-04-21 10:46:06 +08:00
liumengyi b8e8c3d788 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 13:16:42 +08:00
wangyidong 0d31625643 * code for task #91388. 2023-04-18 13:05:14 +08:00
liumengyi 17ee6ad3f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 11:06:01 +08:00
朱金勇 28852fb5fe * Fix bug: order error. 2023-04-18 00:53:06 +00:00
liumengyi d971d4b4b7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-18 08:38:14 +08:00
wangyidong 5399ec46be * code for task #91381. 2023-04-17 17:14:56 +08:00
liumengyi 648dc288ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304 2023-04-14 15:15:03 +08:00
liumengyi 66770f07c2 * Rename the privilege of product-project. 2023-04-13 17:12:53 +08:00
王怡栋 e6be417612 Merge branch 'master' into 'tsj_task'
# Conflicts:
#   module/doc/view/lefttree.html.php
2023-04-13 09:03:14 +00:00
tianshujie 0c935c7eea * Modify jump link. 2023-04-13 15:45:51 +08:00
liumengyi f197999e42 - Delete the privilege of product-build. 2023-04-13 14:28:37 +08:00
朱金勇 bb531cfd2c * Fix bugs in dmdb. 2023-04-13 05:10:17 +00:00
zhouxin 980d508cb7 * Reslove feedback #2644. 2023-04-13 02:42:28 +00:00
tianshujie 324dfe4650 * Code for task #90780. 2023-04-12 09:08:51 +08:00
王怡栋 f1bc3b73cc Merge branch 'tsj_doc' into 'master'
* Code for task #90792.

See merge request easycorp/zentaopms!7343
2023-04-11 00:35:16 +00:00
朱金勇 0dde8ad3ed Fix default value of db. 2023-04-10 09:19:01 +00:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
Yagami 9bc7941349 * Code for feedback drop menu link error. 2023-04-10 09:12:23 +08:00
caoyanyi 5be38b3c6d * Modify api struct page product locate. 2023-04-07 16:03:55 +08:00
tianshujie f3897e5dc8 * Fixed an error message when clicking level 1.5 and then clicking Level
2.5.
2023-04-06 09:23:32 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
hufangzhou d29643cf57 * Revert the code. 2023-03-21 13:25:02 +08:00
hufangzhou 5bc154a69b * Fix bug #33088. 2023-03-20 15:39:28 +08:00
wangyuting2 4bf396b34c * Fix bug #33023. 2023-03-20 13:59:10 +08:00
wangyidong db49612b75 * fix bug #33059. 2023-03-17 13:06:38 +08:00
caoyanyi 1bc1e3fc0f * Adjust code. 2023-03-16 15:53:11 +08:00
caoyanyi a99ed812d3 * Code for bug #33010. 2023-03-16 15:37:12 +08:00
王怡栋 f526a16291 Merge branch 'master' into 'tsj_fixbug'
# Conflicts:
#   module/custom/lang/zh-cn.php
2023-03-15 06:19:32 +00:00
hufangzhou 047dfd6e54 * Fix bug #32940. 2023-03-15 14:09:10 +08:00
管西迎 d0817bc8a0 Merge branch 'hufangzhou_newVersion' into 'master'
* Add 18.3 version.

See merge request easycorp/zentaopms!7193
2023-03-15 03:10:17 +00:00
tianshujie 5f6f52e86e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_fixbug 2023-03-15 10:57:18 +08:00
管西迎 93ca7dda5f Merge branch 'tsj_fixbug' into 'master'
* Fix bug 32911.

See merge request easycorp/zentaopms!7192
2023-03-15 02:55:12 +00:00
tianshujie bdc83c7088 * Modify product line language. 2023-03-15 10:54:45 +08:00