Commit Graph
43843 Commits
Author SHA1 Message Date
Yagami 9bc7941349 * Code for feedback drop menu link error. 2023-04-10 09:12:23 +08:00
朱金勇 6e27c59147 * Fix importing demo data. 2023-04-08 15:01:22 +00:00
liugang 941bcc94aa * Remove unused code. 2023-04-07 09:53:14 +00:00
王怡栋 a1fc931700 Merge branch 'daitingting_delete_uselessfiles' into 'master'
* Remove useless files.

See merge request easycorp/zentaopms!7337
2023-04-07 09:39:24 +00:00
王怡栋 852c816439 Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3

See merge request easycorp/zentaopms!7334
2023-04-07 09:39:10 +00:00
wangyidong 6042806e2a * fix bug #33916. 2023-04-07 17:38:21 +08:00
wangyidong 56d2615fb4 * fix bug #33910. 2023-04-07 17:38:21 +08:00
caoyanyi 2f226e4107 * Modify release page title. 2023-04-07 17:18:54 +08:00
daitingting 2e25f4819a * Remove useless files. 2023-04-07 17:09:16 +08:00
caoyanyi 9522872d72 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 17:03:49 +08:00
caoyanyi fd558085ee * Modify module root data. 2023-04-07 17:03:29 +08:00
guofeilong bb91a63695 * Adjust code for bug in method addCata . 2023-04-07 16:55:37 +08:00
caoyanyi 5a0138a19c * Code for bug #33790. 2023-04-07 16:36:18 +08:00
王怡栋 9cb70b22a5 Merge branch 'release/zentaopms_18.3' into 'master'
Fix bug.

See merge request easycorp/zentaopms!7332
2023-04-07 08:32:19 +00:00
guofeilong f6114edda0 * Adjut code for js in doc . 2023-04-07 16:27:32 +08:00
caoyanyi 643ed3793d * Code for bug #33800. 2023-04-07 16:26:55 +08:00
wangyidong 37f33ac3b8 * fix bug #33910. 2023-04-07 16:23:34 +08:00
guofeilong 0cfc3d8426 * Code for adjust class in actions icon . 2023-04-07 16:08:30 +08:00
caoyanyi e90e7b9160 * Mofify api struct page locate. 2023-04-07 16:07:28 +08:00
caoyanyi 5be38b3c6d * Modify api struct page product locate. 2023-04-07 16:03:55 +08:00
guofeilong 37a6ad5a0b * Add mr to swapper dom in tableContent . 2023-04-07 15:54:57 +08:00
wangyidong 616e133d81 * fix bug #33746. 2023-04-07 15:53:00 +08:00
caoyanyi d5942030f7 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 15:42:19 +08:00
guofeilong 0b3d379106 * Adjust code for css in view . 2023-04-07 15:40:25 +08:00
王怡栋 2a978750f5 Merge branch 'master_xieqiyu_33833' into 'master'
* Code for bug#33833.

See merge request easycorp/zentaopms!7329
2023-04-07 07:37:55 +00:00
caoyanyi c79857c4c6 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 15:36:30 +08:00
caoyanyi 25587941ec * Modify name check. 2023-04-07 15:36:17 +08:00
guofeilong 87fa888809 * Adjust code for add text-primary to icon history . 2023-04-07 15:31:20 +08:00
guofeilong 1c34103699 * Adjust code for style refactors in tree . 2023-04-07 14:41:43 +08:00
guofeilong 3931fd7fcf * Adjust code for fix bug in scrollIntoView . 2023-04-07 14:26:54 +08:00
caoyanyi 61201dbc23 * Modify release delete style. 2023-04-07 14:25:46 +08:00
caoyanyi e647a19873 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 13:54:50 +08:00
caoyanyi e9e6e3f0c5 * Adjust code. 2023-04-07 13:54:40 +08:00
wangyidong 82f21675a3 * adjust code for task #89916. 2023-04-07 13:48:20 +08:00
caoyanyi e4ecc06430 Merge branch 'release/zentaopms_18.3' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 13:47:35 +08:00
caoyanyi 7790a2b758 * Modify create doc for lite vision. 2023-04-07 13:47:15 +08:00
guofeilong 94ecc551e2 * Adjust code for event click in history . 2023-04-07 13:36:17 +08:00
caoyanyi 1168de36c5 * Modify project space for lite vision. 2023-04-07 13:33:32 +08:00
caoyanyi 2b46f8ca9d * Modify edit api locate. 2023-04-07 13:13:33 +08:00
wangyidong a065b6e7d7 * code for task #89916. 2023-04-07 13:11:17 +08:00
wangyidong 56ae0cf008 * code for task #89916. 2023-04-07 12:30:10 +08:00
xieqiyu fc528ed89a * Code for bug#33833. 2023-04-07 03:30:24 +00: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
caoyanyi 13a7efb50c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3 2023-04-07 11:22:34 +08:00
caoyanyi 4ee58be39e * Add priv check. 2023-04-07 11:15:01 +08:00
guofeilong 09339199c1 * Adjust code for module view . 2023-04-07 11:12:19 +08:00
王怡栋 3d5bbbadcc Merge branch 'tsj_fixbug' into 'master'
* Fix bug.

See merge request easycorp/zentaopms!7324
2023-04-07 03:05:19 +00:00
wangyidong 882235b462 * fix bug for edit release. 2023-04-07 11:03:15 +08:00
wangyidong 38898d1a13 * code for task #89914. 2023-04-07 10:53:53 +08:00