Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity
25,916 Commits 2 Branches 292 Tags
89b439d1da79ae06ef02edcdee7ea9ef7bc19b38
Commit Graph
550 Commits
Author SHA1 Message Date
zenggang 08cea5a111 * Finish task #13100 2021-07-30 11:05:32 +08:00
lichengjun eec44392ca Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms 2021-07-16 14:32:31 +08:00
lichengjun 4e95021b08 Fix Bug ID 40660. 2021-07-16 14:32:26 +08:00
qiyu-xie 34992b6a40 * Adjust code. 2021-07-16 14:00:27 +08:00
wangyidong 2017a9cc78 * finish task #40291. 2021-07-16 11:20:23 +08:00
wangyidong 22abf816b9 * finish task #40290. 2021-07-16 11:19:08 +08:00
Guan Xiying 1c802f2a36 Merge branch 'jihu' 2021-07-14 09:48:58 +08:00
wangyidong fa4fa5941e Merge branch '15.0' 2021-07-06 19:28:30 +08:00
wangyidong f3681dc1f6 * adjust for gitlab. 2021-07-02 15:00:07 +08:00
wangyidong 6f4b4588ab * fix for gitlab. 2021-07-02 10:54:24 +08:00
wangyidong c287a0cb49 * adjust code. 2021-07-01 16:56:59 +08:00
wangyidong bfb6b438dc * adjust for gitlab. 2021-06-29 13:07:56 +08:00
holan20180123 7b7ff8d209 * Adjust js locate. 2021-06-29 11:11:14 +08:00
wangyidong 82c3c82d23 * adjust for convert to pinyin for picker. 2021-06-17 14:46:54 +08:00
Guanxiying eb59efcbca * Fix get commits function. 2021-06-16 19:46:30 +08:00
wangyidong 3893084999 * adjust for mhtml. 2021-06-08 13:33:34 +08:00
holan20180123 206dea63bd * Add comments. 2021-06-07 08:56:57 +08:00
wangyidong 769e6b433b * merge from 15.0.beta3. 2021-06-05 13:01:53 +08:00
wangyidong 234b0e84a9 * Convert ' to \'. 2021-05-31 17:12:38 +08:00
wangyidong daf84879db * adjust for sync gitlab. 2021-05-31 10:07:20 +08:00
wangyidong a09aab24f8 * fix for sync gitlab. 2021-05-28 13:22:28 +08:00
wangyidong bf365b9188 * adjust for gitlab branch. 2021-05-27 14:16:44 +08:00
holan20180123 43dc4b74f4 * Finish task #38280. 2021-05-20 10:36:25 +08:00
wangyidong 19a098481e * adjust demo sql and fix ls gitlib. 2021-05-06 11:34:33 +08:00
wangyidong faf4c2b4dd * fix bug and xuanxuan. 2021-04-28 16:27:34 +08:00
wangyidong 3b8dd3db34 * fix bug #12050. 2021-04-28 10:53:52 +08:00
holan20180123 4cec21a516 * Fix bug #12333. 2021-04-27 14:28:21 +08:00
wangyidong 23800eace1 * adjust for gitlab. 2021-04-26 17:32:10 +08:00
Guanxiying 422c90ad76 * Fix diff function. 2021-04-16 14:01:35 +08:00
Guanxiying c304d9515a * Fix bug 12052. 2021-04-16 10:07:19 +08:00
Guanxiying 87f49eb3e1 * Merge gitlab codes. 2021-04-14 13:19:33 +08:00
leiyong df928c0223 * Adjust file filter.class.php. 2021-04-08 12:09:21 +03:00
wangyidong aa3085e485 * adjust for repo. 2021-04-01 17:52:38 +08:00
zhujinyong 3146fb6b3e - Remove function 'get_magic_quotes_gpc'. 2021-03-23 08:56:15 +08:00
zhujinyong a9015ba45d * Adjust main menu. 2021-03-17 09:35:51 +08:00
wangyidong 6bf40e474d Merge branch '12.x' 2021-02-19 13:17:23 +08:00
wangyidong e3c57cbb2d * adjust for feishu. 2021-02-19 10:19:51 +08:00
wangyidong d3669d6ee5 * adjust for feishu webhook. 2021-02-19 10:19:48 +08:00
wangyidong a1c238496d * finish task #9083,9108,9109. 2021-02-19 10:19:48 +08:00
wangyidong a59dcf117b * adjust for feishu. 2021-01-29 17:47:56 +08:00
wangyidong e5b0134b22 * finish task #9114. 2021-01-29 14:27:32 +08:00
wangyidong fc5adc765c * adjust for feishu webhook. 2021-01-29 13:15:50 +08:00
wangyidong 5db4e3a0f7 * finish task #9083,9108,9109. 2021-01-27 16:55:26 +08:00
leiyong 66ef1c6fa3 * Finish task#9005. 2021-01-19 11:13:23 +08:00
Yagami 23f1c4b024 * Code for task #5688. 2021-01-18 17:29:36 +08:00
wangyidong 9e1e418e5a * code task #8701 2020-12-17 11:28:33 +08:00
wangyidong 451ed69d38 * finish task #8701. 2020-12-17 09:28:48 +08:00
wangyidong c771e1947c Merge branch '12.x' 2020-12-11 20:42:10 +08:00
wangyidong 0be576eba3 Merge branch '12.x' of github.com:easysoft/zentaopms into 12.x 2020-12-08 14:53:01 +08:00
tianshujie98 a928152210 * Fix bug #3704. 2020-12-08 13:04:57 +08:00