Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
53,467 Commits 2 Branches 292 Tags
4a9fe5dcebc9bd8b94bc987fa4a1733fcb9ba4ff
Commit Graph
53467 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
wangyidong 4a9fe5dceb * fix bug #33864. 2023-04-07 10:00:33 +08:00
朱金勇 2b9e5f4d95 Fix bug#33806. 2023-04-07 01:21:31 +00:00
朱金勇 4b399ad8f7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2023-04-07 01:13:42 +00:00
朱金勇 3516d6c670 - Remove registerDate in assetlib table. 2023-04-07 01:11:28 +00:00
王怡栋 692b526a2f Merge branch 'release/zentaopms_18.3' into 'master' 
* Merge master.

See merge request easycorp/zentaopms!7322
 2023-04-07 00:45:31 +00:00
王怡栋 2240876de1 Merge branch 'zentaobiz37_bi_wangyuting' into 'master' 
* Add new goview css and js.

See merge request easycorp/zentaopms!7319
 2023-04-07 00:43:11 +00:00
tianshujie 4bc2e44942 * Code for task #89911. 2023-04-07 08:22:33 +08:00
朱金勇 3f7a2e39e1 Fix: no dao->get() in control. 2023-04-07 00:16:15 +00: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
wangyidong 812f4db7b1 * fix bug for can not select integrated build in create bug. 2023-04-06 16:11:49 +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
王怡栋 e15384c51a Merge branch 'dev/gfl_zui_files_refactors' into 'master' 
* ZUI: class menu-hover-primary refactors .

See merge request easycorp/zentaopms!7321
 2023-04-06 07:47:04 +00: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 0ad4ef6258 * ZUI: class menu-hover-primary refactors . 2023-04-06 15:37:35 +08:00
guofeilong a882f21348 * Add pd-r to class hover in a . 2023-04-06 15:33:11 +08:00
tianshujie 8be6397778 * Fixed an issue where the document was not clickable. 2023-04-06 15:32:45 +08:00
liugang 2155f0894d + Add chart and dimension to openModules to prevent them from being moved to the extension/custom directory when upgrading. 2023-04-06 06:09:39 +00: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
wangyuting2 ed9ad722e1 * Add new goview css and js. 2023-04-06 13:34:36 +08:00
liugang 5f54d5e5e4 * Fix error the global $dao variable is replaced with a new instance when call function loadModel. 2023-04-06 05:22:14 +00: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
王怡栋 a97505ff78 Merge branch 'release/zentaopms_18.3' into 'master' 
* Fixed an error message when clicking level 1.5 and then clicking Level

See merge request easycorp/zentaopms!7318
 2023-04-06 03:27:14 +00: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