Commit graph

573 commits

Author SHA1 Message Date
Sachin Mane
4ad57caaea Enable jinja templating in 'cc' field in 'Email Alerts' (#4806)
* Fix JSON parse failure incase POST with no content is called.

* enable jija templating for 'cc' field in email alerts

* remove email validation from 'cc' field to support jinja'
2018-01-23 15:32:45 +05:30
Josh Reeder
ca294b99b5 Fix Domain vs Service selection (#4886)
Users confused by option to select both a Service AND a Domain. Fixing display depends on, fixes this UX bug.
2018-01-22 12:33:25 +05:30
Josh Reeder
421e0c4171 Description improvement for Google Cloud installs. (#4885)
Google Cloud allows port 587 for smtp.gmail.com and 2525 for other services such as SparkPost and Mailgun. Took a long time to figure this out.
2018-01-22 12:31:05 +05:30
Saurabh
410e6cadd7 [fix] pass language selected on email dialogue while enqueuing the function (#4808) 2018-01-12 16:43:26 +05:30
Faris Ansari
2760f049ac
Fix email_alert test (#4620)
* Test debugging

* Remove test_scheduler user after test

* Set user Administrator

* Remove debugging lines

* Set email user

* more debugging

* set_user Administrator

* minor
2017-12-18 12:55:45 +05:30
Manas Solanki
436ce11c60 escape the email account name (#4598) 2017-12-11 14:29:48 +05:30
Manas Solanki
406bf1d962 reference doctype and name in the email queue while sending email from the auto email report (#4557) 2017-12-01 12:06:38 +05:30
Rushabh Mehta
aa78c34664 Update integrations.py and Standard Reply naming 2017-11-20 10:51:07 +08:00
Dominik
eafecf9241 [New Integration] Googlemaps and edit Standard Reply Naming 2017-11-17 15:46:41 +08:00
ci2014
9d608d7178 Optimize regex to find parent of mail (#4440)
Made the Regex case insensitive and changed the regex to show only the lowercase (which will save some space). Added the aw and wg for german answer and forwarding.

I will add more languages based on this list https://en.wikipedia.org/wiki/List_of_email_subject_abbreviations after more research.
2017-11-10 12:37:17 +05:30
Achilles Rasquinha
b8825ca116 Pure Python MySQL instead mysqlclient (with Python C API) (#4280)
* added PyMYSQL instead mysqlclient-python

* added pymysql import

* fixed db module import

* foxed self._conn wrapper

* updated cursor migration

* removed existent converters

* some more fixes towards API port

* modified travis

* updated doctype and revereted yml

* modified travis

* refreshed logging

* raw fix

* moved from hard coded constants to declarable instances

* moved from hard coded constants to declarable instances

* refactoring and logging

* moved to global import declaration

* fixed codacy

* unfixed codacy

* minor fix

* binary_type has a single

* deprecated alternative

* merged with latest

* fixed merge conflicts

* using deprecated alternative

* raw fix

* stupid fix

* using StringTypes instead

* brutal hack

* log

* tundebazy to the rescue

* fixed content_hash error

* frappe/database.py

* frappe/database.py

* updated database.py

* updated requirements

* updated requirements

* fixed codacy

* fixed codacy

* moved from DatabaseOperationalError to pymysql.InternalError

* moved from DatabaseOperationalError to pymysql.InternalError

* fixed codacy

* empty commit

* fixed codacy

* fixed codacy
2017-11-06 16:42:01 +05:30
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
Manas Solanki
a279cdc4a2 attach print format in the emails before sending. (#4366) 2017-10-27 15:25:52 +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
d5d9fd5283 More Python 3 compatibility Frappe test fixes (#4321)
* stream object should be BytesIO instead of StringIO

* Convert filter to list explicitly before checking length

* Decode sent_email and content before string operations
2017-10-17 17:45:49 +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
Nabin Hait
678f29329c Merge branch 'master' into develop 2017-10-04 18:18:05 +05:30
Makarand Bauskar
58fd830b92 [revert] pull emails from all incoming email accounts instead of enqueuing single email account (#4247) 2017-10-04 18:17:05 +05:30
Rushabh Mehta
404f0ab07a Merge pull request #4221 from rmehta/fix-text-editor-in-firefox
[fix] text editor in firefox
2017-10-01 22:05:47 +05:30
Rushabh Mehta
78995ceb3e [fix] text editor in firefox 2017-09-30 15:06:57 +05:30
mbauskar
05a447a349 [minor] added the Created On and Last Modified On date fields in email alert's date_change 2017-09-29 17:39:31 +05:30
Nabin Hait
425606607d Merge branch 'master' into develop 2017-09-28 12:26:51 +05:30
Makarand Bauskar
780df0be60 [hotfix] pull emails from all incoming email accounts instead of enqueue single email account (#4199) 2017-09-28 12:14:00 +05:30
Nabin Hait
0da844dae0 Merge branch 'master' into develop 2017-09-27 13:03:10 +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
a1bbc200c7 Explicitly pass str to email.message.replace 2017-09-27 01:08:07 +05:30
Aditya Hase
96a1c17325 Explicitly pass bytes to quopri.encodestring 2017-09-27 01:08:07 +05:30
Manas Solanki
133f4b4fdd Print format in the email alert (#4190)
* print format in the email alert

* set query for the email alert
2017-09-26 21:08:34 +05:30
Rushabh Mehta
b7b2932afe Merge pull request #4183 from manassolanki/email-queue
make the attached file visible and read only in email queue
2017-09-26 12:41:25 +05:30
Manas Solanki
ea6987b451 make the attached file visible and read only 2017-09-25 17:01:21 +05:30
Nabin Hait
ce01845d11 Merge branch 'master' into staging 2017-09-25 16:30:13 +05:30
Nabin Hait
1d93c66285 Fixed merge conflict 2017-09-25 16:30:08 +05:30
Makarand Bauskar
47677c055c [minor] refactor mark as read and mark as unread (#4154)
* [minor] refresh inbox view on mark as read or mark as unread

* [minor] refactor mark as read and mark as unread

* [minor] don't update modified datetime while settings _seen
2017-09-21 12:32:20 +05:30
mbauskar
c12eca952d [minor] save uid, raw email for unhandled emails and other minor fixes 2017-09-19 16:30:48 +05:30
Manas Solanki
2f885191da added the test case 2017-09-18 02:04:51 +05:30
Manas Solanki
1bbcfc5f9f webview for the newsletter 2017-09-18 01:01:59 +05:30
Manas Solanki
d0d92d5ebd codacy fix and change template path 2017-09-18 01:01:59 +05:30
Manas Solanki
f26f4353fc minor changes in the sql query 2017-09-18 01:01:59 +05:30
mbauskar
6fd186eaa3 [minor] translate field label for auto email reports 2017-09-11 18:07:57 +05:30
Rushabh Mehta
46eee356ff Merge pull request #4058 from pratu16x7/setup-fixes
[setup] suppress post-setup messages
2017-09-05 12:20:50 +05:30
pratu16x7
276f5b5631 [setup] suppress post-setup messages 2017-09-05 12:15:43 +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
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