Commit Graph
1132 Commits
Author SHA1 Message Date
tianshujie 3962b7a087 * Code for finish task #84575. 2023-02-20 08:40:32 +08:00
tianshujie 5aee651454 * Code for finish task #84575. 2023-02-18 18:39:07 +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
tianshujie 2a388d06a7 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-16 09:00:16 +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
王怡栋 3a6bca8dc2 Merge branch 'zentaopms_wangyuting' into 'master'
* Fix project extend priv bug.

See merge request easycorp/zentaopms!6966
2023-02-15 09:22:38 +00:00
wangyuting2 a86eb599d9 * Fix project extend priv bug. 2023-02-15 17:20:35 +08:00
hufangzhou f3cd2e7d4d * Change the Easy Soft to ZenTao Software. 2023-02-15 17:01:22 +08:00
liuhong a767115e92 * Resolved feedback 2191. 2023-02-15 06:16:55 +00:00
tianshujie f989173e10 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-15 08:29:48 +08:00
tianshujie b2fef4f696 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-15 08:19:27 +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
tianshujie ec0078c708 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284 2023-02-13 14:03:58 +08:00
zenggang 317ddd5fbc * Fix bug #32024 2023-02-13 02:02:32 +00:00
wangyidong ff66b39a2a * code for task #83736. 2023-02-10 17:37:50 +08:00
daitingting 060f843b07 * Fix bug #31996. 2023-02-10 05:15:12 +00:00
tianshujie cca9a79498 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285 2023-02-10 10:55:46 +08:00
hufangzhou 8d26dceb4b * Compatible with php5.3. 2023-02-09 05:54:15 +00:00
liumengyi 84970085ec * Finish task #83942. 2023-02-08 14:14:08 +08:00
tianshujie 42b65e5986 * Code for finish task #83722. 2023-02-08 09:33:14 +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
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
zhaoke f8a69684b4 * Fix bug 31348. 2023-01-03 05:26:19 +00: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
朱金勇 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
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
Yagami 968a7e59ef * Fix isclickable error. 2022-11-24 16:13:08 +08:00
lanzongjun 63e0556741 * Fix Task #77267 2022-11-23 10:54:58 +08:00
Yagami 8d71c2615c * Fix keep-login bug. 2022-11-14 13:40:44 +08:00
wangjianhua 74beb1f75a * Finish download image. 2022-11-11 17:09:24 +08:00
daitingting cb90a2e25b * Finish task #74176. 2022-11-02 06:30:01 +00:00
wangyuting2 a1df161747 * Finish task #73818. 2022-10-27 06:45:09 +00:00
wangyuting2 ee4ffb51eb * Optimize code. 2022-10-24 08:49:37 +00:00
wangyuting2 38af20255b * Fix nosprint project priv bug. 2022-10-24 08:34:13 +00:00
wangyuting2 49901fd7f9 * Finish task #72763 ~ #72772. 2022-10-19 03:03:59 +00:00
wangyuting2 aa9bc2b8ec * Fix systemMode bug. 2022-10-10 07:32:11 +00:00
wangyidong d300ee00da Merge branch 'master' into zentaopms_239 2022-09-30 09:07:53 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00
wangyidong 04cc70c4cc * adjust for task #70545. 2022-09-29 13:45:24 +08:00