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 |
|
tianshujie
|
ec0078c708
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_284
|
2023-02-13 14:03:58 +08:00 |
|
liumengyi
|
fddb2f1e64
|
* Finish task #83949.
|
2023-02-07 11:28:35 +08:00 |
|
liumengyi
|
a413a2b809
|
* Finish task #83949.
|
2023-02-07 11:23:32 +08:00 |
|
xieqiyu
|
aeb0d8054d
|
* Fix bug#30834.
|
2023-02-01 11:13:11 +08:00 |
|
zhouxin
|
14f967733f
|
* Fix bug for feedback 1807.
|
2022-12-22 06:31:58 +00:00 |
|
wangjianhua
|
d6b292ae14
|
Merge branch 'master' into master_oss_wangjianhua
|
2022-11-21 21:20:34 +08:00 |
|
wangyuting
|
05a652d5fe
|
* Fix bug #29950.
|
2022-11-21 06:08:46 +00:00 |
|
wangjianhua
|
cd5749835e
|
* Add function setFielAndRealPaths to file model.
|
2022-11-09 23:28:37 +08: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 |
|
zenggang
|
282c148704
|
* Fix bug#27927
|
2022-09-26 04:06:07 +00:00 |
|
wangyidong
|
63e5df239e
|
* code for task #69248.
|
2022-09-16 15:18:41 +08:00 |
|
hufangzhou
|
abd43d06af
|
* Fix bug #26544.
|
2022-08-31 13:23:12 +08:00 |
|
mayue
|
b3008f2d19
|
* Optimize code.
|
2022-08-25 17:08:06 +08:00 |
|
zhouxin
|
607fa5a010
|
* Fix bug of doc-objectLib.
|
2022-08-17 02:16:03 +00:00 |
|
王怡栋
|
ec328f7432
|
Merge branch 'master' into 'sprint/hufangzhou_createdoc'
# Conflicts:
# config/zentaopms.php
|
2022-08-08 03:05:17 +00:00 |
|
liumengyi
|
756c8d4dc0
|
* Fix bug #26102.
|
2022-08-05 15:49:56 +08:00 |
|
hufangzhou
|
7ffe013d41
|
* Change the upload file control to uploader.
|
2022-08-04 10:24:26 +08:00 |
|
hufangzhou
|
48f500e5a8
|
* Code for task #62951.
|
2022-08-03 09:37:36 +08:00 |
|
hufangzhou
|
96934390a2
|
* Move the from parameter to open source.
|
2022-07-27 15:44:44 +08:00 |
|
hufangzhou
|
a94f93dceb
|
* Fix bug #25758.
|
2022-07-27 15:27:47 +08:00 |
|
hufangzhou
|
c4296b1b9f
|
* Compatible with zentaomax.
|
2022-07-27 13:35:06 +08:00 |
|
hufangzhou
|
4c7699178a
|
* Modify the object id equal zero for custom type doc.
|
2022-07-27 08:48:42 +08:00 |
|
hufangzhou
|
8883ac8e77
|
* Finish task #62132, #62133, #62134, #62135, #62136.
|
2022-07-26 18:14:09 +08:00 |
|
hufangzhou
|
fab8fedf10
|
* Adjust the judgment condition to a configuration item.
|
2022-07-20 14:15:43 +08:00 |
|
hufangzhou
|
1dcf2dcb2c
|
* Code for task #59750.
|
2022-07-20 10:13:21 +08:00 |
|
zenggang
|
030a3ea89f
|
* Fix bug#24761
|
2022-07-07 08:27:31 +00:00 |
|
mayue
|
2e3416c4c8
|
* Fix bug #24639.
|
2022-06-30 16:15:10 +08:00 |
|
孙广明
|
85ac450243
|
Merge branch 'sprint/207_mayue_bug#24049' into 'master'
* Fix bug #24049.
See merge request easycorp/zentaopms!4155
|
2022-06-27 08:54:19 +00:00 |
|
mayue
|
35383bc86f
|
* Fix bug #24049.
|
2022-06-24 18:42:44 +08:00 |
|
liumengyi
|
3cbc219ad5
|
* Code review.
|
2022-06-24 14:18:31 +08:00 |
|
liumengyi
|
48532553f2
|
* Fix bug #24246.
|
2022-06-24 09:05:46 +08:00 |
|
王怡栋
|
176239c74d
|
Merge branch 'master_xieqiyu_57850' into 'master'
* Code for task#57850.
See merge request easycorp/zentaopms!4122
|
2022-06-23 09:27:32 +00:00 |
|
xieqiyu
|
d4ac1b4a5f
|
* Code for task#57850.
|
2022-06-23 17:20:19 +08:00 |
|
mayue
|
fcb8b6bc9e
|
* Fix bug #24175.
|
2022-06-23 16:32:06 +08:00 |
|
王怡栋
|
03c76b1565
|
Merge branch 'master' into 'sprint/206'
# Conflicts:
# db/update17.1.sql
|
2022-06-22 07:26:11 +00:00 |
|
mayue
|
c3109321a6
|
* Fix bug #24049;
|
2022-06-22 15:04:28 +08:00 |
|
孙广明
|
1b562972e8
|
Merge branch 'sprint/206' into 'sprint_206_57892'
# Conflicts:
# module/doc/model.php
|
2022-06-22 03:10:18 +00:00 |
|
liumengyi
|
38f48bd103
|
* Optimize code for task#57892.
|
2022-06-22 11:08:42 +08:00 |
|
liumengyi
|
5ce8133079
|
* Fix bug for task #57891 #57890 #57889 #57886 #57885 #57892 #57887.
|
2022-06-22 10:58:57 +08:00 |
|
mayue
|
0ae4dc0878
|
* Fix bug #23982.
|
2022-06-22 09:19:32 +08:00 |
|
liumengyi
|
8c229fa6bc
|
* Finish task #58063.
|
2022-06-22 08:59:29 +08:00 |
|
sunjun
|
eafcb352c6
|
* Finish task #57891 #57890 #57889 #57886 #57885 #57892 #57887
|
2022-06-21 05:17:09 +00:00 |
|
zenggang
|
dff6937dc4
|
* Adjust code
|
2022-06-20 09:29:29 +00:00 |
|
zenggang
|
2564d2d60b
|
* Finish task#57903
|
2022-06-20 09:27:56 +00:00 |
|
mayue
|
49db5d2b2e
|
* Fix bug #23870#23868.
|
2022-06-17 14:12:47 +08:00 |
|
mayue
|
88c7c0222b
|
* Optimize code.
|
2022-06-16 16:34:13 +08:00 |
|
mayue
|
179191fd7d
|
* Fix bug #23183.
|
2022-06-16 16:15:13 +08:00 |
|