Commit graph

327 commits

Author SHA1 Message Date
Viet Pham
138e1a3b93 fix #2116 Ignore no password exception for email account on smtp setup (#2555) 2017-01-10 14:39:00 +05:30
Nabin Hait
a29d0a4c35 Update auto_email_report.py 2017-01-09 16:02:51 +05:30
Saurabh
ba39d7c04f [fix] validate filters before sending a email 2017-01-07 15:02:49 +05:30
Rushabh Mehta
5d7eb494a0 [minor] frappe.as_unicode 2016-12-20 12:35:59 +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
bd0852b965 [fix] email account, add sparkpost, sendgrid as options and refactor property use_tls, fixes frappe/erpnext#7129 (#2418) 2016-12-07 11:29:12 +05:30
Nabin Hait
c52dc83256 Fixed merge conflict 2016-12-06 16:12:32 +05:30
Shreyas Patil
4b31d0cdd5 [Minor] Updated condition to validate allowed email report per user (#2386)
* [Fix] Updated condition to allow only 3 reports per user

* [fix] different conditions for insert and update
2016-12-05 14:17:55 +05:30
Rushabh Mehta
7bc7e3bc63 Upgrade Font Awesome (#2410)
* Font-Awesome V3.x to V4.x

Font-Awesome V3.x to V4.x

* Font Tidy

Font Tidy

* FA4 Upgrade - Html Js & Json

FA4 Upgrade - Html Js & Json

* Minor

Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
4cf123bd8f Fixed merge conflict 2016-11-28 14:25:11 +05:30
rohitwaghchaure
a7477d5641 Minor fix (#2371) 2016-11-25 16:11:18 +05:30
Rushabh Mehta
a099690e8f Revert "[optimize] remove count(*) from queries" (#2353) 2016-11-22 10:55:13 +05:30
Rushabh Mehta
0ff140fa2b [optimize] remove count(*) from queries 2016-11-21 14:58:18 +05:30
Rushabh Mehta
4a5365990f [hot] fix email threading 2016-11-18 18:05:34 +05:30
Rushabh Mehta
4df583b1cf [fix] email, deprecate frappe.email.sendmail, use frappe.sendmail 2016-11-18 11:32:18 +05:30
Rushabh Mehta
f801a7c56c [fix] don't send email in test' 2016-11-18 08:12:06 +05:30
Rushabh Mehta
5bfc3f2a2e [fix] for muted emails 2016-11-17 16:55:43 +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
9ef8f18fcf [fix] for tests, and db_set now accepts dict 2016-11-17 09:45:44 +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
Rushabh Mehta
819983a7b6 Merge branch 'master' into develop 2016-11-16 11:20:42 +05:30
Rushabh Mehta
e6f4a89c70 [fix] weekly auto email report, fixes frappe/erpnext#6936 2016-11-15 14:40:14 +05:30
KanchanChauhan
ca22d756e3 Send unsubscribe message in email option added to Email Account (#2298) 2016-11-14 12:06:59 +05:30
Nabin Hait
2ffa35b38a Fixed merge conflict 2016-11-11 15:10:35 +05:30
Rohit Waghchaure
fc454e014d [Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary 2016-11-10 19:16:15 +05:30
KanchanChauhan
e8a575c71e [Minor] Updated Standard Reply example (#2283) 2016-11-10 12:57:39 +05:30
Nabin Hait
f2eebc30cf Merge pull request #2273 from rmehta/limit-emails-if-set
[fix] limit monthly emails only if set
2016-11-09 11:32:10 +05:30
Rushabh Mehta
d8b9722b21 [fix] limit monthly emails only if set 2016-11-07 22:14:21 +05:30
Rushabh Mehta
95fdfe44d3 [minor] added default standard filters (#2270)
* [minor] added default standard filters

* [fix] frappe.sendmail

* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
Rushabh Mehta
716c045d92 [fix] web form for guest 2016-11-04 18:41:59 +05:30
Rushabh Mehta
18d8d7637d [fix] email alert message changed to Code and ignore xss filtering 2016-11-03 14:12:17 +05:30
Rushabh Mehta
29bc1b621f [fix] email alert message changed to Code and ignore xss filtering 2016-11-03 11:00:25 +05:30
Rushabh Mehta
e585e9c38b [minor] 2016-10-09 15:18:17 +05:30
Rushabh Mehta
bae97cfed4 Email Alert on any controller method (#2157)
* [docs] typo

* [email alert] now on any standard controller method

* [minor] install customizations with intall;

* [test] [fix] and truncate subject in email;

* [fix] error log seen issue
2016-10-08 11:11:36 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
9353303be6 Exporting Customizations docs and other minor fixes (#2136)
* [fix] email alert in sync

* [fixes] web form mandatory and docs for exporting customizations
2016-10-03 12:18:57 +05:30
Rushabh Mehta
88afbcf9e4 [enhance] a better way to export customzations and Email Alert can now be standard and in app (#2134) 2016-10-02 23:32:34 +05:30
Nabin Hait
368f47ba70 Test case fixed 2016-09-28 16:55:11 +05:30
Shreyas Patil
4e4f5b2d53 [Fix] Retry on Authentication error by Gmail, if emails are pulled from/pushed to server too frequently (#2090)
* [Fix] Authentication error is raised by Gmail, if emails are pulled from/pushed to server too frequently

* [Fix] Minor Fix
2016-09-23 17:16:22 +05:30
Rushabh Mehta
9670bed459 [minor] option in auto email report to send if data 2016-09-23 14:46:38 +05:30
Nabin Hait
aef76fbb3f Fixed version conflict 2016-09-23 12:19:29 +05:30
Nabin Hait
4d624001d7 Update email_alert.js 2016-09-23 10:52:34 +05:30
Rushabh Mehta
6e9c08d30d [minor] ux enhancements for auto email report 2016-09-22 17:27:24 +05:30
Rushabh Mehta
658288cd18 [minor] feature to restrict no of rows in report 2016-09-22 17:02:34 +05:30
Rushabh Mehta
ed8021c539 [minor] retry if disconnected while sending email 2016-09-22 11:41:50 +05:30
Rushabh Mehta
d4ca31a19a [minor] validate template in Standard Reply while saving, fixes #1884 2016-09-21 11:34:41 +05:30
Rushabh Mehta
eb9122a6f3 [minor] allow user to be option in email, fixes frappe/erpnext#6409 2016-09-21 11:06:17 +05:30