Commit Graph

81 Commits

Author SHA1 Message Date
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
wangyidong
0dd2d53f40 * change for task #2190. 2015-01-28 15:14:02 +08:00
xia0ta0
f22b980c23 * add ignore for iconv. 2014-11-25 10:40:19 +08:00
wangyidong
a8766c858f * fix a bug. 2014-11-24 08:51:39 +00:00
wangyidong
9f39bc1e2e * adjust mail. 2014-11-06 03:03:14 +00:00
ChuJilu
9395eb7517 * finish task #2108. 2014-11-04 11:56:41 +08:00
wangyidong
51f65c74fc * adjust for get image in mail. 2014-10-21 05:20:58 +00:00
wangyidong
408f5588ab * adjust code for task #1967. 2014-08-04 01:38:14 +00:00
wangyidong
4ae0876ba3 * finish task #1967. 2014-07-29 01:09:28 +00:00
wyd621
b66c834b43 * adjust for replace full webpath image to mail module. 2014-03-24 01:59:50 +00:00
xia0ta0
6612defc02 * code for task#1629. 2013-08-01 14:14:17 +08:00
wyd621
fb1b8520a3 * fix app->error to app->triggerError. 2013-07-29 14:05:29 +08:00
wyd621
aae95743f9 * finish task #1571. 2013-07-18 16:48:06 +08:00
wyd621
ec50ddf69d * commit for different. 2013-07-17 10:05:00 +08:00
chencongzhi520@gmail.com
52c2beecbe * code for task#1259. 2013-05-05 00:22:53 +00:00
chencongzhi520@gmail.com
78e7a70d10 * finish task#1259. 2013-04-29 09:06:34 +00:00
wangchunsheng
8f0d651d9c * convert to unix format. 2013-01-18 01:58:14 +00:00
wangchunsheng
48d43cb5e1 * change copyright time. 2013-01-18 01:18:58 +00:00
zhujinyong
71bfcceb8d + add mailExist function. 2013-01-11 05:32:54 +00:00
wangchunsheng
92cb1c6b70 * rewrite the mail setting logic, save config to database. 2013-01-11 03:12:52 +00:00
wangchunsheng
272897c294 * task#982, mail module. 2012-12-12 09:16:41 +00:00
wangchunsheng
9d4feeb031 * change timeout to 3 seconds. 2012-07-20 06:02:42 +00:00