Commit Graph
641 Commits
Author SHA1 Message Date
朱金勇 c76fa5317e * Fix bug#34204. 2023-04-17 06:12:22 +00:00
朱金勇 e6b2ea4a04 Merge branch 'zenops_69' 2023-04-14 04:41:28 +00:00
tianshujie e279e91070 * Resolve issue #775. 2023-04-13 16:22:45 +08:00
zhaoke eb833be4e5 Merge branch 'zenops_66' into zenops_69 2023-04-13 09:31:12 +08:00
zhaoke d401a87812 Merge branch 'master' into zenops_69 2023-04-13 09:09:49 +08:00
tianshujie b8fc22feee * Fix bug #34066. 2023-04-12 10:57:08 +08:00
tianshujie ab05c059eb * Code for task #90780. 2023-04-12 09:28:15 +08:00
xieqiyu e8123d02ec * Code for bug#33846. 2023-04-11 07:55:34 +00:00
tianshujie 1ce64ff3c9 * Fix bug #33985. 2023-04-11 08:47:05 +08:00
tianshujie c99fed9fe9 * Code for task #90792. 2023-04-10 14:31:21 +08:00
朱金勇 22f9f1d087 Merge branch 'db' 2023-04-05 14:30:11 +00:00
朱金勇 7f9d638d28 * Fix sql for dmdb. 2023-04-05 14:18:24 +00:00
tianshujie e1eaf74466 * Add space. 2023-04-04 15:16:29 +08:00
tianshujie 49666e311e * Code for task #89927. 2023-04-04 13:24:18 +08:00
zhaoke 49d18cf72c Merge remote-tracking branch 'origin/master' into zenops_69 2023-04-03 16:46:41 +08:00
tianshujie 651edfc559 * Fix bug #33614. 2023-03-31 15:46:50 +08:00
zhaoke 8522e6fb58 * Add scene control and view file to testcase module. 2023-03-29 16:26:59 +08:00
tianshujie 7c16060b2c * Fix bug #33479. 2023-03-29 10:48:01 +08:00
hufangzhou f33fe4ed04 * Fix bug #32962. 2023-03-21 10:08:41 +08:00
liumengyi a168008406 * Fix bug #33001. 2023-03-16 05:29:54 +00:00
wangxuepeng 4db7af7e52 * Fixed #bug86288. 2023-03-08 02:37:40 +00:00
wangxuepeng 21c915dc36 * Fixed #bug86288. 2023-03-08 02:33:35 +00:00
wangxuepeng 76016e1b78 * Fixed #bug86288. 2023-03-07 07:43:26 +00:00
孙广明 260c4c0528 Merge branch 'zenops_62' into 'master'
Zenops 62

See merge request easycorp/zentaopms!7087
2023-02-28 05:22:00 +00:00
liumengyi 09cb859c5e * Fix bug #32179. 2023-02-18 09:30:25 +00:00
zhaoke ae6dbb769c * Fix restore default snapshot history error. 2023-02-17 17:33:13 +08:00
zhaoke 81d1e3e23a * Fix bug #32191. 2023-02-16 16:47:20 +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 56c2cdcb21 * Finish task #83954. 2023-02-14 02:46:34 +00:00
xieqiyu 7a0e43b41b * Code for bug#31453. 2023-02-02 14:12:29 +08:00
xieqiyu 1e11a3cb85 * Fix bug#31453. 2023-02-02 11:12:46 +08:00
tanghucheng 62c1ed7f9c Merge branch 'master' into zenops_46 2022-12-30 09:40:04 +08:00
zhouxin bf3ef7a9ab * Resolve feedback #843. 2022-12-29 06:41:40 +00:00
liugang 8100689bb2 Merge branch 'sprint/biz17' 2022-12-26 08:50:31 +08:00
tanghucheng 85ffa23da8 Merge branch 'master' into zenops_46_tanghucheng 2022-12-15 15:27:59 +08:00
wangyidong 6c02c05d51 * fix bug #30676. 2022-12-15 09:18:46 +08:00
Yagami a299a62db1 * Rename siblings to twins. 2022-12-12 14:13:06 +08:00
wangyidong 7c8f4674cf * code for task #78909. 2022-12-06 10:37:24 +08:00
孙广明 6356683483 Merge branch 'master' into 256 2022-11-28 13:36:48 +08:00
caoyanyi fc95313a40 Merge branch 'master' into zenops_46 2022-11-28 08:41:37 +08:00
Yagami f881d7951e * Fix bug #30017. 2022-11-24 13:46:14 +08:00
liugang 7c62eef9dc Merge branch 'master' into sprint/biz17 2022-11-21 13:08:59 +08:00
liumengyi 398afed7ae * Fix bug #29912. 2022-11-17 08:42:54 +08:00
caoyanyi 5145b98f24 * Modify actions get. 2022-11-14 16:24:49 +08:00
caoyanyi f1425eff27 Merge branch 'master' into zenops_46 2022-11-14 08:55:13 +08:00
wangyidong 126d55f807 * code task #74929. 2022-11-10 15:19:57 +08:00
liumengyi 9c1f8b2be1 * Fix bug #29325. 2022-11-08 13:02:01 +08:00
caoyanyi 1630ab8885 Merge branch 'master' into zenops_46 2022-11-08 09:24:42 +08:00
wangyidong bd18396178 Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2022-11-08 08:41:50 +08:00