朱金勇
|
ec7c5022c8
|
Merge branch 'master' into 'Zentao_app1.1'
# Conflicts:
# module/execution/control.php
|
2022-03-21 06:12:21 +00: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 |
|
孙广明
|
5ff5699d91
|
* Fix bug.
|
2022-02-25 17:11:58 +08:00 |
|
zhujinyong
|
8eae5ebf65
|
* FIx import path.
|
2022-02-25 16:18:07 +08:00 |
|
孙广明
|
c1ebe28837
|
* Fix bug.
|
2022-02-25 15:39:08 +08:00 |
|
zhujinyong
|
762c60d0d0
|
* Fix extLangPath.
|
2022-02-25 15:17:53 +08:00 |
|
zhujinyong
|
a33ba80fb4
|
* Adjust language of router.
|
2022-02-25 14:58:58 +08:00 |
|
孙广明
|
8cbc861ec1
|
Merge branch 'sprint/185_fixbug_wangyidong' into 'sprint/185'
* adjust for set vision.
See merge request easycorp/zentaopms!1962
|
2022-02-24 08:20:31 +00:00 |
|
王怡栋
|
34395b7a41
|
* adjust for set vision.
|
2022-02-24 16:17:09 +08:00 |
|
zhujinyong
|
c7708b55cc
|
* Adjust style of vision switcher.
|
2022-02-24 16:02:17 +08:00 |
|
zhujinyong
|
0ba3f443cf
|
* Fix loadExtension.
|
2022-02-24 14:58:02 +08:00 |
|
tianshujie
|
38ebc359e6
|
* Modify the code logic.
|
2022-02-23 17:02:03 +08:00 |
|
tianshujie
|
e1e2686493
|
* Modify the issue of feature review.
|
2022-02-23 16:56:22 +08:00 |
|
孙广明
|
0ee66db862
|
* Code for upgrade.
|
2022-02-23 13:44:09 +08:00 |
|
zhujinyong
|
b17c3c8206
|
* Move die to return print.
|
2022-02-22 08:42:32 +08:00 |
|
zhujinyong
|
4f32cb8a1c
|
+ Add xuan extension.
|
2022-02-21 10:30:38 +08:00 |
|
王怡栋
|
3082abe478
|
* adjust for set vision.
|
2022-02-18 08:36:54 +08:00 |
|
zhujinyong
|
d02ddc138c
|
Merge branch 'lite' into sprint/185
|
2022-02-17 10:20:50 +08:00 |
|
zhujinyong
|
5bd64d9312
|
Merge branch 'lite' into sprint/185
|
2022-02-17 08:56:40 +08:00 |
|