Commit graph

1389 commits

Author SHA1 Message Date
mergify[bot]
1b16d4a843
Merge pull request #8692 from netchampfaris/block-cards-globally
feat: Ability to block module cards for all users
2019-10-29 13:05:51 +00:00
Faris Ansari
f0ffbe1a7b fix: Method name 2019-10-29 18:09:06 +05:30
mergify[bot]
7c10d256aa
Merge pull request #8695 from ruchamahabal/fix_module_view
fix(Desk): show/hide cards not working after changing order of cards
2019-10-29 10:01:35 +00:00
mergify[bot]
9bed16f12c
Merge pull request #8629 from ruchamahabal/bulk_update_fix
fix: bulk update tool updating records but not showing result
2019-10-29 09:45:47 +00:00
Rucha Mahabal
6db3c7a351 fix(Desk): show/hide cards not working after changing order of cards 2019-10-29 11:33:52 +05:30
Faris Ansari
e9f0d8dd4e feat: Ability to block module cards for all users 2019-10-29 01:17:17 +05:30
mergify[bot]
5fe4bc45c5
Merge pull request #8690 from prssanna/leaderboard-fix
fix(Leaderboard): Show only enabled system users in EP leaderboard
2019-10-28 16:19:49 +00:00
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
prssanna
c093518ecd fix: show only enabled system users in EP leaderboard 2019-10-28 17:54:25 +05:30
Aditya Hase
2fd835803a
perf(notifications): Let database do the counting 2019-10-23 23:00:03 +05:30
Aditya Hase
7630ce6d3e
perf(moduleview): Query all disabled reports once 2019-10-23 23:00:03 +05:30
Faris Ansari
14ad78d8db fix(Notification Log): Add Role All in Permissions 2019-10-23 12:48:40 +05:30
Faris Ansari
9f03c08e6e fix(Notification Settings): Use get_doc after db.exists 2019-10-23 12:45:27 +05:30
prssanna
dd82f5d815 fix: hide indicator on seen event instead of dropdown hide 2019-10-22 12:37:46 +05:30
Faris Ansari
221347523a fix: Ignore ImportError for Notification Settings
During migrate, Notification Settings are fetched which doesn't exist
yet. It is safe to ignore it because Notification Settings are not
created anyway for any user.
2019-10-21 23:29:07 +05:30
Faris Ansari
3bd80c3cd3 fix: tests 2019-10-21 19:16:38 +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
Faris Ansari
18e7195af9 tests: Add tests 2019-10-21 16:02:44 +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
99f4372e28 style: Unused variables and imports 2019-10-21 13:32:59 +05:30
Faris Ansari
4e8b9d1e21 fix: pass method without calling 2019-10-21 13:25:13 +05:30
Faris Ansari
3ceb0ea4d7 fix: cleanup 2019-10-21 13:15:55 +05:30
Faris Ansari
7caef2d16d
Merge branch 'develop' into integrated-notifications 2019-10-21 12:51:03 +05:30
Faris Ansari
e9b7256992 fix: get_email_header 2019-10-21 12:48:41 +05:30
Rucha Mahabal
f5beab25db fix: bulk update tool updating records but not showing result 2019-10-21 12:44:56 +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
joelios
bece163af7 fix: Show heatmap in activity page (#8577)
fixes #8576
2019-10-20 11:51:58 +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
Himanshu Warekar
2ace6739d7 fix: rename fields 2019-10-10 22:06:59 +05:30
prssanna
5a6e33294e fix: codacy 2019-10-10 16:33:21 +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
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
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
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
f44cec60b4 fix: remove unused notifications code from toolbar.js 2019-10-09 16:22:57 +05:30
prssanna
2073fd1f91 fix: remove notifications code 2019-10-09 16:22:57 +05:30
prssanna
bae5049683 feat(Notifications): Add integrated notifications 2019-10-09 16:22:57 +05:30
Himanshu Warekar
b4fcadca2f fix: codacy fixes 2019-10-06 21:58:48 +05:30
Himanshu Warekar
014c0360dd fix: list filters for tags 2019-10-06 16:09:30 +05:30
Himanshu Warekar
13321ec5f4 chore: rename global_tags to tags 2019-10-05 09:57:43 +05:30
Himanshu Warekar
02cebdd7d3 fix: use frappe.tags 2019-10-03 16:43:36 +05:30
Himanshu Warekar
c0a5ad1456 Merge branch 'develop' of https://github.com/frappe/frappe into global_tags 2019-10-03 12:30:53 +05:30
Himanshu
3f980dbd79 fix(Global Search Settings): Show progress while setting global search doctypes (#8515)
* fix: add frm dashboard

* fix: add search for other domains

* fix: set global search doctypes for all domains

* fix: add doctypes to global search dict in hooks

* fix: Remove unused variable
2019-10-02 11:43:42 +00:00