Commit Graph
154 Commits
Author SHA1 Message Date
tanghucheng 10acc6b909 * Fix merge zentaoipd code error. 2023-08-01 09:33:07 +08:00
tanghucheng 3741c9b6fa Merge branch '18.x' into zentaoipd 2023-07-03 13:36:29 +08:00
hufangzhou 923446c008 * Fix bug #35569. 2023-05-31 15:57:33 +08:00
tanghucheng c8a626480d Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-21 13:49:46 +08:00
朱金勇 7de8f305c0 * Fix bug#34389. 2023-04-20 04:10:07 +00:00
tanghucheng 8bf4bbccf0 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-20 09:50:22 +08:00
朱金勇 027c3260c4 * Fix bug#34386. 2023-04-19 08:18:26 +00:00
liumengyi 094f8f5f60 * Fix bug #33917. 2023-04-18 13:31:58 +08:00
tanghucheng 0a944b7e11 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-04-14 16:38:09 +08:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
朱金勇 1aa6861445 * Fix bug #34095. 2023-04-14 01:24:17 +00:00
Yagami 9144abbd8a * Remove unused code. 2023-04-11 13:36:34 +08:00
tanghucheng c89ecac12b Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaoipd 2023-03-31 09:19:02 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
Yagami 6041f625df * Fix bug #33466. 2023-03-29 14:27:27 +08:00
wangyidong d3149400b0 * fix bug #32095. 2023-03-17 15:57:51 +08:00
wangyidong 7dc5533817 * fix bug #33002. 2023-03-17 08:48:22 +08:00
tianshujie c6cd9a6077 * Code for finish task 84527. 2023-03-03 13:01:50 +08:00
caoyanyi 2f3aae9281 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289 2023-02-23 16:05:42 +08:00
hufangzhou f92716a360 * Fix bug #32397. 2023-02-23 02:30:17 +00:00
caoyanyi 10da3ef802 * Modify language defined. 2023-02-23 09:32:56 +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
hufangzhou 73df98376a * Finish task #83205, and fix bug of task #83206. 2023-01-31 10:35:06 +08:00
wangyidong d28ea77f0d * code for task #80461. 2022-12-20 09:24:07 +08:00
wangyidong dd7dfa2dc1 * fix bug #30660. 2022-12-08 14:37:24 +08:00
wangyidong 9a1d82200b * fix bug #30667. 2022-12-08 14:32:51 +08:00
wangyidong 8a3d6c4dcd * fix bug #30665. 2022-12-08 13:43:13 +08:00
wangyidong 771dd4c8ed * code for task #78908,78918. 2022-12-07 17:42:41 +08:00
wangyidong 283b37b65e * adjust for task #77615,77616. 2022-12-01 10:26:12 +08:00
xieqiyu 3afc823177 * Fix bug#29716,#30056. 2022-11-23 15:34:30 +08:00
王怡栋 5dcbebeaf1 Merge branch 'zentaopms261_wyd' into 'master'
Zentaopms261 wyd

See merge request easycorp/zentaopms!6178
2022-11-16 01:54:53 +00:00
王怡栋 14edb87de2 * fix bug #29675. 2022-11-16 09:38:55 +08:00
王怡栋 4352117e4d * fix bug #29699. 2022-11-15 13:56:40 +08:00
wangyidong 148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +08:00
wangyidong f19271b276 * code for task #72991. 2022-10-24 17:22:23 +08:00
wangyidong 13fe5896b6 * code for task #72982. 2022-10-24 15:30:20 +08:00
wangyidong 6854d16d4e * code for task #71672. 2022-10-24 14:44:20 +08:00
wangyidong 4b6152c6ed * code for task #72981. 2022-10-24 08:59:33 +08:00
wangyidong e65b04e673 * fix bug #28738. 2022-10-20 16:42:04 +08:00
wangyidong 986ca160d1 * fix bug #28739. 2022-10-20 15:25:47 +08:00
wangyidong 9719597cbf * adjust for my audit. 2022-10-19 17:27:09 +08:00
wangyidong 78dad96c26 * code for task #72778. 2022-10-18 13:45:12 +08:00
wangyidong 45f2d070c5 * code for task #72276. 2022-10-17 14:27:45 +08:00
zhouxin 4bab4bc356 * Fix some bugs of ticket. 2022-10-17 14:01:04 +08:00
wangyidong 617f801769 * adjust for #71672,71671,71670,71669,71668,71667,71666. 2022-10-17 10:10:43 +08:00
zhouxin da5d515b45 * Add search form for my ticket. 2022-10-17 09:09:09 +08:00
wangyidong 36f9aa8ad5 * code for task #71660.#71661,#71662,#71663,#71664,#71665. 2022-10-11 15:54:40 +08:00
wangyidong a51f42e7b8 * code for task #71609. 2022-10-10 09:08:28 +08:00
wangyidong a88cc7454d Merge branch 'sprint/zentaopms240' into zentaopms_239 2022-09-30 08:49:33 +08:00