Commit Graph
3822 Commits
Author SHA1 Message Date
tianshujie c29df55df8 * Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-08 10:39:45 +08:00
tianshujie 42b65e5986 * Code for finish task #83722. 2023-02-08 09:33:14 +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
guofeilong 5f629ca690 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-02 14:50:15 +08:00
liuhong 2d3cfc3613 *Fix the testtask and testcase creatBug open new label. 2023-02-02 05:59:18 +00: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
caoyanyi dfb991ba7c Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-01 08:54:25 +08:00
wangyidong 7af8d535f1 * code for task #83439. 2023-01-31 16:15:00 +08:00
chaideqing ed34ae2cae * Hide drop-down menu when click one item. 2023-01-30 09:39:55 +00:00
tianshujie 8b5f786bd2 * Finish task #83329. 2023-01-30 17:23:10 +08: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
caoyanyi 0d81c7f4fe Merge branch 'master' into zenops_46 2022-11-22 15:39:59 +08:00
孙广明 664a05a6f3 Merge branch 'sprint/master_lanzongjun_fixbug' into 'master'
* Fix Task #77009#76458

See merge request easycorp/zentaopms!6291
2022-11-22 05:37:12 +00:00
lanzongjun 85130bfb02 * Fix Task #77009 2022-11-22 10:20:59 +08:00
mayue 94bf632389 * Fix bug #29958. 2022-11-22 10:15:33 +08:00
zhaoke 45e1c4dc20 * Add view zahost. 2022-11-18 01:43:33 +00:00