Commit Graph

826 Commits

Author SHA1 Message Date
王怡栋
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
wangyidong
b7dfd47433 * fix bug. 2022-12-08 11:04:55 +08:00
Lufei
3f556e626b * Fix get extension files error for use softlink. 2022-11-30 16:57:52 +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
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
wangyidong
148d3d6d6b Merge branch 'master' into zentaopms_239 2022-10-27 11:39:47 +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
wangyidong
7a48c595b4 * code for add data-app attr. 2022-09-26 15:26:48 +08:00
Guan Xiying
ae2f8881c5 * Rename exportJS to show. 2022-09-15 09:07:43 +08:00
Guan Xiying
1deda7b09a * Add dtable class. 2022-09-14 11:32:51 +08:00
daitingting
a09269de36 * Fix bug #67888. 2022-09-06 05:59:31 +00:00
wangyidong
8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
tianshujie
d4b043d72d * Fix bug #26902. 2022-08-26 09:56:57 +08:00
王怡栋
fcaa812a59 Update dao.class.php 2022-08-19 03:02:13 +00:00
tanghucheng
62226afa38 * Fix bug #26673. 2022-08-19 10:57:18 +08:00
mayue
a3e8222009 * Fix workflow issue. 2022-08-19 08:52:37 +08:00
caoyanyi
8c1a24d3b5 Merge branch 'master' into zenops_41 2022-08-17 16:03:23 +08:00
zhujinyong
c8f3aec35b + Add vendor of sqlparser. 2022-08-16 15:02:27 +08:00
zhujinyong
b6dcbaa519 + Add libraries for bi. 2022-08-15 12:02:11 +08:00
liyuchun
32613a2045 * Finish task #64263. 2022-08-12 17:10:47 +08:00
liyuchun
6c2cacf02c Merge branch 'master' into zenops_41 2022-08-10 08:26:42 +00:00
caoyanyi
babcd069a8 * Adjust codes. 2022-08-05 08:31:54 +08:00
caoyanyi
094cc998aa * Modify file download. 2022-08-04 14:51:39 +08:00
caoyanyi
85f8b08428 * Modify code download. 2022-08-04 14:25:16 +08:00
wangyidong
20ec50ea8a * fix for company todo. 2022-08-03 14:01:15 +08:00
caoyanyi
96d6ca78d7 * Modify code check. 2022-08-03 10:24:19 +08:00
caoyanyi
06abe97624 * Modify branch check error. 2022-08-02 15:19:08 +08:00
caoyanyi
bded54ba44 * Modify git clone for Gitea and Gogs. 2022-08-02 13:28:29 +08:00
caoyanyi
7a9885309f * Modify git clone url get. 2022-08-01 17:04:49 +08:00
caoyanyi
4b1dde8c7e * Modify gogs repo. 2022-08-01 15:40:55 +08:00
caoyanyi
d9b1d038eb * Modify page style and some bug. 2022-07-28 11:31:24 +08:00
caoyanyi
558412c237 * Modify repo pull in tmp. 2022-07-28 09:47:10 +08:00
caoyanyi
24d032fd92 * Modify tag get. 2022-07-27 08:48:08 +08:00
caoyanyi
9c7ed724cc * Adjust codes. 2022-07-27 08:24:21 +08:00
caoyanyi
3e484a6087 * Modify code pull. 2022-07-26 16:33:10 +08:00
caoyanyi
c10c25b84d * Modify branch get. 2022-07-26 16:16:17 +08:00