 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 |
|
|
tianshujie
|
fcf2687316
|
* Modify the selection box drop-down display.
|
2023-03-29 17:23:10 +08:00 |
|
|
qixinzhi
|
511240d0fa
|
Merge branch 'master' into sprint/biz17
|
2023-03-22 17:15:46 +08:00 |
|
|
caoyanyi
|
4ee37b3d63
|
* Modify input section id value.
|
2023-03-13 10:24:15 +08:00 |
|
|
guofeilong
|
855b1a4d76
|
* Adjust code for bug #32811 .
|
2023-03-13 09:53:13 +08:00 |
|
|
曾刚
|
2da060b171
|
Gitlab optimize
|
2023-03-09 08:05:10 +00:00 |
|
|
qixinzhi
|
b4e8de97e5
|
Merge branch 'master' into sprint/biz17
|
2023-03-06 09:04:52 +08:00 |
|
|
wangyidong
|
1064bef3a7
|
* adjust code for editor.
|
2023-03-03 14:19:31 +08:00 |
|
|
guofeilong
|
40015657cc
|
* Code for task #85502
|
2023-03-02 10:16:48 +08:00 |
|
|
guofeilong
|
68e10e515e
|
* Code for task #85502
|
2023-03-01 13:54:45 +08:00 |
|
|
caoyanyi
|
7d81da6fa0
|
* Remove unused code.
|
2023-02-27 13:40:47 +08:00 |
|
|
liuyongkai
|
03163f1818
|
* Resolve ticket #419.
|
2023-02-27 12:55:13 +08:00 |
|
|
鲁飞
|
c93d138a83
|
+ Support Apcu and Yac cache driver.
|
2023-02-22 06:20:00 +00:00 |
|
|
qixinzhi
|
4580fb13ed
|
Merge branch 'master' into sprint/biz17
|
2023-02-17 15:24:51 +08:00 |
|
|
hufangzhou
|
f3cd2e7d4d
|
* Change the Easy Soft to ZenTao Software.
|
2023-02-15 17:01:22 +08:00 |
|
|
Wenrui LI
|
f03bf51121
|
* use static:: instead of self:: to enable extending static functions, and inject script to make js alert work on zentao client.
|
2023-02-13 14:00:55 +08:00 |
|
|
zenggang
|
317ddd5fbc
|
* Fix bug #32024
|
2023-02-13 02:02:32 +00:00 |
|
|
qixinzhi
|
6e252030b0
|
* Fix sqlparser php check.
|
2023-02-10 13:10:00 +08:00 |
|
|
qixinzhi
|
7c122a0b29
|
* Support php 5.3 for sql parser lib.
|
2023-02-10 11:24:24 +08:00 |
|
|
liuhong
|
da18b4b7f0
|
* Adjust code for bug #30537.
|
2023-01-03 02:33:48 +00:00 |
|
|
liuhong
|
9bd8f21ac6
|
* Fix bug #30537.
|
2023-01-03 02:22:37 +00:00 |
|
|
tanghucheng
|
62c1ed7f9c
|
Merge branch 'master' into zenops_46
|
2022-12-30 09:40:04 +08:00 |
|
|
王怡栋
|
4af7ffbfa9
|
Merge branch 'sprint/konglinmao_optimize_code2' into 'master'
* Optimize code.
See merge request easycorp/zentaopms!6640
|
2022-12-27 08:48:41 +00:00 |
|
|
孔令茂
|
610e22f948
|
* Optimize code.
|
2022-12-27 08:45:32 +00:00 |
|
|
liugang
|
8100689bb2
|
Merge branch 'sprint/biz17'
|
2022-12-26 08:50:31 +08:00 |
|
|
chaideqing
|
b72e6e2d0c
|
* Fix feedback 1799.
|
2022-12-22 12:13:52 +08:00 |
|
|
chaideqing
|
435852fd14
|
* Fix feedback 1799 .
|
2022-12-22 11:53:20 +08:00 |
|
|
caoyanyi
|
59801bf729
|
* Modify blame get error.
|
2022-12-16 13:36:23 +08:00 |
|
|
tanghucheng
|
85ffa23da8
|
Merge branch 'master' into zenops_46_tanghucheng
|
2022-12-15 15:27:59 +08:00 |
|
|
wangyidong
|
b7dfd47433
|
* fix bug.
|
2022-12-08 11:04:55 +08:00 |
|
|
caoyanyi
|
f58e24e6fc
|
Merge branch 'master' into zenops_46
|
2022-12-02 10:04:48 +08:00 |
|
|
Lufei
|
3f556e626b
|
* Fix get extension files error for use softlink.
|
2022-11-30 16:57:52 +08:00 |
|
|
caoyanyi
|
8c97159cdc
|
Merge branch 'master' into zenops_46
|
2022-11-29 08:31:29 +08:00 |
|
|
王怡栋
|
7a3a07061e
|
Merge branch 'cyy_repo' into 'master'
* Modify git branh check.
See merge request easycorp/zentaopms!6393
|
2022-11-28 08:38:14 +00:00 |
|
|
daitingting
|
7025eeb91e
|
* Finish task #77605.
|
2022-11-28 08:09:10 +00:00 |
|
|
caoyanyi
|
591f4ab7b1
|
* Adjust code.
|
2022-11-28 13:30:32 +08:00 |
|
|
caoyanyi
|
b5c140fa52
|
* Modify git branh check.
|
2022-11-28 13:29:22 +08:00 |
|
|
liugang
|
b688d08312
|
Merge branch 'master' into sprint/biz17
|
2022-11-23 10:10:30 +08:00 |
|
|
caoyanyi
|
0d81c7f4fe
|
Merge branch 'master' into zenops_46
|
2022-11-22 15:39:59 +08:00 |
|
|
xieqiyu
|
80e19fe5e1
|
* Fix bug#29789.
|
2022-11-21 14:57:58 +08:00 |
|
|
liugang
|
7c62eef9dc
|
Merge branch 'master' into sprint/biz17
|
2022-11-21 13:08:59 +08:00 |
|
|
zhujinyong
|
05ae463eab
|
* Adjust code of DAO.
|
2022-11-21 08:38:44 +08:00 |
|
|
Lufei
|
4fe09fb507
|
* Fix GH-104, Get extension removePath error.
|
2022-11-18 08:49:38 +08:00 |
|
|
zhujinyong
|
b4d4e33e23
|
+ Add getColumns function for dao.
|
2022-11-09 15:44:49 +08:00 |
|
|
caoyanyi
|
1630ab8885
|
Merge branch 'master' into zenops_46
|
2022-11-08 09:24:42 +08:00 |
|
|
wangyidong
|
148d3d6d6b
|
Merge branch 'master' into zentaopms_239
|
2022-10-27 11:39:47 +08:00 |
|
|
liyuchun
|
00547dc0f5
|
Merge branch 'master' into zenops_46
|
2022-10-24 09:18:10 +08:00 |
|
|
chaideqing
|
cf2d303acf
|
* resolve feedback #1128
|
2022-10-12 14:41:26 +08:00 |
|
|
wangyidong
|
d300ee00da
|
Merge branch 'master' into zentaopms_239
|
2022-09-30 09:07:53 +08:00 |
|
|
wangyidong
|
6e6ecb4f6a
|
* finish task #70199.
|
2022-09-26 17:28:15 +08:00 |
|