 wangyidong
|
61bf3f9d4a
|
* fix bug #34761.
|
2023-04-25 08:36:29 +08:00 |
|
|
wangyidong
|
88fa8fc839
|
* fix bug #34750.
|
2023-04-24 18:56:38 +08:00 |
|
|
王怡栋
|
e0d163f5fd
|
Merge branch 'zentaopms_304' into 'master'
Zentaopms 304
See merge request easycorp/zentaopms!7518
|
2023-04-20 09:31:13 +00:00 |
|
|
hufangzhou
|
b7bbb9cb16
|
* Adjst the code.
|
2023-04-20 17:12:19 +08:00 |
|
|
tianshujie
|
205327d891
|
* Fixed dynamic error reporting.
|
2023-04-20 15:28:45 +08:00 |
|
|
hufangzhou
|
e18b37128f
|
Merge branch 'master' into zentaopms_304
|
2023-04-20 13:03:30 +08:00 |
|
|
朱金勇
|
532ff84269
|
* Fix bug#34446.
|
2023-04-20 03:50:25 +00:00 |
|
|
tianshujie
|
0f2a2b7bc3
|
* Fixed the interface details style problem.
|
2023-04-19 17:14:32 +08:00 |
|
|
liumengyi
|
d971d4b4b7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-18 08:38:14 +08:00 |
|
|
朱金勇
|
c76fa5317e
|
* Fix bug#34204.
|
2023-04-17 06:12:22 +00:00 |
|
|
liumengyi
|
648dc288ca
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-14 15:15:03 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
liumengyi
|
5ee474c83e
|
* Rename the privilege of action-trash.
|
2023-04-14 10:55:48 +08:00 |
|
|
tianshujie
|
e279e91070
|
* Resolve issue #775.
|
2023-04-13 16:22:45 +08:00 |
|
|
tianshujie
|
0c935c7eea
|
* Modify jump link.
|
2023-04-13 15:45:51 +08:00 |
|
|
zhaoke
|
9a7ade5b64
|
* Fix formatting issues.
|
2023-04-13 15:22:20 +08:00 |
|
|
zhaoke
|
a64bc7d5ab
|
* Move xmind functions to lib.
|
2023-04-13 13:51:34 +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 |
|
|
liumengyi
|
ca9c565982
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 16:39:44 +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 |
|
|
tianshujie
|
324dfe4650
|
* Code for task #90780.
|
2023-04-12 09:08:51 +08:00 |
|
|
liumengyi
|
e3c6375224
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-12 08:58:39 +08:00 |
|
|
王怡栋
|
a0868cb0ff
|
Merge branch 'master' into 'tsj_dynamic'
# Conflicts:
# module/doc/model.php
|
2023-04-11 08:46:26 +00:00 |
|
|
tianshujie
|
81e7153c8e
|
* Code for task #90780.
|
2023-04-11 16:34:29 +08:00 |
|
|
xieqiyu
|
e8123d02ec
|
* Code for bug#33846.
|
2023-04-11 07:55:34 +00:00 |
|
|
tianshujie
|
1f026f246a
|
* Code for task #90780.
|
2023-04-11 15:38:44 +08:00 |
|
|
liumengyi
|
9fadd45264
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_304
|
2023-04-11 14:19:00 +08: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 |
|
|
hufangzhou
|
3c83d94e09
|
* Merge code.
|
2023-04-06 09:01:30 +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 |
|
|
liumengyi
|
d3cf4b54f4
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_295
|
2023-04-03 09:58:23 +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 |
|
|
liumengyi
|
a41eea8e93
|
* Fix bug #33236.
|
2023-03-23 14:24:45 +08:00 |
|
|
hufangzhou
|
f33fe4ed04
|
* Fix bug #32962.
|
2023-03-21 10:08:41 +08:00 |
|
|
孙广明
|
5a69ec2c98
|
Merge branch 'wxp_bug32706' into 'master'
* Fix bug 32706.
See merge request easycorp/zentaopms!7195
|
2023-03-17 00:52:21 +00:00 |
|
|
wangxuepeng
|
8dcfe4a48a
|
* Fix bug 32706.
|
2023-03-17 00:48:22 +00:00 |
|
|
liumengyi
|
a168008406
|
* Fix bug #33001.
|
2023-03-16 05:29:54 +00:00 |
|
|
liumengyi
|
b91a24b66b
|
* Finish task #86272.
|
2023-03-15 03:01:49 +00:00 |
|
|
hufangzhou
|
01aaf60e09
|
* Merge master.
|
2023-03-14 05:15:27 +00:00 |
|
|
wangxuepeng
|
a5e86054e3
|
* Code for task #86270.
|
2023-03-10 05:34:34 +00:00 |
|
|
孙广明
|
7ec8ece76a
|
Merge branch 'wxp_bug86288' into 'master'
* Fixed #bug86288.
See merge request easycorp/zentaopms!7153
|
2023-03-08 02:43:45 +00:00 |
|