Commit graph

66 commits

Author SHA1 Message Date
Saurabh
33644ebfb2 [fix] merge conflicts 2017-10-27 16:05:45 +05:30
Faris Ansari
80054e0f28 Data Migration Tool Hotfix (#4396)
* Add get_source_value to utils, and use it to get value from object or dict

* GitHub connector

* fix codacy

* remove print statement

* Remove Github Connector

* Data Migration Connector

- Create new connection with boilerplate
- Add Run button in Data Migration Plan

* minor

* fix codacy

* remove pygithub

* Minor

- Remove button from form and add to custom button
- Remove is_custom field
- Add Connector Type 'Custom'
- Show New Connection button only in developer mode

* [fix] logging

- only store the name, not the whole json

* [fix] tests
2017-10-27 15:55:41 +05:30
Achilles Rasquinha
b5c4278341 BCC in Emails (#4377)
* added blank carbon copy

* [FEAT] BCC in emails

* removed test_communication, fixed comment

* fixed codacy
2017-10-25 15:33:30 +05:30
Aditya Hase
38d63f7dc7 Python 3 compatibility Frappe test fixes (#4318)
* Read image file in binary mode

* Read files in binary mode

* Don't use bytestrings unnecessarily

* Correctly convert byte strings to unicode in frappe.as_unicode

* Convert content to bytes before writing to file
2017-10-17 17:45:25 +05:30
Juan F Fernández
6efcd2e13d [HOTFIX] Fixed email sending on non ascii sender name (resolves #4313) (#4317) 2017-10-17 12:24:34 +05:30
Makarand Bauskar
ad1c04850c [hotfix] send email from sender's email account if From field is selected on communication view (#4181)
* [hotfix] send email from sender's email account if From field is selected on communication view

* [fixes] codecy fixes
2017-09-27 12:41:35 +05:30
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
Aditya Hase
769338f136 Replaced all instances of basestring with six.string_types 2017-08-11 00:10:11 +05:30
mbauskar
2745ce407c [hotfix] encode file name to unicode 2017-08-09 12:12:00 +05:30
Aditya Hase
e6bd1e4995 Replaced all instances of 'unicode' with 'six.text_type' (#3825) 2017-08-02 16:57:39 +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
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
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
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
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
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
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
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
Ayush Shukla
7ff1985257 Email praseaddr fix, fixes frappe/issues#3004 (#3345)
* email_parse address fix

* travis check for email-parseaddr

* email parseaddr fix

* fixes

* Added test case

* minor change

* Added few email_ids

* condition change
2017-05-19 15:50:21 +05:30
robert schouten
1071d4321d assorted email fixes 2017-02-14 16:06:36 +08:00
robert schouten
268e7ad644 [hotfix] stop frappe sending automatic responses from non user generated emails (#2674) 2017-02-03 14:29:21 +05:30
Rushabh Mehta
35d7bc2d3e [minor] remove references from email, leads to conversation for all messages 2017-02-02 18:11:56 +05:30
Nabin Hait
80e97a535b Merge branch 'master' into develop 2017-01-20 15:26:01 +05:30
Valmik Jangla
d222f1140a [fix] add brackets to message-id 2017-01-20 00:12:59 -08:00
KanchanChauhan
c0a685aa24 Email ID renamed to Email Address (#2541) 2017-01-05 14:55:51 +05:30
robert schouten
c044c476a8 move message_id threading to communication to work with inbox (#2458)
* move message_id threading to communication to work with inbox

* move message_id threading fix

* rebase fix

* reset threading to email queue but keep in communications
2016-12-15 14:50:52 +05:30
robert schouten
efa86c6e31 Email cc in headers if expose recipients (#2441)
* move email cc to header

* [test fixes] move email cc to header

* email cc additional tests

* email cc cleanup and unsubsribe link test

* email cc permit footer based cc with expose_recipient and tests + ui
2016-12-15 09:49:54 +05:30
Rushabh Mehta
43c6c47513 [email] threading based on message_id in Email Queue and test case 2016-11-17 16:47:04 +05:30
Rushabh Mehta
427de16d79 [fix] for test 2016-11-17 09:45:44 +05:30
Rushabh Mehta
c97d372655 [fix] set message-id and sync threads 2016-11-17 09:45:44 +05:30
Rushabh Mehta
2fe0e2acad [fix] set Message-Id in email based on reference and tag replies to the same object 2016-11-17 09:45:44 +05:30
Anand Doshi
9a330ab58f [hot] [fix] X-Original-From set_header 2016-04-20 20:11:01 +05:30
Anand Doshi
e8879454e8 [hot] [fix] Add X-Original-From header when replacing sender 2016-04-20 19:38:54 +05:30
Anand Doshi
8f59881e16 [fix] set from email in email body when always_use_account_email_id_as_sender=1 2016-04-15 17:27:54 +05:30
Anand Doshi
34bb97c69d [fix] email should have fully qualified URLs 2016-03-10 15:30:38 +05:30
Anand Doshi
1123387687 [fix] Prevent infinite back and forth between two frappe email accounts by sending In-Reply-To like any mail client 2016-02-26 17:19:05 +05:30
Anand Doshi
353e8a9d1f [fix] Sanitize form_dict and doc values to prevent XSS 2016-02-23 12:11:28 +05:30
Anand Doshi
1e6b9e25d8 [fix] Attach signature in auto-reply 2016-02-15 17:36:51 +05:30
Anand Doshi
3241a0969f [feature] Ability to like a document, comment or communication, see notifications about it and view it on activity feed 2016-01-01 12:50:14 +05:30
Rushabh Mehta
3a839cb705 [minor] [fix] default sender in email account 2015-11-17 11:43:05 +05:30
Anand Doshi
2b9cb67e1f Added CC in Communication to manually specify whom to notify. frappe/erpnext#3697 2015-09-17 13:14:51 +05:30
Anand Doshi
c079e27d3f Moved Backup Manager and Social Login keys to the new Integrations Module, prepared frappe for Mandrill Integration 2015-08-11 12:03:13 +05:30
Nabin Hait
4361c1121b [fix] email footer and signature 2015-05-26 12:17:33 +05:30
Rushabh Mehta
ef0c6b44f7 [email] consistent email, website branding 2015-05-26 12:17:33 +05:30
Rushabh Mehta
b39869a041 [enhancement] new email footer, like mailchip 2015-05-26 12:17:33 +05:30
Rushabh Mehta
ec2553f1e6 [emails] [fix] expand_relative_urls in email 2015-05-11 11:22:12 +05:30
Rushabh Mehta
a523ad9db0 [email] don't remove full name from sender 2015-04-20 15:04:31 +05:30