 王怡栋
|
b9ebcd6944
|
* code for bug #21655.
|
2022-04-15 11:20:28 +08:00 |
|
|
王怡栋
|
f52e4a8a82
|
* code for bug #18161.
|
2022-04-12 14:21:07 +08:00 |
|
|
songchenxuan
|
0654bcc2ad
|
* Fix api format data bug.
|
2022-04-08 16:03:03 +08:00 |
|
|
李玉春
|
46a965b02b
|
Merge branch 'cyy_bug_14928' into 'master'
* Fix bug #14928.
See merge request easycorp/zentaopms!2662
|
2022-04-02 06:05:51 +00:00 |
|
|
xieqiyu
|
964e484f09
|
* Fix bug#21382.
|
2022-04-01 14:47:00 +08:00 |
|
|
caoyanyi
|
2fcabdfc3f
|
* Modify api function for createLink.
|
2022-03-31 17:08:28 +08:00 |
|
|
songchenxuan
|
3ede5cca11
|
* Fix api helper bug.
|
2022-03-31 16:30:00 +08:00 |
|
|
孙广明
|
2b1b3b1733
|
Merge branch 'liyuchun_fixbug' into 'master'
* Fix bug #20939.
See merge request easycorp/zentaopms!2619
|
2022-03-30 06:03:01 +00:00 |
|
|
liyuchun
|
cd9b896e71
|
* Fix bug #18316.
|
2022-03-29 17:30:47 +08:00 |
|
|
caoyanyi
|
4e1c4c0249
|
* Add return for file upload size.
|
2022-03-29 14:36:29 +08:00 |
|
|
caoyanyi
|
258e8040c5
|
* Adjust code.
|
2022-03-24 09:03:37 +08:00 |
|
|
caoyanyi
|
e2ba478233
|
* Modify config get.
|
2022-03-24 09:02:00 +08:00 |
|
|
caoyanyi
|
63ab9c8de3
|
* Add config return.
|
2022-03-23 16:20:21 +08:00 |
|
|
孙广明
|
0c79df3fb6
|
Merge branch 'wyd_fixbug' into 'master'
Wyd fixbug
See merge request easycorp/zentaopms!2461
|
2022-03-23 00:53:36 +00:00 |
|
|
王怡栋
|
792501cf85
|
Merge branch 'sprint/master_lanzongjun_version_lite' into 'master'
* fix task #51347,#51307
See merge request easycorp/zentaopms!2429
|
2022-03-22 03:09:56 +00:00 |
|
|
Zongjun Lan
|
4d7ee95c09
|
* fix task #51347,#51307
|
2022-03-22 10:56:21 +08:00 |
|
|
朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00:00 |
|
|
王怡栋
|
7e0a6e8b11
|
* fix bug #19267.
|
2022-03-17 09:41:28 +08:00 |
|
|
孙广明
|
d058c26177
|
* Remove unused code.
|
2022-03-16 15:48:03 +08:00 |
|
|
王怡栋
|
55beac7f83
|
* fix bug #20581.
|
2022-03-10 16:31:46 +08:00 |
|
|
songchenxuan
|
5118abeaf9
|
*Fix API bug.
|
2022-03-09 14:41:01 +08:00 |
|
|
zhengrunyu
|
2a6f7cbc4b
|
*fix api.
|
2022-03-08 13:56:26 +08:00 |
|
|
王怡栋
|
aff63f4ff7
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-08 10:54:08 +08:00 |
|
|
王怡栋
|
b960a07ecf
|
* code for task #49352.
|
2022-03-08 10:52:48 +08:00 |
|
|
王怡栋
|
ed5aa3d335
|
Merge branch 'sprint/master_tanghucheng_bug' into 'master'
* Fix bug #50369.
See merge request easycorp/zentaopms!2133
|
2022-03-08 02:26:35 +00:00 |
|
|
tanghucheng
|
b279fbbc3e
|
* Fix bug #50369.
|
2022-03-08 10:19:07 +08:00 |
|
|
孙广明
|
f76d93b889
|
Merge branch 'sprint/187_hufangzhou_20439' into 'master'
* Fix bug #20439.
See merge request easycorp/zentaopms!2125
|
2022-03-08 00:53:24 +00:00 |
|
|
zhujinyong
|
4451a14e00
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-07 23:04:17 +08:00 |
|
|
zhujinyong
|
43ef4bc43c
|
* Fix upgrade.
|
2022-03-07 23:00:30 +08:00 |
|
|
hufangzhou
|
24305ecd66
|
* Fix bug #20439.
|
2022-03-07 17:49:16 +08:00 |
|
|
hufangzhou
|
6822e98080
|
* Fix bug #50310.
|
2022-03-07 10:36:44 +08:00 |
|
|
孙广明
|
5cae6e943c
|
* Finish task #50323.
|
2022-03-07 08:54:42 +08:00 |
|
|
王怡栋
|
ebb6c3be60
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-04 15:06:01 +08:00 |
|
|
王怡栋
|
b19ff4c180
|
* adjust for flow.
|
2022-03-04 15:05:34 +08:00 |
|
|
孙广明
|
202df229b0
|
* Code for force upgrade.
|
2022-03-04 09:42:19 +08:00 |
|
|
zhujinyong
|
732a6d8891
|
* Fix bug: declare function of ext model.
|
2022-03-04 08:46:41 +08:00 |
|
|
zhujinyong
|
f25b9b44ce
|
* Remove ext model of same filename.
|
2022-03-03 22:58:39 +08:00 |
|
|
tianshujie
|
75ba14eb95
|
* Fix bug #20298.
|
2022-03-03 17:05:35 +08:00 |
|
|
王怡栋
|
9acdcb0abf
|
* adjust for check flow require field.
|
2022-03-03 16:11:10 +08:00 |
|
|
王怡栋
|
560eac89d9
|
Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms
|
2022-03-03 10:20:47 +08:00 |
|
|
王怡栋
|
58b1f576bc
|
* fix for api and remove bom and adjust for php8.1.
|
2022-03-03 10:19:58 +08:00 |
|
|
孙广明
|
42624e0427
|
* Add upgrade logic.
|
2022-03-02 14:10:59 +08:00 |
|
|
王怡栋
|
e83555ffd3
|
* adjust for php8.0
|
2022-03-01 13:32:31 +08:00 |
|
|
zhujinyong
|
83164be6f8
|
* Refactor xuan.
|
2022-03-01 13:19:09 +08:00 |
|
|
王怡栋
|
19c8398090
|
Merge branch 'sprint/master_tanghucheng_lite' into 'master'
* Hide preference and tutorial.
See merge request easycorp/zentaopms!2010
|
2022-02-28 07:25:24 +00:00 |
|
|
tanghucheng
|
ccc11c4e4b
|
* Hide preference and tutorial.
|
2022-02-28 15:18:57 +08:00 |
|
|
zhujinyong
|
9fd0e4c3ed
|
* Fix xuan extension.
|
2022-02-28 14:52:46 +08:00 |
|
|
zhujinyong
|
994cb810ef
|
* Fix xuan extension.
|
2022-02-28 14:41:44 +08:00 |
|
|
zhujinyong
|
3f7ff4ee25
|
Merge branch 'sprint/185' of https://gitlab.zcorp.cc/easycorp/zentaopms into sprint/185
|
2022-02-25 17:37:29 +08:00 |
|
|
zhujinyong
|
08ea97263f
|
* Fix hook files of xuan.
|
2022-02-25 17:37:10 +08:00 |
|