Commit graph

2647 commits

Author SHA1 Message Date
mergify[bot]
43c5a9676e
Merge pull request #8691 from netchampfaris/data-import-beta-updates
fix: Data Import Updates
2019-10-29 10:03:29 +00:00
Faris Ansari
26625e5cf4 fix: Show failed logs 2019-10-29 15:12:24 +05:30
Faris Ansari
756496e2a7 fix: Mute emails by default 2019-10-28 23:01:08 +05:30
Faris Ansari
733f2fdee5 fix: Hide primary action when import in progress 2019-10-28 23:00:43 +05:30
Faris Ansari
e601e9c4ce fix: Show status In Progress in list view 2019-10-28 22:59:53 +05:30
Faris Ansari
8a7f7034f6 fix: Try new Data Import link 2019-10-28 22:59:30 +05:30
Prssanna Desai
70f49546c1 fix(Notifications): Improvements for Notifications (#8671)
* fix: seen notification logic

* fix: rename upcoming events to today's events, fix padding

* fix: truncate title

* fix: don't allow self notifications

* fix: don't check for same  user for energy point notifications

* fix: codacy

* fix: truncate title client side

* fix: use data-action to mark as seen

* fix: don't send emails for auto energy points
2019-10-28 16:13:40 +00:00
Suraj Shetty
5bed56b15c
Merge pull request #8643 from ruchamahabal/fix_module_view
fix: home_settings should be hidden in User DocType
2019-10-23 10:08:22 +05:30
Faris Ansari
53945cd25e fix: Find image only if it is a string 2019-10-22 19:12:49 +05:30
mergify[bot]
396a402254
Merge pull request #8612 from Alchez/dev-auto-email-links
feat: add hyperlinks to Link fields in auto email reports
2019-10-22 12:47:57 +00:00
Rucha Mahabal
fee29e356d fix: home_settings should be hidden in User DocType 2019-10-22 14:19:43 +05:30
Faris Ansari
fc5b712a3c Merge branch 'develop' of https://github.com/frappe/frappe into integrated-notifications 2019-10-21 18:47:51 +05:30
mergify[bot]
e273ffeaf4
Merge pull request #8550 from rmehta/server-script
feat(server scripts): add server scripts!
2019-10-21 09:10:09 +00:00
Faris Ansari
7caef2d16d
Merge branch 'develop' into integrated-notifications 2019-10-21 12:51:03 +05:30
Faris Ansari
340c3635ae fix: enqueue_create_notification
- Enqueue one call instead of multiple
- Remove email content argument
2019-10-21 12:39:42 +05:30
Rohan Bansal
c8529a5437 feat: add hyperlinks to Link fields in auto email reports 2019-10-16 16:48:52 +05:30
Rushabh Mehta
14e9ed6f99 fix(patch) 2019-10-16 12:13:23 +05:30
mergify[bot]
510b726783
Merge pull request #8508 from marination/customize-import
feat: Added 'Allow Import (via Data Import Tool)' checkbox in Customize Form
2019-10-11 16:13:25 +00:00
Rushabh Mehta
4a39652850 fix(minor) 2019-10-11 15:31:45 +05:30
Rushabh Mehta
3d22ecc5f3 fix(minor) 2019-10-11 15:05:39 +05:30
Rushabh Mehta
c57f128000 fix(minor): add comments 2019-10-11 14:34:14 +05:30
Rushabh Mehta
b84663621f fix(linting) 2019-10-11 14:16:49 +05:30
Rushabh Mehta
9d38990c2d fix(report): custom script report 2019-10-11 14:16:49 +05:30
Rushabh Mehta
9d615f7f12 fix(security): use restricted python 2019-10-11 14:16:49 +05:30
Rushabh Mehta
6108c2ce33 fix(minor): test_exporter_new.py 2019-10-11 14:16:49 +05:30
Rushabh Mehta
f6f2ea89ce fix(minor): server script enabled 2019-10-11 14:16:49 +05:30
Rushabh Mehta
ee417766a2 fix(minor): server script enabled 2019-10-11 14:16:49 +05:30
Rushabh Mehta
6d6f575904 feat(server scripts): add server scripts! 2019-10-11 14:16:49 +05:30
mergify[bot]
c85c90364e
Merge pull request #8586 from hrwX/set_email
fix: Miscellaneous Fixes
2019-10-10 19:06:19 +00:00
Himanshu Warekar
2ace6739d7 fix: rename fields 2019-10-10 22:06:59 +05:30
Rohit Waghchaure
dea1f3ca50 fix: Nonetype object has no attribute options 2019-10-10 13:58:57 +05:30
prssanna
75b624e7a2 fix: move notifications to desk, refactor notifications.js 2019-10-09 16:23:26 +05:30
prssanna
91d7c79ab0 fix: notification email style and fully clickable links 2019-10-09 16:22:58 +05:30
prssanna
5d1c5d2d08 fix: codacy 2019-10-09 16:22:58 +05:30
prssanna
9973e505e0 fix: doctype notification log labels 2019-10-09 16:22:58 +05:30
prssanna
70ca45c293 fix: translated strings 2019-10-09 16:22:58 +05:30
prssanna
47e59753dd fix: enqueue notification creation 2019-10-09 16:22:58 +05:30
prssanna
446f7ec739 fix: nable email for notification types 2019-10-09 16:22:58 +05:30
prssanna
6905588e68 fix: remove email notifications 2019-10-09 16:22:58 +05:30
prssanna
b15fe0d725 fix: track seen for notification log 2019-10-09 16:22:58 +05:30
prssanna
ae0677a716 fix: store email content in notification log and send email after insert 2019-10-09 16:22:57 +05:30
prssanna
b6fa62eb05 fix: add notify param for share notification 2019-10-09 16:22:57 +05:30
prssanna
4833c04609 fix: email notifications sent only if notifications enabled and remove unused imports 2019-10-09 16:22:57 +05:30
prssanna
b1cd456729 fix: remove unused imports 2019-10-09 16:22:57 +05:30
prssanna
e648e13970 fix: common email template for notifications and added document sharing notification 2019-10-09 16:22:57 +05:30
prssanna
35aa09f3f2 fix: remove enable energy point notifications settings 2019-10-09 16:22:57 +05:30
prssanna
8ba51549d3 fix: add notification settingsroute and fix style 2019-10-09 16:22:57 +05:30
prssanna
fc38664fe7 fix: formatting 2019-10-09 16:22:57 +05:30
prssanna
730d9d91cf fix: remove unused imports 2019-10-09 16:22:57 +05:30
prssanna
b2549a275c fix: check if recipients exist in communication notification 2019-10-09 16:22:57 +05:30