Commit Graph

102 Commits

Author SHA1 Message Date
tianshujie
b213f38e1f * Fix bug #17944. 2022-03-16 12:09:51 +08:00
tianshujie
0fde764778 * Fix bug #17944. 2022-03-15 10:27:27 +08:00
liyuchun
c39512c79e * Finish task #45154. 2021-12-03 09:33:35 +08:00
liyuchun
f6301e4c9a Merge branch 'sugon' 2021-12-01 16:48:00 +08:00
孙广明
c42cca1249 Merge branch 'sprint/168' 2021-11-30 14:38:32 +08:00
王怡栋
b3cb90e69e * replace processMarkdown method. 2021-11-30 09:58:11 +08:00
liyuchun
dbf176316b * Finish task #45154. 2021-11-29 11:29:46 +08:00
zenggang
9b13921ed4 * Adjust code 2021-11-24 06:13:04 +00:00
zenggang
8d458a0a72 * Finish task#44404 2021-11-23 11:08:15 +00:00
liyuchun
5705ff994f * Finish task #44368. 2021-11-18 16:25:33 +08:00
王怡栋
7ed13fff0a * fix bug #15215. 2021-09-22 08:45:09 +08:00
liyuchun
a36720eed1 * Code for review. 2021-09-07 17:19:16 +08:00
tianshujie98
f8074fdafb * Finish task #41800. 2021-08-25 10:45:33 +08:00
wangyidong
d433403d31 * finish task #6878. 2020-02-11 16:14:11 +08:00
wangyidong
58f5936bae * finish task #6820. 2020-02-05 17:29:21 +08:00
yfl
396e7f42d7 * task #7863 2019-04-15 13:55:54 +08:00
wangyidong
9e3bdec8f8 * finish task #5301. 2019-02-20 19:58:03 +08:00
wangyidong
b10b13b4b8 * finish task #3562. 2018-01-08 15:50:53 +08:00
wangyidong
eb8d31ca6b * unique mail cc list. 2017-11-07 13:09:48 +08:00
wangyidong
08c473b8ca * fix bug for zentaobiz. 2017-09-08 16:19:32 +08:00
wangyidong
f60a4c664b * custom show deleted user. 2017-09-04 14:46:17 +08:00
wangyidong
4f43386af8 Merge branch 'master' of github.com:easysoft/zentaopms 2017-08-14 10:05:57 +08:00
wangyidong
b91e47c2e7 * finish task #3117. 2017-08-14 10:05:30 +08:00
pengjiangxiu
dccebc7b9a * Finish task #3119. 2017-08-14 09:56:39 +08:00
wangyidong
794fb575db * adjust for save file not with extension. 2017-06-26 14:47:58 +08:00
wangyidong
c27f1f7d34 * merge zentaophp to zentao. 2017-06-09 17:05:37 +08:00
wangyidong
54962074fc * finish task #2884,2872. 2017-01-17 09:19:52 +08:00
wangyidong
cd25a4216e * fix for save mail queue. 2017-01-09 09:29:09 +08:00
chenfeiCF
d77aae1feb * merge two mails subject as the subject. 2016-12-28 14:49:42 +08:00
wangyidong
cdbf4c6dcf * adjust for certify. 2016-12-27 15:33:26 +08:00
wangyidong
80a11b9089 * fix bug #952. 2016-12-26 15:40:02 +08:00
chenfeiCF
a94a63998b * not merge mails if method is browse of mail module. 2016-12-21 14:46:28 +08:00
chenfeiCF
507d9a2d8e * merge mails when async send mails. 2016-12-20 08:58:36 +08:00
wangyidong
86b0a414f5 * change for bind sendcloud. 2016-12-19 09:32:08 +08:00
wangyidong
185f540348 * adjust for skip task when batch close. 2016-12-06 11:30:59 +08:00
wangyidong
7ac6afe616 * finish task #2719,2729. 2016-11-25 15:32:28 +08:00
wangyidong
21d6f08818 * finish task #2618. 2016-06-07 15:15:10 +08:00
wangyidong
78ce4d3aeb * code for task #2616. 2016-06-07 13:59:03 +08:00
wangyidong
b986c959e2 * finish task #2616. 2016-06-07 13:47:04 +08:00
wangyidong
015401d1e0 * change zpl 1.1 to 1.2. 2015-11-05 14:09:52 +08:00
wangyidong
8110f8fcb2 * Sync to sendcloud when create,edit and delete user. 2015-09-17 16:23:51 +08:00
wangyidong
f008c12234 * adjust code for utf8 bom in file. 2015-09-16 10:19:31 +08:00
wangyidong
91890ff23b * finish task #2273. 2015-09-15 14:40:20 +08:00
wangyidong
5c13559737 * fix bug #735. 2015-09-10 16:08:45 +08:00
wangyidong
530a68da22 * finish task #2272,2271,2270. 2015-09-08 15:30:11 +08:00
wangyidong
0f79a4f998 * finish task #2315. 2015-08-26 14:37:01 +08:00
wangyidong
ecf44af91d * fix bugs. 2015-07-01 10:29:06 +08:00
wangyidong
922348465d * fix bugs. 2015-03-26 16:00:21 +08:00
wangyidong
c4ade54fc3 fix a bug for async mail. 2015-03-13 13:33:30 +08:00
wangyidong
e3276297c5 * finish task #2208. 2015-02-28 17:26:27 +08:00