Commit graph

530 commits

Author SHA1 Message Date
Aditya Hase
e61a1edae2 Fixed broken (Python 3) email.Charset import 2017-09-04 16:05:58 +05:30
Aditya Hase
e4ff0444b2 Don't unnecessary encode header content 2017-09-04 16:05:58 +05:30
Aditya Hase
99f17c651c Use 'in' instead of 'has_key' 2017-09-04 16:05:58 +05:30
Makarand Bauskar
9d84f387e0 [hotfix] socket command error eof while connecting to email server (#4025)
* [hotfix] socket command error eof while connecting to email server

* [minor] codecy fixes
2017-09-01 09:10:26 +05:30
Rushabh Mehta
b7f3282bf6 Merge pull request #4011 from mbauskar/incoming-email
[hotfix] dont update the modified date for already fetched email (communication)
2017-08-30 00:52:37 +05:30
mbauskar
cd989da770 [hotfix] dont update the modified date for already fetched email (communication) 2017-08-30 00:13:35 +05:30
mbauskar
7d278e36b8 Merge branch 'master' into staging 2017-08-17 11:00:37 +05:30
mbauskar
8e5becf32b Merge branch 'master' into develop 2017-08-17 11:00:37 +05:30
Makarand Bauskar
7bf6c19a31 [hotfix] daily_emails limit fixes (#3942) 2017-08-17 10:59:26 +05:30
mbauskar
612afbfdb0 resolved merge conflicts 2017-08-16 18:25:35 +05:30
mbauskar
bc603de8be resolved conflicts 2017-08-16 18:24:21 +05:30
Rushabh Mehta
1c8d3326a1 Merge pull request #3937 from mbauskar/daily-email-limits
[hotfix] check daily email limit before sending emails
2017-08-16 17:16:16 +05:30
mbauskar
02cc55dd48 [hotfix] minor fixes 2017-08-16 16:42:50 +05:30
mbauskar
ce8f76ff4a [hotfix] check daily email limit before sending emails 2017-08-16 16:15:26 +05:30
Faris Ansari
67e16a58a6 [fix] unsubscribe link shouldn't append always (#3932) 2017-08-16 14:12:48 +05:30
Rushabh Mehta
05c88fa3f0 [minor] make email alert configurable, so we can use it list default print formats 2017-08-14 12:58:32 +05:30
Manas Solanki
6031d704dc fix the typos (#3919) 2017-08-11 14:39:53 +05:30
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
mbauskar
9d4767ae3f Merge branch 'master' into develop 2017-08-09 16:01:42 +05:30
mbauskar
2745ce407c [hotfix] encode file name to unicode 2017-08-09 12:12:00 +05:30
Manas Solanki
c9df03b60d validate the sender email id (#3862) 2017-08-07 13:36:03 +05:30
Aditya Hase
16a9bdfd31 Replaced urllib.unquote imports with six.moves.urllib.parse.unquote (#3836) 2017-08-02 17:09:31 +05:30
Aditya Hase
ec9a01e3aa Replaced 'except' clause syntax (#3827) 2017-08-02 16:58:24 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +05:30
Aditya Hase
928ebb66a6 Replaced HTMLParser imports with six.moves.html_parser (#3812) 2017-07-31 10:58:22 +05:30
Faris Ansari
f3f21554b2 Email footer refactor (#3807)
* Email footer refactor

* styling fixes

* Unsubscribe message

* fix test
2017-07-31 10:53:15 +05:30
mbauskar
3f70754e11 Merge branch 'master' into develop 2017-07-27 12:17:21 +05:30
Makarand Bauskar
22475a046c [hotfix] encode the email message to utf8 before sending mail (#3785)
* [hotfix] encode the email message to utf8 before sending mail

* [minor] review fixes
2017-07-27 12:14:37 +05:30
Rushabh Mehta
aef98daae4 [add] catch errors flake8 (#3800) 2017-07-27 11:34:44 +05:30
Faris Ansari
1332710982 Email footer (#3784)
* Add frappe.preview_email for faster feedback on email design

* Set Unsubscribe link color to text-muted

* error handling for header

* codacy fixes
2017-07-27 11:33:31 +05:30
Manas Solanki
81133888a8 [fix] add the parsed email id for the email group member (#3741)
* add the parsed email id of the email group member

* Minor fixe in the patch
2017-07-21 11:05:54 +05:30
Faris Ansari
5a498616b6 Email header (#3748)
* Fix fonts for emails

* Email header with indicator

* Login emails with header

* Add tests for email header

* fix codacy
2017-07-20 17:57:57 +05:30
Faris Ansari
9418d5b6ba Auto email report redesign (#3730)
* Add auto_email_report.html

* Add table styling for email

* wip

* commonify template

* Right align numeric fields

* Add text utility classes

* fix tests
2017-07-20 10:27:40 +05:30
Faris Ansari
db22aa1c87 Email styling using email.less (#3704)
* DRY font-family declarations

* Add email.less, inline styles using premailer

* min-width 100% for mobile email clients

* Emails without header have default 100% width (like before)

* Include email.css for all apps

* Keep !important declarations

* Add test case for inlining css

* Ignore important rules in css

* minor
2017-07-19 16:21:06 +05:30
Manas Solanki
bd4d0e45ca fix error in email queue (#3728) 2017-07-18 17:51:26 +05:30
Faris Ansari
f6d265b2ef Email inline_images enhancement, header (#3682)
* minor refactor

* update user.py to use new sendmail api

* On-demand attachments in email

* Replace inline_images by just specifying path

* Add header flag in frappe.sendmail

* Inline images can now be attached from assets/, files/ and private/files/

* Update tests

* Fix email_account test
2017-07-13 18:37:28 +05:30
Makarand Bauskar
9540443438 [minor] don't parse the address if email field is empty (#3675) 2017-07-13 11:33:14 +05:30
Faris Ansari
044ac18cb5 Email (#3625)
* inline images working, ability to use template name for emails

* Extract header into separate file

* Remove erp-logo

* minor refactor

* [minor] codacy

* fix for test

* Add test case for email body

* remove unused imports

* Add more tests for email body
2017-07-12 14:02:55 +05:30
Rushabh Mehta
2355dafc25 [minor] no scheduler for tests 2017-07-11 10:28:07 +05:30
Rushabh Mehta
b38aff0b89 [minor] remove commented lines in travis.yml 2017-07-11 10:28:07 +05:30
Charles-Henri Decultot
2da4bafa1e Clear outbox modification (#3628)
* Clear Outbox modification

* Correction of SQL query
2017-07-11 10:23:06 +05:30
Rushabh Mehta
7433286f36 [feature] ability to set a property after sending alert (#3635)
* [feature] ability to set a property after sending alert

* [minor] use db_set

* [minor] email alert show message only if not standard
2017-07-07 16:38:25 +05:30
Rushabh Mehta
4e4a42af91 [view] form dashboard behaves like a form section and is now collapsible (#3596)
* [view] form dashboard behaves like a form section and is now collapsible

* [fix] alert on newline

* [fix] clear headline in email_account.js
2017-07-07 09:13:55 +05:30
Manas Solanki
b7e1060ea7 removed the xlwt and use the openpyxl for sending the auto email report in xlsx format (#3590) 2017-07-03 12:27:34 +05:30
Ashwini Save
8ac396e30d Email configurable footer (#3584)
* Configurable footer for email template.

* Configurable footer: New table row for new line.

* Configurable footer: Updated space above footer text.
2017-07-03 12:25:54 +05:30
Rushabh Mehta
834ee797ca [wip] add inline images in frappe.sendmail (#3528) 2017-06-23 17:23:29 +05:30
mbauskar
bd88d09040 resolved merge conflicts 2017-06-21 14:37:18 +05:30
Makarand Bauskar
acba96bf2a minor fixes in auto email report 2017-06-20 19:02:10 +05:30
Rohit Waghchaure
99d39ea0a9 [fix] Auto email report not working 2017-06-20 15:00:15 +05:30
tundebabzy
bbde2ec4cf rewrite use of dict.iteritems (#3498)
* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility

* dict.iteritems to six.iteritems(dict) for python3 compatibility
2017-06-19 09:10:21 +05:30