Commit graph

111 commits

Author SHA1 Message Date
Anand Doshi
38d89edbb7 Email Styling when Print Format is part of the body 2014-02-10 17:40:44 +05:30
Akhilesh Darjee
16b6a379a0 minor change 2014-02-03 19:33:53 +05:30
Akhilesh Darjee
26212d7982 merge conflict fixed 2014-02-03 17:42:13 +05:30
Akhilesh Darjee
d90040a02e bulk email monor change 2014-02-03 16:47:18 +05:30
Nabin Hait
bb7fcc30a3 Fxed conflict 2014-01-31 17:01:20 +05:30
Rushabh Mehta
c48daa9e02 more fixes to email 2014-01-31 16:08:27 +05:30
Rushabh Mehta
5514364c27 bugfix in bulk mail 2014-01-31 14:49:36 +05:30
Nabin Hait
e82aeb0274 Scrub urls of email attachments 2014-01-31 12:37:22 +05:30
Rushabh Mehta
9d41a2179a cleaning up emails 2014-01-30 14:57:48 +05:30
Anand Doshi
c4ce0c869b Added requirement: inlinestyler, added html email template, expand partial links in bulk email text content 2014-01-27 14:56:24 +05:30
Rushabh Mehta
f3046abd46 added in db.py, bulk unsubscribe optional 2014-01-20 15:30:39 +05:30
Rushabh Mehta
78f7ff3649 profile fixes and ctrl+s issue in firefox 2014-01-15 12:24:10 +05:30
Anand Doshi
1be5479fab Fixed scheduler, webnotes scheduler events and delete doc 2014-01-13 21:23:16 +05:30
Anand Doshi
3968f66d5f Fixes for MySQL-python==1.2.5 2014-01-05 02:45:00 +05:30
Anand Doshi
24f2445065 Merge remote-tracking branch 'webnotes/4.0.0-wip' into permissions
Conflicts:
	webnotes/__init__.py
	webnotes/core/doctype/docfield/docfield.txt
	webnotes/core/page/data_import_tool/data_import_tool.js
	webnotes/defaults.py
	webnotes/install_lib/install.py
	webnotes/model/bean.py
	webnotes/model/code.py
	webnotes/sessions.py
	webnotes/tests/test_nested_set.py
	webnotes/widgets/page.py
2013-12-26 19:12:35 +05:30
Rushabh Mehta
cf71e3725a Merged with develop 2013-12-26 10:36:37 +05:30
Anand Doshi
148c5d8891 [minor] pop socket timeout 2013-12-23 20:01:12 +05:30
Anand Doshi
df95128fed [minor] use mixin class for Timed_POP3 and Timed_POP3_SSL 2013-12-23 20:01:12 +05:30
Pratik Vyas
46b2a3019b Set timeout POP3 session using pop_timeout in conf.py 2013-12-23 20:01:12 +05:30
Anand Doshi
8a3be21704 Throttle POP pulling based on time and space (not the physics kind) 2013-12-23 20:01:12 +05:30
Anand Doshi
7720e999e9 [minor] [fix] error logging for pop 2013-12-23 20:01:11 +05:30
Anand Doshi
6268738cba specify max_email_size in conf.py to limit size of each email pulled using POP and the total size of all emails pulled in a single scheduler call 2013-12-23 20:01:11 +05:30
Pratik Vyas
7b2ffcee6f iterate on other footers (smtp) 2013-12-23 11:54:52 +05:30
Anand Doshi
fa8ae0ecf6 [minor] [smtp] always add Reply-To header, add Date header 2013-12-16 14:48:17 +05:30
Rushabh Mehta
e665ce1907 notifications via hooks webnotes/wnframework#351 2013-12-13 15:34:12 +05:30
Anand Doshi
f88a0fbafb [minor] [smtp] propagate exceptions 2013-12-04 16:28:23 +05:30
Anand Doshi
055b180f4d [minor] pop socket timeout 2013-12-03 12:53:02 +05:30
Anand Doshi
43e470dd38 [minor] use mixin class for Timed_POP3 and Timed_POP3_SSL 2013-12-02 23:51:16 +05:30
Pratik Vyas
6fb9461989 Set timeout POP3 session using pop_timeout in conf.py 2013-12-02 20:29:25 +05:30
Pratik Vyas
b1ac9449c2 Merge pull request #328 from anandpdoshi/throttle-pop
Throttle POP pulling based on time and space (not the physics kind)
2013-12-02 04:22:21 -08:00
Anand Doshi
ab75ff19cf Throttle POP pulling based on time and space (not the physics kind) 2013-12-02 17:50:25 +05:30
Anand Doshi
15a6758c90 [minor] [fix] error logging for pop 2013-12-02 17:14:24 +05:30
Anand Doshi
ba4a48fbd8 specify max_email_size in conf.py to limit size of each email pulled using POP and the total size of all emails pulled in a single scheduler call 2013-12-02 15:37:29 +05:30
Rushabh Mehta
325def77df [copyright] added Contributors 2013-11-20 12:58:35 +05:30
Anand Doshi
58f6dfe50a [minor] expand partial links when sending email 2013-11-14 14:29:24 +05:30
Nabin Hait
6a54002636 [merge] merged with master 2013-10-24 11:21:10 +05:30
Anand Doshi
8584c6ca02 [minor] removed references to server.py 2013-10-17 20:00:52 +05:30
Anand Doshi
b6d932a13f [minor] don't rollback when running all tests, fixed test cases 2013-10-15 19:53:09 +05:30
Akhilesh Darjee
8e7b85091f [fix] [minor] attachment related fixes 2013-10-11 11:02:34 +05:30
Rushabh Mehta
2e0a75a8eb [wsgi] [minor] fixed flags 2013-10-08 18:22:51 +05:30
Rushabh Mehta
8731df68d5 [issues] [minor] fixed multiple minor issues 2013-10-03 14:50:55 +05:30
Anand Doshi
c7253a830a Merge branch 'master' of github.com:webnotes/wnframework into wsgi
Conflicts:
	requirements.txt
	webnotes/handler.py
	webnotes/install_lib/install.py
	webnotes/model/sync.py
	webnotes/webutils.py
2013-10-02 16:46:35 +05:30
Anand Doshi
fb3c9b15d8 [minor] [fix] POP3Mailbox use ssl 2013-10-02 11:28:11 +05:30
Rushabh Mehta
491af45225 commonified comments, now can be added on any generator 2013-09-25 16:07:18 +05:30
Anand Doshi
cd67dad3c5 [minor] fixes for import conf 2013-09-24 17:17:38 +05:30
Rushabh Mehta
d2f28555b9 [website] [minor] 2013-09-24 14:35:14 +05:30
Pratik Vyas
927a697ef6 conf migration part 1 2013-09-21 15:13:18 +05:30
Anand Doshi
0f5df7291e [fix] [minor] [website] 2013-09-17 15:28:58 +05:30
Rushabh Mehta
467c36ef08 [minor] install fixes 2013-09-12 17:01:51 +05:30
Rushabh Mehta
7923f9de71 [website] [minor] moving to framework 2013-09-09 12:17:45 +05:30