Commit Graph

615 Commits

Author SHA1 Message Date
朱金勇
79fc91885c * Hide backup menu if using dmdb. 2023-04-17 09:39:28 +00:00
朱金勇
7969effc29 * Fix bug#34139, 34238, 34075. 2023-04-16 13:54:16 +00:00
liugang
93e71f8861 * Call getDatabaseVersion instead of getMysqlVersion. 2023-04-06 02:05:02 +00:00
朱金勇
22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇
7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
caoyanyi
ec2e0276de * Optimize api page style. 2023-04-03 17:11:27 +08:00
tianshujie
1cb2dc55d4 * Code for fix bug #33014. 2023-03-16 16:21:33 +08:00
caoyanyi
068b071db8 * Code for Bug #32994. 2023-03-16 11:29:36 +08:00
liumengyi
f643f3bd93 * Fix bug #32945. 2023-03-15 08:44:01 +00:00
liumengyi
637b0912a7 * Finish task #87013. 2023-03-13 07:07:13 +00:00
tianshujie
6e90ea6cab * Fix bug 32749. 2023-03-13 09:51:18 +08:00
tianshujie
a0a895be03 * Fix bug 32749. 2023-03-10 10:23:23 +08:00
tianshujie
6c4eb8b8c3 * Changed the default jump link of the personnel management block. 2023-03-09 14:56:17 +08:00
王怡栋
3438722a8c Merge branch 'master' into 'zentaopms_289'
# Conflicts:
#   db/update18.2.sql
2023-03-06 03:26:34 +00:00
Yagami
f95691948a Merge branch 'zentaopms_294' 2023-03-06 08:37:11 +08:00
caoyanyi
86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
王怡栋
179d3998f2 Merge branch 'dev/gfl_views_refacotrs_admin' into 'master'
* Adjust code in admin.

See merge request easycorp/zentaopms!7133
2023-03-02 09:08:27 +00:00
王怡栋
2534dd97e4 Merge branch 'admin_bug_32593' into 'master'
Admin bug 32593

See merge request easycorp/zentaopms!7134
2023-03-02 09:08:12 +00:00
caoyanyi
58d9fd2ee9 * Fix bug #32593. 2023-03-02 17:04:44 +08:00
郭飞龙
95184b53a3 * Adjust code in control.php. 2023-03-02 09:00:04 +00:00
guofeilong
f1c5c8c82c * Adjust code in admin. 2023-03-02 16:58:42 +08:00
郭飞龙
7ebf700fd4 * Adjust code. 2023-03-02 06:57:28 +00:00
caoyanyi
a261f37af4 * Add zentao api get. 2023-03-02 14:51:35 +08:00
guofeilong
75b2f2abe6 * Code for view refactors in admin . 2023-03-02 14:34:20 +08:00
caoyanyi
25f195767f Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 13:18:34 +08:00
wangyidong
6ba9f87069 * code for bug #32512. 2023-03-02 10:08:29 +08:00
tianshujie
3886a5f25b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-02 08:27:28 +08:00
guofeilong
e23d18108b * Code for change lang in admin. 2023-03-01 17:22:08 +08:00
孙广明
db4662cfbc Merge branch 'cyy_bug' into 'master'
* Fix bug #32549.

See merge request easycorp/zentaopms!7109
2023-03-01 09:13:25 +00:00
caoyanyi
edc301d455 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 15:24:30 +08:00
wangyidong
1290b01c85 * adjust extension api for admin. 2023-03-01 15:11:02 +08:00
caoyanyi
6fb473eeea * Fix bug #32549. 2023-03-01 14:31:40 +08:00
caoyanyi
bec24aafa9 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 11:52:44 +08:00
王怡栋
05142a4c39 Merge branch 'fixbug_liumengyi_32414' into 'master'
* Fix bug 32414.

See merge request easycorp/zentaopms!7099
2023-03-01 03:06:17 +00:00
liumengyi
57c46206e9 * Fix bug #32525. 2023-03-01 03:01:40 +00:00
caoyanyi
64de9482d8 * Modify plugins locate. 2023-03-01 10:26:29 +08:00
tianshujie
b0b5babbd4 * Added the determination that the editor configuration item does not
exist.
2023-03-01 10:25:17 +08:00
caoyanyi
f5a93d1166 * Fix bug #32517. 2023-03-01 10:15:17 +08:00
caoyanyi
a32120f52b * Fix bug #32516. 2023-03-01 09:28:10 +08:00
wangyidong
01bb8130dd Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-01 08:50:31 +08:00
wangyidong
1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
caoyanyi
0eb7b70d48 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 17:07:32 +08:00
tianshujie
f0ff736880 * Code for fix bug #32473. 2023-02-28 13:55:12 +08:00
caoyanyi
ac2891ac41 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 13:53:09 +08:00
tianshujie
c82f1a02a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into tsj_ui 2023-02-28 13:13:13 +08:00
caoyanyi
ef0c77d611 * Modify tutorial tip. 2023-02-28 12:28:15 +08:00
tianshujie
f6a573a51f * Code for fix bug #32458. 2023-02-28 10:32:13 +08:00
caoyanyi
8d6459f66f * Modify branch name. 2023-02-28 09:57:03 +08:00
tianshujie
5fe4075ef1 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-28 08:26:03 +08:00
tianshujie
28b40db1de * Modify helper url for admin block. 2023-02-27 16:48:56 +08:00