 胡方舟
|
ca8f702765
|
Merge branch 'zenops_69' into 'master'
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.
See merge request easycorp/zentaopms!7458
|
2023-04-18 07:44:26 +00:00 |
|
|
zhaoke
|
186d901af7
|
* getXmindImport,showXmindImport,saveXmindImport use importXmind permission.
|
2023-04-18 15:41:38 +08:00 |
|
|
朱金勇
|
e6b2ea4a04
|
Merge branch 'zenops_69'
|
2023-04-14 04:41:28 +00:00 |
|
|
tianshujie
|
e5bcb8b2f9
|
* The ID of the last accessed object is retained.
|
2023-04-13 16:58:25 +08:00 |
|
|
zhaoke
|
a64bc7d5ab
|
* Move xmind functions to lib.
|
2023-04-13 13:51:34 +08:00 |
|
|
zhaoke
|
d401a87812
|
Merge branch 'master' into zenops_69
|
2023-04-13 09:09:49 +08:00 |
|
|
caoyanyi
|
13a7efb50c
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-07 11:22:34 +08:00 |
|
|
wangyidong
|
38898d1a13
|
* code for task #89914.
|
2023-04-07 10:53:53 +08:00 |
|
|
liugang
|
adc8d2d267
|
+ Move the config of bi from biz version to open source version.
|
2023-04-06 10:11:42 +00:00 |
|
|
zhaoke
|
91af62ac48
|
Merge remote-tracking branch 'origin/master' into zenops_69
|
2023-04-04 13:46:52 +08:00 |
|
|
王怡栋
|
aa919a2021
|
Merge branch 'release/zentaopms_18.3' into 'master'
Release/zentaopms 18.3
See merge request easycorp/zentaopms!7298
|
2023-04-03 09:16:18 +00:00 |
|
|
zhaoke
|
49d18cf72c
|
Merge remote-tracking branch 'origin/master' into zenops_69
|
2023-04-03 16:46:41 +08:00 |
|
|
tianshujie
|
978ded6788
|
* Code for task #89927.
|
2023-04-03 16:12:48 +08:00 |
|
|
daitingting
|
de50c7f922
|
* Revert version.
|
2023-04-03 10:25:37 +08:00 |
|
|
caoyanyi
|
d477203aa7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3
|
2023-04-03 08:30:03 +08:00 |
|
|
daitingting
|
790df501b0
|
* Process upgrade.
|
2023-03-31 13:40:17 +08:00 |
|
|
zhaoke
|
e41d40afa7
|
Merge remote-tracking branch 'origin/master' into zenops_69
|
2023-03-31 09:58:36 +08:00 |
|
|
zhaoke
|
8522e6fb58
|
* Add scene control and view file to testcase module.
|
2023-03-29 16:26:59 +08:00 |
|
|
caoyanyi
|
7616c67a7d
|
* Modify param use cookie.
|
2023-03-29 09:19:49 +08:00 |
|
|
qixinzhi
|
511240d0fa
|
Merge branch 'master' into sprint/biz17
|
2023-03-22 17:15:46 +08:00 |
|
|
hufangzhou
|
125a4384af
|
* Add the new version.
|
2023-03-15 02:53:46 +00:00 |
|
|
qixinzhi
|
b4e8de97e5
|
Merge branch 'master' into sprint/biz17
|
2023-03-06 09:04:52 +08:00 |
|
|
caoyanyi
|
25f195767f
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289
|
2023-03-02 13:18:34 +08:00 |
|
|
zhaoke
|
a01f62d591
|
* Fix bug#32141.
|
2023-03-02 10:13:03 +08:00 |
|
|
wangyidong
|
cdb476bc4b
|
* adjust for safe file timeout.
|
2023-03-01 15:58:56 +08:00 |
|
|
hufangzhou
|
451f5b190b
|
* Fix bug #32486.
|
2023-03-01 02:07:51 +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 |
|
|
hufangzhou
|
42769d3425
|
* Add the new version.
|
2023-02-27 06:51:34 +00:00 |
|
|
tianshujie
|
d6266bc607
|
* Code for finish task #85047.
|
2023-02-20 14:47:10 +08:00 |
|
|
qixinzhi
|
4580fb13ed
|
Merge branch 'master' into sprint/biz17
|
2023-02-17 15:24:51 +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 |
|
|
zhaoke
|
81d1e3e23a
|
* Fix bug #32191.
|
2023-02-16 16:47:20 +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 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
zhaoke
|
a2c3fee694
|
* Fix bug #32141.
|
2023-02-14 10:33:32 +00:00 |
|
|
hufangzhou
|
56c2cdcb21
|
* Finish task #83954.
|
2023-02-14 02:46:34 +00:00 |
|
|
qixinzhi
|
137a6d3967
|
* Add pivot table.
|
2023-02-13 13:45:36 +08:00 |
|
|
tianshujie
|
cca9a79498
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-10 10:55:46 +08:00 |
|
|
zhaoke
|
db114d1c39
|
* Fix error for php5.3.
|
2023-02-09 08:02:50 +00:00 |
|
|
liumengyi
|
39ed4349e0
|
* Fix bug #31978.
|
2023-02-09 10:42:47 +08:00 |
|
|
caoyanyi
|
08640c3f68
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/285
|
2023-02-09 09:09:55 +08:00 |
|
|
caoyanyi
|
c365db5074
|
* Code for task #83735.
|
2023-02-08 16:50:47 +08:00 |
|
|
Yagami
|
c2724b9f57
|
Merge branch 'zentaopms_281'
|
2023-02-08 15:31:13 +08:00 |
|
|
hufangzhou
|
025aa5dc4b
|
* Add the new version.
|
2023-02-08 02:44:44 +00:00 |
|
|
王怡栋
|
552222709a
|
Merge branch 'zentaopms_wangyuting' into 'master'
* Fix bug #24872.
See merge request easycorp/zentaopms!6877
|
2023-02-08 02:22:50 +00:00 |
|
|
wangyuting2
|
2328bcb922
|
* Fix bug #24872.
|
2023-02-08 10:15:27 +08:00 |
|
|
zhaoke
|
a31485ec89
|
Merge branch 'master' into zenops_61
|
2023-02-07 02:04:56 +00:00 |
|
|
zhaoke
|
e31ddb1381
|
* Fix bug #31841.
|
2023-01-31 08:33:19 +00:00 |
|
|
xieqiyu
|
e722cc1468
|
* Fix bug#30840.
|
2023-01-18 16:42:41 +08:00 |
|