Commit Graph
142 Commits
Author SHA1 Message Date
chaideqing c382aafd9f * Merge commit: f3ee36f392. 2023-11-08 01:35:32 +00:00
tianshujie c77c11ed15 * Fix bug #40222. 2023-11-06 14:41:34 +08:00
Lufei dd81913f86 * Fix bug #35387, Optimize ajaxSetZentaoData. 2023-11-03 08:53:34 +08:00
liugang 9668e8b5f7 * admin: Move declaration of EXT_MANAGER_VERSION constant from model.php to zen.php. 2023-05-16 10:59:05 +08:00
liugang 6e9b95965f * Move the functions to sync data from https://www.zentao.net from model.php to zen.php. 2023-05-15 17:24:44 +08:00
liugang 0f7c801c31 * admin: rename news to dynamic. 2023-05-15 17:02:17 +08:00
liugang 6490655cb1 * admin: simplify the function adminModel::getZentaoData(). 2023-05-15 16:52:16 +08:00
liugang 86158291cf * admin: rename news to dynamics. 2023-05-15 16:49:49 +08:00
liugang 561bb2cb9c * Rename publicClass to classes. 2023-05-15 16:44:04 +08:00
liugang 9c8101df60 * Rename publicclass to publicClass. 2023-05-15 16:31:04 +08:00
liugang a5f990038c * admin: fetch the data synchronized from https://www.zentao.net from the zt_config table instead of the zt_block table. 2023-05-15 15:56:10 +08:00
liugang 15b0c475d2 * Save the data synchronized from https://www.zentao.net into the zt_config table instead of the zt_block table. 2023-05-15 15:53:30 +08: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 068b071db8 * Code for Bug #32994. 2023-03-16 11:29:36 +08: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
caoyanyi 86c6968243 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-03-03 08:48:41 +08:00
caoyanyi 58d9fd2ee9 * Fix bug #32593. 2023-03-02 17:04:44 +08:00
caoyanyi a261f37af4 * Add zentao api get. 2023-03-02 14:51:35 +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
孙广明 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
tianshujie b0b5babbd4 * Added the determination that the editor configuration item does not
exist.
2023-03-01 10:25:17 +08:00
wangyidong 1a352410a6 * code for task #85503. 2023-03-01 08:49:44 +08:00
tianshujie 8208608430 * Compatible with earlier versions of php. 2023-02-17 17:32:46 +08:00
tianshujie 0e7556ab18 * Compatible with php version. 2023-02-17 11:22:49 +08:00
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
tianshujie 483608b3f7 * Fixed incorrect order of tertiary navigation links. 2023-02-14 14:31:29 +08:00
wangyidong ff66b39a2a * code for task #83736. 2023-02-10 17:37:50 +08:00
tianshujie dae8b91fe1 * Modify the ash logic. 2023-02-10 14:33:22 +08:00
tianshujie 0e76cbe2d0 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-10 10:55:21 +08:00
wangyidong cb153273d0 * adjust for admin set menu. 2023-02-10 10:00:37 +08:00
tianshujie 1c61123375 * Dynamically determine the link to the mail navigation. 2023-02-10 09:57:28 +08:00
tianshujie 58f3310e03 * Reorder secondary navigation. 2023-02-10 09:27:40 +08:00
tianshujie 081c55f5ab Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_tsj 2023-02-09 10:54:28 +08:00
tianshujie bc73b6d379 * Code for finish task #83727. 2023-02-09 09:59:56 +08:00
wangyidong 7169cd0397 * adjust for video image. 2023-02-08 17:00:04 +08:00
wangyidong 43f31bbe44 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 16:27:17 +08:00
wangyidong bc833a572e * adjust for task #83746. 2023-02-08 16:06:45 +08:00
caoyanyi 88ad600143 * Adjust code. 2023-02-08 15:53:04 +08:00
caoyanyi 43866fe1c9 * Adjust code. 2023-02-08 15:29:53 +08:00
tianshujie 759b734665 * Code for finish task #83726. 2023-02-08 15:09:09 +08:00
guofeilong 093a84f9ee Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_getDate 2023-02-08 15:07:05 +08:00