Commit Graph
1943 Commits
Author SHA1 Message Date
caoyanyi e7c8ceed8d * Modify dynamic language. 2023-02-23 10:10:11 +08:00
caoyanyi 6caaf4c316 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 08:32:25 +08:00
tianshujie 12cdb2f6d7 * Modify menu param. 2023-02-22 16:11:21 +08:00
caoyanyi 7c257b5e1e * Code for issue #762. 2023-02-22 15:16:48 +08:00
tianshujie 5b2cafa380 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-21 14:13:51 +08:00
孙广明 6c1ed365ab Merge branch 'sprint/292_liumengyi_85038' into 'master'
* Finish task #85038, #85039, #85040.

See merge request easycorp/zentaopms!7010
2023-02-21 05:50:04 +00:00
tianshujie 517fb3c796 * Code for finish task #85046. 2023-02-21 13:13:13 +08:00
liumengyi 95e3978fb0 * Finish task #85038, #85039. 2023-02-21 01:05:24 +00:00
caoyanyi c8374b1e14 Merge branch 'master' into zentaopms_289 2023-02-17 10:11:16 +08:00
tianshujie 792f1c5a98 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-17 08:33:25 +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 b478779676 * Fix bug #32184,32192,32193. 2023-02-16 11:09:18 +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
tianshujie 4d2a846c9e Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-16 08:59:34 +08:00
tianshujie 484f34396c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-16 08:59:00 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +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
tianshujie f989173e10 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 08:29:48 +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
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +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
tianshujie 2b265f6157 Merge branch 'sprint/285' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285_navigation 2023-02-07 09:01:49 +08:00
tianshujie 1a1f8d3a07 * Put holiday permissions in the open source edition. 2023-02-06 17:05:37 +08:00
tianshujie adc0616341 * Code for finish task #83721,83722. 2023-02-06 15:41:55 +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
liumengyi df9883b126 * Finish task #83216. 2023-01-31 09:27:01 +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 3141fb89f3 * Rename the screen menu. 2022-12-27 10:58:14 +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
zhaoke 2be5e19028 * Update style. 2022-12-23 01:49:53 +00:00
wangjianhua 429a1d37fa * Modify lang items about devops. 2022-12-12 18:39:23 +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
孙广明 e60b156ea4 Merge branch 'master_zenops_wangjianhua' into 'master'
Modify Repo logic of shadow product.

See merge request easycorp/zentaopms!6317
2022-11-23 05:18:28 +00:00
zhaoke c2b0f0a656 * Update zanode name 2022-11-23 02:44:27 +00:00
Yagami 2f98f46365 * Finish task #77275. 2022-11-23 09:25:48 +08: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