Commit Graph
47872 Commits
Author SHA1 Message Date
朱金勇 927e7f7b57 Merge branch 'sprint/gh-104' into 'master'
* Fix GH-104, Get extension removePath error.

See merge request easycorp/zentaopms!6236
2022-11-18 01:40:11 +00:00
Lufei 4fe09fb507 * Fix GH-104, Get extension removePath error. 2022-11-18 08:49:38 +08:00
王怡栋 2f270f3808 Merge branch 'sprint/zentaopms262_mayue_bug#29755' into 'master'
* Fix bug #29755.

See merge request easycorp/zentaopms!6233
2022-11-18 00:37:39 +00:00
朱金勇 2db6b1eb35 Merge branch 'sprint/backup' into 'master'
* Optimize checkSafeFile tips for backup.

See merge request easycorp/zentaopms!6230
2022-11-17 14:38:54 +00:00
朱金勇 972cf6fc6e Merge branch 'sprint/copyright' into 'master'
* Update copyright and remove config url items.

See merge request easycorp/zentaopms!6222
2022-11-17 10:53:29 +00:00
王怡栋 e4c02e2857 Merge branch 'zentaopms_258_task#76435' into 'master'
* Finish task #76435、76436、76437.

See merge request easycorp/zentaopms!6234
2022-11-17 08:47:30 +00:00
王怡栋 9d7b30f699 Merge branch 'zentaopms_258_task#76434' into 'master'
* Finish task #76434.

See merge request easycorp/zentaopms!6231
2022-11-17 08:47:11 +00:00
wangyuting 97073567df * Finish task #76435、76436、76437. 2022-11-17 08:42:31 +00:00
孙广明 9e573b74d7 Merge branch 'master_xieqiyu_76423' into 'master'
* Fix bug#29430.

See merge request easycorp/zentaopms!6218
2022-11-17 08:09:01 +00:00
孙广明 0e8063d20c Merge branch 'master_xieqiyu_29909' into 'master'
* Fix bug#29909.

See merge request easycorp/zentaopms!6220
2022-11-17 08:08:49 +00:00
孙广明 40cc794db9 Merge branch 'master_xieqiyu_29941' into 'master'
* Fix bug#29941.

See merge request easycorp/zentaopms!6228
2022-11-17 08:08:31 +00:00
mayue 3ef1c553c4 * Fix bug #29755. 2022-11-17 16:04:56 +08:00
wangyuting 532bef39f3 * Finish task #76434. 2022-11-17 08:03:03 +00:00
Lufei 5233ebd813 * Optimize checkSafeFile tips for backup. 2022-11-17 15:50:55 +08:00
xieqiyu 67017be897 * Fix bug#29883. 2022-11-17 15:41:39 +08:00
xieqiyu d2771d367b * Fix bug#29941. 2022-11-17 15:15:20 +08:00
王怡栋 6c72e8755c Merge branch 'sprint/hufangzhou_xuan_commit' into 'master'
* Adjust xuanxuan commit.

See merge request easycorp/zentaopms!6224
2022-11-17 06:54:23 +00:00
王怡栋 f2a619e7f2 Merge branch 'xuan_fix_global_search' into 'master'
* fix getBoundingClientRect of undefined.

See merge request easycorp/zentaopms!6225
2022-11-17 06:54:09 +00:00
王怡栋 93106a919b Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76407#76411

See merge request easycorp/zentaopms!6223
2022-11-17 06:53:02 +00:00
王怡栋 6146fb46bd Merge branch 'zentaopms_258_bug#29924' into 'master'
* Fix bug #29924.

See merge request easycorp/zentaopms!6219
2022-11-17 06:52:10 +00:00
王怡栋 4594970a5b Merge branch 'zentaopms_258_bug#29636' into 'master'
Zentaopms 258 bug#29636

