Commit graph

905 commits

Author SHA1 Message Date
mergify[bot]
90cd0b786b
Merge pull request #10292 from prssanna/notification-in-notifications
feat: Show Notification in notifications dropdown
2020-06-01 05:35:20 +00:00
prssanna
b8a3f53c3c fix: fix translation syntax 2020-05-31 22:48:35 +05:30
prssanna
73d3d1f409 fix: pass attached_doc to doc 2020-05-31 22:43:14 +05:30
prssanna
6b2efc5f5d fix: fix translation syntax 2020-05-30 14:51:48 +05:30
prssanna
12f9e9f4c1 fix: separate channel for system notifications 2020-05-29 16:35:50 +05:30
Himanshu Warekar
400ada1a46 Merge branch 'dont_create_contacts' of https://github.com/hrwx/frappe into dont_create_contacts 2020-05-18 14:22:13 +05:30
Himanshu Warekar
cdad543a02 Merge branch 'develop' of https://github.com/frappe/frappe into dont_create_contacts 2020-05-18 13:11:18 +05:30
Suraj Shetty
d53b88a72f
perf: Make tests faster (#10307)
* feat: Ignore versions for test

* test: Do not ignore version where needed

* perf: Use frappe.db.get_single_value to leverage caching

- frappe.get_cached_value does not support single value caching

* style: Fix sider issue
2020-05-12 22:34:10 +05:30
prssanna
77b59a1493 fix: hide channel field if disabled 2020-05-12 19:21:29 +05:30
Abhishek Balam
c16c7fb121 fix typo 'Send Attachements' in Newsletter 2020-05-12 18:23:57 +05:30
Himanshu
8a74b4051d
Update email_account.json 2020-05-12 16:58:11 +05:30
Himanshu Warekar
8761ce9786 fix: enable create contact by default 2020-05-12 16:48:05 +05:30
prssanna
c60a3ebe6a fix: send notification to all users 2020-05-12 16:32:49 +05:30
prssanna
00f7194069 fix: link attachment to doc 2020-05-12 16:28:37 +05:30
prssanna
2a68af05f5 fix: option to disable channel if show in dropdown is enabled 2020-05-11 19:36:53 +05:30
prssanna
e8f30259c6 fix: link notification log document and show message 2020-05-11 15:23:18 +05:30
prssanna
b685412b36 feat: allow notifications created via Notification in system notifications 2020-05-11 12:18:08 +05:30
Suraj Shetty
4f1350adde
Merge branch 'develop' into dont_create_contacts 2020-05-08 14:23:31 +05:30
Suraj Shetty
3ae2c1294d test: Remove unwanted test and fix permission test 2020-05-08 13:55:56 +05:30
Himanshu Warekar
9b4e5c5a14 fix: do not create contacts if unchecked 2020-05-07 15:26:29 +05:30
Chinmay Pai
aacfdeeb10
Merge pull request #9843 from P-Froggy/feat-email-improvements 2020-05-03 15:09:47 +05:30
Suraj Shetty
511289c789
Merge branch 'develop' into setup-email-tread 2020-04-29 11:05:27 +05:30
Abhishek Kedar
205c852f1c
fix: removed from_test parameter in send_one function
from_test parameter is not at all used anywhere in the send_one function so removed it, and its value will be always False.
2020-04-28 11:32:24 +05:30
mergify[bot]
7df907a8ed
Merge pull request #9928 from AKedar21/patch-5
perf: enqueue instance of send_one for better performance
2020-04-27 14:27:58 +00:00
Abhishek Kedar
fda7a45c52
fix: corrected flush job for passing test_flush 2020-04-27 18:25:16 +05:30
Saurabh
a9be0758d4 feat: compare meesage-id only with the communications created between last 30 days 2020-04-23 18:46:15 +05:30
Saurabh
b66864b9b1 fix: check message id communication while linking communications 2020-04-23 18:32:05 +05:30
Chinmay D. Pai
c8558e2b98
chore: simplify setting email status as open or closed
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-19 13:48:07 +05:30
Suraj Shetty
bfac02a1a9
Merge branch 'develop' into feat-email-improvements 2020-04-17 11:44:29 +05:30
Gavin D'souza
82cedb8617 fix: Attribute errors and better msgprint 2020-04-16 16:37:35 +05:30
Himanshu
80f27f6081
fix: remove Customer & Supplier to hooks (#9874) 2020-04-14 13:01:49 +05:30
Abhishek Kedar
47446469bd
refactor: moved import to the top of the file 2020-04-13 20:20:02 +05:30
Abhishek Kedar
8e9d642f44
style: formatted parameters of enqueue function 2020-04-13 20:11:54 +05:30
Abhishek Kedar
7b10a2d88a
style: removed comment and formatted dictionary 2020-04-13 20:07:46 +05:30
ci2014
e57f005622
fix: frappe.utils in get_context (#9844)
* Remove point from frappe.utils in get_context

For example frappe.utils.data.today() does not work. If we change it and use frappeutils.data.today() it works. This has to do with Jinja. Any better ideas?

* fix: frappe.utils in context

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-13 12:30:44 +00:00
Abhishek Kedar
5b170c031d
perf: enqueue instance of send_one for better performance
Usecase: Suppose I have hundred's of emails in the Email Queue and the flush job executes. While the execution of the flush job is going another flush job starts and so on. Because of this a list of flush jobs gets lined up in the background jobs queue. 
To avoid this it is better to enqueue the send_one function inside the flush job this will very efficiently improve the performance of the flush job.
2020-04-13 16:40:09 +05:30
Chinmay D. Pai
9df69d214c
fix: set welcome_email to None if template not found
fixes UnboundLocalError: welcome_email referenced before assignment

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-10 15:42:58 +05:30
mergify[bot]
ba6415a88b
Merge pull request #9859 from Thunderbottom/newsletter-fix
fix: update newsletter status on sending
2020-04-10 03:26:27 +00:00
Chinmay Pai
ad71b6804f
chore: use orm instead of sql
Co-Authored-By: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-04-09 20:18:55 +05:30
Gavin D'souza
24e0174fcf fix: enable validations for email and phone data fields 2020-04-08 12:35:33 +05:30
Mangesh-Khairnar
8e0c9201a5 chore: remove duplicate db set 2020-04-07 16:10:31 +05:30
Chinmay D. Pai
074be8124d
fix: set email_sent after enqueuing newsletters
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-07 15:47:20 +05:30
P-Froggy
60a871e5d7 Don't hide meta column of inbox view on small displays 2020-04-07 02:50:22 +02:00
Chinmay D. Pai
a1e297ecb1
chore: fix codacy issue
Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-06 19:46:57 +05:30
Chinmay D. Pai
ed9fd709ad
fix: update newsletter status on sending
sets email_sent, schedule_send, and scheduled_to_send on newsletter
being sent

also switch to raw sql query to avoid default set by coalesce

Signed-off-by: Chinmay D. Pai <chinmaydpai@gmail.com>
2020-04-06 19:02:30 +05:30
mergify[bot]
f5a1b560d7
Merge pull request #9603 from Mangesh-Khairnar/news-letter
feat: newsletter and email group changes
2020-04-03 16:46:50 +00:00
Faris Ansari
ea780bda26
Merge branch 'develop' into feat-email-improvements 2020-04-03 18:26:46 +05:30
Mangesh-Khairnar
4381850b61 test: schedule_send 2020-04-03 18:17:55 +05:30
Mangesh-Khairnar
0e087cf1b4 fix: handle case in which email account does not exists 2020-04-03 18:06:32 +05:30
P-Froggy
fe36f44b9f Fix errors found by Codacy 2020-04-02 22:00:47 +02:00