Commit Graph
845 Commits
Author SHA1 Message Date
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
wangyidong 7a48c595b4 * code for add data-app attr. 2022-09-26 15:26:48 +08:00
liyuchun bf10b415df Merge branch 'zenops_44' into zenops_46 2022-09-20 08:33:44 +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
曹延义 2014a4b0ba Merge branch 'master' into zenops_44 2022-09-07 06:51:46 +00:00
daitingting a09269de36 * Fix bug #67888. 2022-09-06 05:59:31 +00:00
caoyanyi 77081214f5 * Add diff editor page. 2022-09-05 16:56:06 +08:00
caoyanyi 5fab9113bd * Fix bug for repo view. 2022-09-02 10:44:48 +08:00
caoyanyi 20d6ee9e10 Merge branch 'master' into zenops_44 2022-08-30 16:39:58 +08:00
liyuchun e4dac840b4 * Fix bug of subversion. 2022-08-29 13:03:27 +08:00
wangyidong 8d56ef8891 * Compatible for php8.1. 2022-08-29 11:19:31 +08:00
liyuchun 24fcabe346 * Fix bug when view code file. 2022-08-29 10:27:46 +08:00
caoyanyi a3cbaafafd Merge branch 'master' into zenops_44 2022-08-26 13:38:13 +08:00
tianshujie d4b043d72d * Fix bug #26902. 2022-08-26 09:56:57 +08:00
caoyanyi 1c595933e8 * Modify repo commit info. 2022-08-24 14:43:05 +08:00
liyuchun 4c5c2aff37 * Finish task #65982. 2022-08-24 10:40:27 +08:00
caoyanyi 98fe25b85a * Add monaco editor to repo view. 2022-08-22 16:31:58 +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