Commit Graph
3827 Commits
Author SHA1 Message Date
wangyidong dfb7a22c12 * adjust code. 2023-02-15 15:54:02 +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
wangyidong 41ddc2562b * fix bug. 2023-02-14 14:38:21 +08:00
wangyidong ec1d388334 * fix bug. 2023-02-14 14:32:09 +08:00
caoyanyi ff6516dd46 Merge branch 'zentaopms_289' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-14 14:01:34 +08:00
caoyanyi dff2e8a00c * Add search tab. 2023-02-14 14:01:16 +08:00
wangyidong ff5bc056bd * code for replace menu lang. 2023-02-14 13:35:12 +08:00
王怡栋 20f17196b2 Merge branch 'ticket_366' into 'master'
Ticket 366

See merge request easycorp/zentaopms!6941
2023-02-14 05:04:09 +00:00
王怡栋 5c28eb1317 Merge branch 'daitingting_bug_#31996' into 'master'
* Fix bug #31996.

See merge request easycorp/zentaopms!6940
2023-02-14 05:03:43 +00:00
liuhong e9d2d7362a * Adjust code for feedback #2191 2023-02-14 01:43:35 +00: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
zenggang 317ddd5fbc * Fix bug #32024 2023-02-13 02:02:32 +00: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
hufangzhou 8d26dceb4b * Compatible with php5.3. 2023-02-09 05:54:15 +00:00
liuhong 2d3cfc3613 *Fix the testtask and testcase creatBug open new label. 2023-02-02 05:59:18 +00:00
chaideqing ed34ae2cae * Hide drop-down menu when click one item. 2023-01-30 09:39:55 +00:00
tanghucheng f499e9e4af * Remove init operation for zahost and zanode. 2023-01-12 13:22:03 +08:00
zhaoke f8a69684b4 * Fix bug 31348. 2023-01-03 05:26:19 +00: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
tanghucheng 5b2babca14 Merge branch 'master' into zenops_46 2022-12-20 16:36:44 +08:00
wangyidong ac9e876101 * code task #80452. 2022-12-20 13:53:37 +08:00
tanghucheng 769c65781b * Fix bug #30971. 2022-12-16 19:16:56 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
Lufei 2fc604895d * Fix checkPriv error. 2022-12-14 09:37:25 +08:00
wangjianhua 429a1d37fa * Modify lang items about devops. 2022-12-12 18:39:23 +08:00
朱金勇 da4552fa16 Merge branch 'fix_feedback_1694' into 'master'
* Fix feedback #1694.

See merge request easycorp/zentaopms!6502
2022-12-08 09:08:56 +00:00
Lufei d6db014f99 * Fix checkPriv error. 2022-12-08 14:00:14 +08:00
zhouxin bdeb83477b * Resolve feedback #1646. 2022-12-08 06:00:06 +00:00
唐胡成 c6aafbd707 Merge branch 'zenops_46' into 'zenops_46_tanghucheng'
# Conflicts:
#   module/zanode/lang/de.php
#   module/zanode/lang/en.php
#   module/zanode/lang/fr.php
#   module/zanode/lang/zh-cn.php
#   module/zanode/model.php
2022-12-07 06:27:38 +00:00
tanghucheng e7a96aa7d2 * Finish task #78645. 2022-12-07 14:24:05 +08:00
caoyanyi f58e24e6fc Merge branch 'master' into zenops_46 2022-12-02 10:04:48 +08:00
Lufei 35b4ba9e92 * If run in container, no need check ok.txt. 2022-11-30 11:19:31 +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
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
Yagami 968a7e59ef * Fix isclickable error. 2022-11-24 16:13:08 +08: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
lanzongjun 63e0556741 * Fix Task #77267 2022-11-23 10:54:58 +08: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