See merge request easycorp/zentaopms!6217
2022-11-17 06:51:50 +00:00
王怡栋 bd06894530 Merge branch 'zentaopms_258_bug#29929' into 'master'
* Fix bug #29929.

See merge request easycorp/zentaopms!6216
2022-11-17 06:51:38 +00:00
王怡栋 515ee5c5c1 Merge branch 'sprint/zentaopms262_mayue_bug#29428' into 'master'
* Fix bug #29428.

See merge request easycorp/zentaopms!6226
2022-11-17 06:51:22 +00:00
王怡栋 6d2f954054 Merge branch 'sprint/zentaopms262_mayue_bug#29468' into 'master'
* Fix bug #29468.

See merge request easycorp/zentaopms!6221
2022-11-17 06:50:51 +00:00
mayue 55947f4fec * Fix bug #29428. 2022-11-17 14:49:32 +08:00
lanzongjun dc998d0082 * Fix task #76411 2022-11-17 14:40:50 +08:00
hufangzhou a344340f1c * Remove the unwanted xuan sql. 2022-11-17 06:11:54 +00:00
dingyongliang 3796966b17 * fix getBoundingClientRect of undefined. 2022-11-17 06:10:46 +00:00
hufangzhou 825a67ca8f * Adjust xuanxuan commit. 2022-11-17 06:06:11 +00:00
lanzongjun 9c2bdb2081 * Fix task #76407 2022-11-17 14:04:37 +08:00
Lufei 49f6118bb2 - Remove useless config items. 2022-11-17 14:01:46 +08:00
王怡栋 93a772e01e * fix bug #29834. 2022-11-17 14:01:33 +08:00
Lufei 4328c922aa * Fix year in copyright. 2022-11-17 14:01:25 +08:00
mayue 0d50c31c0c * Fix bug #29468. 2022-11-17 13:04:52 +08:00
朱金勇 268ded73c7 Merge branch 'ta_liyang' into 'master'
Ta liyang

See merge request easycorp/zentaopms!6173
2022-11-17 03:13:46 +00:00
王怡栋 fc2945ccbd Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-17 11:11:34 +08:00
王怡栋 2b7f25bc6c * fix bug #29838. 2022-11-17 11:10:17 +08:00
xieqiyu df629b33bf * Fix bug#29940. 2022-11-17 11:08:59 +08:00
xieqiyu 6039c833a2 * Fix bug#29909. 2022-11-17 11:02:07 +08:00
wangyuting 17602d5113 * Fix bug #29924. 2022-11-17 02:38:27 +00:00
xieqiyu 4a7b338bad * Fix bug#29430. 2022-11-17 10:36:25 +08:00
wangyuting 362580122f * Fix bug #29929. 2022-11-17 02:17:51 +00:00
wangyuting 2a780454cf * Optimize code. 2022-11-17 02:14:31 +00:00
王怡栋 3cd2f91458 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix task #76409

See merge request easycorp/zentaopms!6215
2022-11-17 02:13:19 +00:00
王怡栋 2e081b8df3 Merge branch 'zentaopms_258_bug#29639' into 'master'
* Fix bug #29639.

See merge request easycorp/zentaopms!6214
2022-11-17 02:13:05 +00:00
王怡栋 17caecc9af Merge branch 'zentaopms_261_bug_#29658' into 'master'
* Fix bug #29658.

See merge request easycorp/zentaopms!6213
2022-11-17 02:12:47 +00:00
wangyuting 911a809057 * Fix bug #29636. 2022-11-17 02:09:17 +00:00
lanzongjun 6b7b4ae6c2 * Fix task #76409 2022-11-17 10:06:22 +08:00
wangyuting 34b1911104 * Fix bug #29639. 2022-11-17 02:03:43 +00:00
王怡栋 8ae7bd1a00 Merge branch 'sprint/zentaopms262_mayue_bug#28841' into 'master'
* Fix bug #28841.

See merge request easycorp/zentaopms!6208
2022-11-17 02:02:55 +00:00