Commit Graph
53414 Commits
Author SHA1 Message Date
hufangzhou 932a524e8d * Init data for priv package. 2023-04-03 16:39:19 +08:00
liumengyi d3cf4b54f4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295 2023-04-03 09:58:23 +08:00
王怡栋 bf5c829e3d Merge branch 'sprint/304_liumengyi_89851' into 'master'
* Finish task #89851.

See merge request easycorp/zentaopms!7286
2023-04-03 01:45:23 +00:00
王怡栋 db1a0eaa3e Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7285
2023-04-03 01:42:28 +00:00
guofeilong fc8dde8886 * Adjust code . 2023-04-03 09:42:02 +08:00
liumengyi 295c53d6ee * Finish task #89851. 2023-04-03 09:22:02 +08:00
caoyanyi d477203aa7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-03 08:30:03 +08:00
王怡栋 38bf8ab00a Merge branch 'bugfix/liumengyi_sql' into 'master'
* Add sql for 18.3.

See merge request easycorp/zentaopms!7284
2023-04-03 00:23:26 +00:00
王怡栋 891c84525f Merge branch 'daitingting_process_upgrade' into 'master'
* Process upgrade.

See merge request easycorp/zentaopms!7283
2023-04-03 00:22:59 +00:00
wangyidong 26d9d2ba55 * adjust for edit doc. 2023-03-31 17:54:29 +08:00
tianshujie 23dfbe0667 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 16:57:30 +08:00
tianshujie 37b16858f9 * Fix bug #33619. 2023-03-31 16:57:07 +08:00
wangyidong 31f4f00d76 * code for task #89523. 2023-03-31 16:00:11 +08:00
guofeilong 4368b5ccde * Adjust code . 2023-03-31 15:57:33 +08:00
tianshujie 9c446300d6 * Fixed product pull-down issues. 2023-03-31 15:49:53 +08:00
tianshujie 8245fca7a7 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 15:47:18 +08:00
tianshujie 651edfc559 * Fix bug #33614. 2023-03-31 15:46:50 +08:00
liumengyi 3b80b52f9a Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 15:34:06 +08:00
tianshujie c41510da26 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 15:33:33 +08:00
tianshujie 5f12dbc1e5 * Fix bug #33612. 2023-03-31 15:33:18 +08:00
liumengyi ae4d1355f7 * Add comment. 2023-03-31 15:33:14 +08:00
liumengyi f5f2b18d28 * Add doc checkApiLibName unit test. 2023-03-31 15:32:20 +08:00
caoyanyi ec83343d65 * Modify api space locate. 2023-03-31 15:22:01 +08:00
caoyanyi 2b69b31dd3 * Code fro bug #33600. 2023-03-31 15:09:16 +08:00
tianshujie f7883dbb60 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 14:55:00 +08:00
tianshujie 98b1094e0e * Add a button to add library to the attachment library. 2023-03-31 14:53:07 +08:00
caoyanyi 09d6874a58 * Code for bug #33408. 2023-03-31 14:52:24 +08:00
caoyanyi 500768ceb1 * Code for bug #33413. 2023-03-31 14:45:27 +08:00
tianshujie 9fd3609db1 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 14:28:23 +08:00
tianshujie 790af2a19b * When deleting a directory, move the document. 2023-03-31 14:28:00 +08:00
liumengyi a0ccbb4475 * Fix bug #33609. 2023-03-31 14:25:05 +08:00
caoyanyi 41381da279 * Modify project space style. 2023-03-31 14:16:38 +08:00
tianshujie c5157b9d4c * Add test case for doc module. 2023-03-31 14:11:24 +08:00
tianshujie 5ec63fabd1 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 13:49:03 +08:00
tianshujie 535fc22c34 * Fix bug #33567. 2023-03-31 13:48:30 +08:00
caoyanyi eda1b7541a * Modify tips language. 2023-03-31 13:47:29 +08:00
daitingting 790df501b0 * Process upgrade. 2023-03-31 13:40:17 +08:00
孙广明 fbb79f1cdd Merge branch 'sprint/scx_addzentao-sql' into 'master'
* Add sql from update18-3 to zentao-sql.

See merge request easycorp/zentaopms!7281
2023-03-31 05:38:18 +00:00
liumengyi 5ad87efbc0 * Add sql for 18.3. 2023-03-31 13:33:03 +08:00
caoyanyi 298e1f9dc0 * Modify module edit language. 2023-03-31 13:31:56 +08:00
宋辰轩 17dab4c121 * Add sql from update18-3 to zentao-sql. 2023-03-31 13:28:13 +08:00
caoyanyi ea2b221b4a * Modify module create. 2023-03-31 11:29:24 +08:00
tianshujie a93d9724d2 * Modify the position of the Favorites button. 2023-03-31 11:23:14 +08:00
tianshujie 259a48e7d6 * Code for task #89162. 2023-03-31 11:10:07 +08:00
tianshujie dd40024874 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 11:00:20 +08:00
tianshujie 4f0953139c * Code for task #87405. 2023-03-31 10:59:40 +08:00
liumengyi 1d51a5ab11 * Fix bug of edit api lib. 2023-03-31 10:59:28 +08:00
caoyanyi b47c1d5f45 * Modify code error. 2023-03-31 10:56:25 +08:00
wangyidong e24a70f5b7 * code for task #89150. 2023-03-31 10:46:52 +08:00
caoyanyi d2de18b9b3 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-03-31 10:41:51 +08:00