Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
53,457 Commits 2 Branches 292 Tags
81ff9b726a3e7ba0f4836bc812fb4e75dccc66a5
Commit Graph
53457 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
tianshujie 81ff9b726a Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 10:00:11 +08:00
caoyanyi ea55ca8c33 * Add api priv and switch api doc release locate. 2023-04-07 09:30:02 +08:00
tianshujie 4bc2e44942 * Code for task #89911. 2023-04-07 08:22:33 +08:00
caoyanyi 4260e92cdd Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 08:18:46 +08:00
tianshujie 639e36d34c Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 17:03:16 +08:00
tianshujie bb84c7a731 * Change the name of my spatial function. 2023-04-06 16:57:14 +08:00
guofeilong 828cc038ec * Adjust code . 2023-04-06 16:46:47 +08:00
guofeilong c846da6bf3 * Adjust code for hover in tree . 2023-04-06 16:15:58 +08:00
guofeilong d840e25da5 * Adjust code for show-icon in left-tree . 2023-04-06 16:09:22 +08:00
tianshujie fc3accb1b0 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 16:02:02 +08:00
tianshujie 8dcb58fdc3 * Add a jump and highlight to the left tree. 2023-04-06 16:01:39 +08:00
guofeilong 7b0cb461fe * ZUI: class menu-hover-primary refactors . 2023-04-06 15:47:34 +08:00
liugang 69029b4154 + Add chart and dimension to openModules to prevent them from being moved to the extension/custom directory when upgrading. 2023-04-06 15:44:57 +08:00
liugang 7c88ea6cdb * Fix error the global $dao variable is replaced with a new instance when call function loadModel. 2023-04-06 15:44:57 +08:00
wangyidong fa1cd1a510 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 15:41:07 +08:00
wangyidong bf357072af * add other lang and export width. 2023-04-06 15:40:45 +08:00
guofeilong a882f21348 * Add pd-r to class hover in a . 2023-04-06 15:33:11 +08:00
caoyanyi 34c119b939 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 15:32:53 +08:00
tianshujie 8be6397778 * Fixed an issue where the document was not clickable. 2023-04-06 15:32:45 +08:00
wangyidong 718c8141c9 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 14:01:07 +08:00
tianshujie 25a178fbc2 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 13:08:03 +08:00
tianshujie 0e813c1ea3 * Refactoring list page. 2023-04-06 13:07:36 +08:00
wangyidong 6da539e2d5 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 12:01:03 +08:00
guofeilong f709a48323 * Adjust code . 2023-04-06 11:29:42 +08:00
wangyidong 4dfeb167cb Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 11:25:30 +08:00
wangyidong 85f5056b33 * code for task #89916. 2023-04-06 11:25:08 +08:00
guofeilong fbae4bca3a * Adjust code . 2023-04-06 11:04:47 +08:00
guofeilong 16e4454805 * Adjust code . 2023-04-06 11:00:03 +08:00
caoyanyi 698b868dcd Merge branch 'mine_doc' into release/zentaopms_18.3 2023-04-06 10:49:31 +08:00
caoyanyi 30a90eb1f9 * Modify language. 2023-04-06 10:48:54 +08:00
tianshujie 16441a1893 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 10:48:53 +08:00
tianshujie 318c9ec581 * Add lang. 2023-04-06 10:48:42 +08:00
caoyanyi 8ff704aaea Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc 2023-04-06 10:43:39 +08:00
caoyanyi 5fdaaf5778 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into mine_doc 2023-04-06 10:40:20 +08:00
caoyanyi fcd76f31ce Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 10:39:36 +08:00
caoyanyi 7d976a5f1c * Modify order for menu. 2023-04-06 10:38:44 +08:00
wangyidong a5421e4940 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 10:30:52 +08:00
wangyidong 56791f12ef * code for task #89916. 2023-04-06 10:29:23 +08:00
tianshujie 47780015f8 * Fixed the bottom paging style problem。 2023-04-06 10:27:21 +08:00
liugang 93e71f8861 * Call getDatabaseVersion instead of getMysqlVersion. 2023-04-06 02:05:02 +00:00
胡方舟 80442281d6 Merge branch 'sprint/fixbug#33382' into 'master' 
* Fix bug #33382.

See merge request easycorp/zentaopms!7280
 2023-04-06 01:52:47 +00:00
caoyanyi c89efa5632 * Add version for api lib. 2023-04-06 09:31:31 +08:00
guofeilong 9484c73fba * Adjust code . 2023-04-06 09:28:51 +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
tianshujie 75d07972ab * Code for task #89915. 2023-04-06 09:14:00 +08:00
tianshujie ce25a89da4 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-06 09:01:44 +08:00
tianshujie e6591f64d8 * Fix bug #33759. 2023-04-06 08:57:42 +08:00
王怡栋 2e98282d5a Merge branch 'daitingting_task_#89956' into 'master' 
* Finish task #89956.

See merge request easycorp/zentaopms!7315
 2023-04-06 00:55:24 +00:00
王怡栋 79bc2f4d1f Merge branch 'release/zentaopms_18.3' into 'master' 
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7314
 2023-04-06 00:55:08 +00:00
王怡栋 e1933a9b50 Merge branch 'daitingting_task_#89954' into 'master' 
* Finish task #89954.

See merge request easycorp/zentaopms!7313
 2023-04-06 00:54:46 +00:00