Commit Graph

518 Commits

Author SHA1 Message Date
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
tianshujie98
a97a7df6d8 * Fix bug #3704. 2020-12-08 11:41:51 +08:00
wangyidong
ad94534129 * fix bug #3737. 2020-12-08 11:24:07 +08:00
wangyidong
43804684d7 * fix bug #3713. 2020-12-01 11:05:58 +08:00
wangyidong
c1a92cadbb * fix bug #3713. 2020-12-01 10:01:12 +08:00
wangyidong
e10897a838 * fix bug. 2020-12-01 09:03:32 +08:00
z
ca26bfbfec * fix bug and upgrade. 2020-11-29 17:21:01 +08:00
z
5644b81408 Merge branch '12.x' 2020-10-30 16:58:47 +08:00
z
bd59b4a920 * finish task #12974. 2020-10-29 13:24:46 +08:00
z
d712b9726d * fix for install extension. 2020-10-26 09:12:46 +08:00
z
a4757e218a * fix for wechatapi. 2020-10-26 09:08:25 +08:00
chenfeiCF
4ba9acb39a * Adjust zfile class and extension copyPackageFiles method. 2020-10-20 06:19:39 +00:00
z
cbdaa88229 * adjust code. 2020-10-13 10:15:44 +08:00
leiyong
81d9b1de5d * Finish task#8059. 2020-10-09 17:42:15 +08:00
z
3d0ccb781d * finish task #8091. 2020-10-09 09:13:29 +08:00
z
4262f4c782 * finish task #8051. 2020-09-30 20:34:53 +08:00
z
48be6e258d * finish task #8049. 2020-09-30 17:13:57 +08:00
qiyu-xie
19ec606bce * Finish task#8052. 2020-09-30 14:35:42 +08:00
qiyu-xie
b43cb38a6c * Finish task#8052. 2020-09-30 13:56:30 +08:00
z
8e5c1a84f4 * finish task #7996. 2020-09-27 14:37:01 +08:00
qiyu-xie
7c1dcc5c51 * Finish task#8000. 2020-09-24 10:24:02 +08:00
qiyu-xie
f76fec1b54 * Finish task#8000. 2020-09-24 10:03:25 +08:00
z
3fa53be319 * code for task #7939. 2020-09-23 15:05:45 +08:00
z
ba32604be6 * fix for flow. 2020-08-31 15:17:40 +08:00
Yagami
189c0928d2 * Remove empty options condition. 2020-08-28 13:48:29 +08:00
Yagami
b72a7dee43 Merge branch 'master' into 20.x 2020-08-26 16:10:36 +08:00
z
cc3a9aeb9e * fix bug #2729. 2020-08-18 15:03:09 +08:00
qiyu-xie
76381c1fd2 * Merge. 2020-08-05 11:16:37 +08:00
z
a6a2ddc4f9 * add status in json. 2020-07-27 13:25:16 +08:00
chenfei
6972e19d53 * Finish task #7522. 2020-07-25 22:13:30 +08:00
z
f4987f4a04 * code for task #7548. 2020-07-24 21:45:48 +08:00
chenfei
5a96e8a5a5 * Finish task #7411. 2020-07-22 09:26:49 +08:00
z
ffabfbfbba * adjust for svn path has space. 2020-07-22 09:05:41 +08:00