Commit Graph
344 Commits
Author SHA1 Message Date
liumengyi 3f63404953 * Finish task #86258. 2023-03-06 06:09:13 +00: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
tianshujie eef2c1c356 * Change the order of the custom navigation. 2023-02-28 15:36:04 +08:00
tianshujie 2a003865f4 * Code for finish task #84526. 2023-02-28 09:09:16 +08:00
caoyanyi f2441f7197 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-27 15:28:14 +08:00
liugang c9115f7a21 * Revert menus, privileges and pages of report. 2023-02-27 06:39:37 +00:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
wangyidong 9e1cfb2b25 * code for task #84532. 2023-02-16 14:53:30 +08:00
wangyidong 1b70d6e8a4 * code for task #84532. 2023-02-16 13:55:23 +08:00
caoyanyi a3d9cda86b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-15 09:13:10 +08:00
caoyanyi dff2e8a00c * Add search tab. 2023-02-14 14:01:16 +08:00
guofeilong 6bf8c6388e * Code for add menuOrder in langItem . 2023-02-14 08:45:35 +08:00
guofeilong b9d288fd23 * Code for add langitem.html.php 2023-02-13 16:56:34 +08:00
daitingting 060f843b07 * Fix bug #31996. 2023-02-10 05:15:12 +00:00
wangyuting2 e7a66de47f * Fix admin model menu bug. 2023-02-10 10:31:32 +08:00
wangyidong de17879c59 * code for task #83436. 2023-02-01 15:37:07 +08:00
wangyidong 8ec471f950 * code for task #83439. 2023-02-01 11:20:57 +08:00
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +08:00
tanghucheng c04a1207d0 * Fix bug. 2022-12-30 10:40:41 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
liugang 0257517d94 * Add privilege control of screen. 2022-12-23 14:53:28 +08:00
liugang d04fc1fe4a * Move the screen module to open source. 2022-12-23 14:39:01 +08:00
孙广明 d4f5170391 Merge branch 'zenops_46_zhaoke_74993' into 'zenops_46'
Zenops 46 zhaoke 74993

See merge request easycorp/zentaopms!6395
2022-11-28 06:58:42 +00:00
liugang da3e57db0f * Display all reports by report-preview function. 2022-11-24 13:23:37 +08:00
caoyanyi 4361cb4182 Merge branch 'master' into zenops_46 2022-11-24 13:01:30 +08:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
wangjianhua bedc9e9309 * Show shadow product in Repo module. 2022-11-22 22:13:54 +08:00
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
lanzongjun 85130bfb02 * Fix Task #77009 2022-11-22 10:20:59 +08:00
zhaoke 45e1c4dc20 * Add view zahost. 2022-11-18 01:43:33 +00:00
caoyanyi b40d86d219 Merge branch 'master' into zenops_46 2022-11-17 14:42:05 +08:00
lanzongjun 9c2bdb2081 * Fix task #76407 2022-11-17 14:04:37 +08:00
lanzongjun 75d9b5ceb9 * Fix bug execution menu 2022-11-16 17:01:58 +08:00
wangyuting 5771eac9c8 * Fix bug #29666. 2022-11-16 05:34:42 +00:00
caoyanyi e60b21e1b6 Merge branch 'master' into zenops_46 2022-11-16 13:00:45 +08:00
王怡栋 5a11d47992 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* finish task #75921

See merge request easycorp/zentaopms!6176
2022-11-16 02:04:10 +00:00
王怡栋 567cefa44e Merge branch 'zentaopms_258_bug#29712' into 'master'
* Fix bug #29712.

See merge request easycorp/zentaopms!6168
2022-11-16 01:56:20 +00:00
lanzongjun b18918ad22 * finish task #75921 2022-11-16 09:36:11 +08:00
lanzongjun 2f7e39685c * finish task #75921 2022-11-16 09:34:31 +08:00
wangyuting 8270dc9ab2 * Fix bug #29712. 2022-11-15 09:57:19 +00:00
孙广明 093069f5eb Merge branch 'master_xieqiyu_75910' into 'master'
* Fix bug#29440.

See merge request easycorp/zentaopms!6148
2022-11-15 08:13:37 +00:00
王怡栋 f950d1fa82 * fix bug #76334. 2022-11-15 15:03:32 +08:00
lanzongjun 4849895b69 * finish task #76334 2022-11-15 14:18:36 +08:00
xieqiyu f86b9b0b17 * Fix bug#29440. 2022-11-15 09:51:31 +08:00
wangyuting e3ad1649a8 * Fix bug #29565. 2022-11-14 09:02:27 +00:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyuting 59fe4826ca * Finish task #75237. 2022-11-10 07:36:35 +00:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00