Commit Graph
425 Commits
Author SHA1 Message Date
chaideqing e8c2e5a0b6 * Fix bug #43050. 2024-01-09 11:40:06 +08:00
tianshujie 7c228af342 * Fix an error of the product list. 2023-11-10 09:38:56 +08:00
tianshujie 2ab80164da * Fix an error of the product list. 2023-11-10 09:38:00 +08:00
mayue 46a9681314 Merge remote-tracking branch 'origin/18.x' into sprint/4352 2023-09-05 16:14:08 +08:00
zhujinyong 19170148fe * Use dbQuery() instead of dbh->query(). 2023-09-05 14:16:12 +08:00
mayue 374f89a409 * Add practice full-text index. 2023-09-04 15:19:38 +08:00
mayue b2aee1f85c * Add module link to practice. 2023-08-31 09:58:21 +08:00
zenggang 29f2f5187b * Merge 18.x 2023-08-28 10:27:22 +00:00
zenggang fdd027a824 * Merged 18.x 2023-08-28 09:30:26 +00:00
sunguangming 03aa827285 * Code for execution::task speed. 2023-08-09 09:57:24 +08:00
zhaoke 211f1cb427 * Fix error of host module. 2023-08-01 11:10:00 +08:00
zenggang bf74bf1c12 * Resouce setting 2023-07-31 08:27:06 +00:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou 41a2204422 * Fix bug #35916. 2023-06-21 10:09:32 +08:00
Yagami 27aef5138b * Finish task #92298. 2023-05-09 18:24:21 +08:00
tianshujie 32161d8d66 * Code for task #91391. 2023-04-18 10:23:03 +08:00
tianshujie 4e07580434 * Fix bug #34176. 2023-04-14 10:01:52 +08:00
xieqiyu 3ce26fb702 * Code for bug#33977. 2023-04-10 08:37:27 +00:00
caoyanyi fd558085ee * Modify module root data. 2023-04-07 17:03:29 +08:00
caoyanyi 643ed3793d * Code for bug #33800. 2023-04-07 16:26:55 +08:00
tianshujie adb4e70bda Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:30:05 +08:00
tianshujie 3a30a4e65a * Code for task #89910,89911. 2023-04-07 11:29:34 +08:00
liugang 8908ac2250 + Move the getGroupPairs from biz version to open source version. 2023-04-06 10:10:21 +00:00
tianshujie bcfd37f6e4 * Fix bug #33697. 2023-04-04 10:54:30 +08:00
tianshujie 790af2a19b * When deleting a directory, move the document. 2023-03-31 14:28:00 +08:00
caoyanyi eda1b7541a * Modify tips language. 2023-03-31 13:47:29 +08:00
tianshujie 87d0fe1434 * Code for task #89137. 2023-03-31 09:00:40 +08:00
tianshujie 0a9d779008 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-28 08:52:00 +08:00
caoyanyi 8f553370b0 * Update module sort. 2023-03-27 14:41:55 +08:00
caoyanyi 4712c71163 * Modify module update. 2023-03-27 13:52:23 +08:00
caoyanyi 3c24f9b54d Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-27 13:05:56 +08:00
caoyanyi 488915eab6 * Modify order update. 2023-03-27 13:05:41 +08:00
wangyidong c87ea9131a * fix for sonar. 2023-03-27 11:34:22 +08:00
tianshujie 9c908e4907 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-27 11:24:32 +08:00
caoyanyi 9e58c56930 * Modify module save. 2023-03-27 08:48:16 +08:00
tianshujie 49f278a092 * Modify create module method. 2023-03-24 09:16:24 +08:00
guofeilong 26d69ab0a2 * Adjust code . 2023-03-24 08:37:13 +08:00
caoyanyi 9fec0d5890 * Modify tree create. 2023-03-23 16:13:24 +08:00
tianshujie 45f2b40b7d Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-23 15:49:01 +08:00
tianshujie f98ec5fc1c * Fix error. 2023-03-23 15:48:50 +08:00
caoyanyi 4c20a2428d * Modify module create. 2023-03-23 14:51:00 +08:00
caoyanyi 1170c1ed95 + Add module create. 2023-03-23 09:05:34 +08:00
liumengyi cdeb1c7e4c * Finish task #86286. 2023-03-17 07:07:40 +00:00
liumengyi 94d4b5419b * Fix bug #32958. 2023-03-16 05:16:26 +00:00
liumengyi 34de9a5fe4 * Fix bug #32958. 2023-03-16 05:10:56 +00:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
xieqiyu 6d970f0935 * Code for task#79444. 2022-12-15 14:33:39 +08:00
lanzongjun 43b667ba2b * Finish Bug #30700 2022-12-08 16:16:16 +08:00
lanzongjun 47284dc742 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/zentaopms271_lanzongjun 2022-12-08 14:45:33 +08:00