Commit graph

22140 commits

Author SHA1 Message Date
Prssanna Desai
3d3bd1cbcb fix(Notifications): user check for events (#8647) 2019-10-22 16:33:44 +05:30
mergify[bot]
497c5faee2
Merge pull request #8644 from prssanna/notifications-fix
fix: Notifications fixes
2019-10-22 10:08:01 +00:00
Chinmay Pai
658de16b1b
chore: fix codacy spacing error 2019-10-22 15:19:30 +05:30
prssanna
f49738071f fix: fix upcoming events end time 2019-10-22 15:01:19 +05:30
mergify[bot]
3dd63a6347
Merge pull request #8642 from thefalconx33/quill-tooltip-fix
fix: quill editor's tooltip
2019-10-22 09:14:14 +00:00
thefalconx33
b0b41bc3ce fix qull editor's tooltip 2019-10-22 14:21:27 +05:30
Aditya Hase
26ed765f0a chore: remove unhandled_emails patch (#8640) 2019-10-22 13:32:11 +05:30
sahil28297
3dce7ec079
Merge pull request #8634 from adityahase/truncate-unhandled-email
perf(database): Regularly clean old unhandled emails
2019-10-22 13:22:24 +05:30
Himanshu
cbe8e7f764 patch: skip tags patch (#8639) 2019-10-22 13:16:58 +05:30
Aditya Hase
7b405bbc5b
style: Remove trailing space 2019-10-22 13:04:09 +05:30
Aditya Hase
5b6b10fc27
Update unhandled_email.py 2019-10-22 13:03:00 +05:30
Aditya Hase
cef8f4d450
Update unhandled_email.py 2019-10-22 13:03:00 +05:30
Aditya Hase
83c10c9263
perf(database): Regularly clean old unhandled emails
Co-authored-by: sahil28297 <sahilkhan28297@gmail.com>
2019-10-22 13:03:00 +05:30
mergify[bot]
be8a9dd8eb
Merge pull request #8589 from sahil28297/fix_setup_comment
fix(patch): auto commit if too many writes
2019-10-22 07:24:11 +00:00
prssanna
dd82f5d815 fix: hide indicator on seen event instead of dropdown hide 2019-10-22 12:37:46 +05:30
Nabin Hait
93af6c425d patch: reload notification log 2019-10-22 12:10:23 +05:30
Faris Ansari
eb12a00364
Merge pull request #8636 from netchampfaris/ignore-notification-settings
fix: Ignore ImportError for Notification Settings
2019-10-22 09:41:23 +05:30
mergify[bot]
e73b6196e0
Merge pull request #8631 from revant/fix-tests-develop
fix(tests): fix tests for integration module
2019-10-22 04:07:45 +00:00
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
f67c7fac61
feat(Notifications): Integrated Notifications Centre (#8431) 2019-10-21 19:38:08 +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
mergify[bot]
19e8862be3
Merge pull request #8559 from gavindsouza/rename-form
feat: rename docname and title via header
2019-10-21 12:29:25 +00:00
gavin
227e6b21a4
chore: syntax cleanup 2019-10-21 16:34:23 +05:30
Faris Ansari
83225791d8 fix: cleanup 2019-10-21 16:15:39 +05:30
Faris Ansari
18e7195af9 tests: Add tests 2019-10-21 16:02:44 +05:30
Saurabh
f1ba214b0b feat: merge gzip and mysqldump to speedup backup (#8524) 2019-10-21 15:24:26 +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
Revant Nandgaonkar
953d9b8488 fix(tests): OAuth 2.0 tests 2019-10-21 14:30:52 +05:30
Revant Nandgaonkar
7c50b40c4b fix(tests): ReST API tests 2019-10-21 13:36:35 +05:30
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
e33329bdd0 fix: Add back notification_config key 2019-10-21 12:54:39 +05:30
mergify[bot]
63eb588103
Merge pull request #8627 from surajshetty3416/fix-clear-cache-issue
fix: Throttle clear cache
2019-10-21 07:22:29 +00:00
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
Faris Ansari
0f02f1df4c fix: Update module in patch line 2019-10-21 12:40: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
mergify[bot]
1c88806e14
Merge pull request #8622 from prssanna/ui-fix
fix(style): navbar css for ipad screen
2019-10-21 07:01:49 +00:00
Suraj Shetty
c7bb3fc327 Merge branch 'develop' of https://github.com/frappe/frappe into fix-clear-cache-issue 2019-10-21 10:49:56 +05:30
Suraj Shetty
eab77f857d fix: Throttle clear cache 2019-10-21 10:46:24 +05:30
mergify[bot]
1a69ec33b2
Merge pull request #8607 from scmmishra/fix-broken-stuff
fix: remove bad disabled check
2019-10-20 06:46:11 +00:00
Frappe PR Bot
fe7894a062 feat: Updated translation (#8613) 2019-10-20 12:11:18 +05:30
joelios
bece163af7 fix: Show heatmap in activity page (#8577)
fixes #8576
2019-10-20 11:51:58 +05:30
mergify[bot]
33662fc39d
Merge pull request #8615 from agritheory/grid_move-fix
fix: items_move event trigger typo corrected
2019-10-20 06:02:30 +00:00
mergify[bot]
09cf3443a9
Merge pull request #8563 from thefalconx33/re-fix
fix: Incorrect currency value while pasting from excel sheets for other countries
2019-10-20 04:22:57 +00:00
Suraj Shetty
4250ba853d chore: Add strip_number_groups to eslint globals 2019-10-20 09:37:49 +05:30
Suraj Shetty
b61258fbc0
Merge branch 'develop' into re-fix 2019-10-19 16:36:17 +05:30
thefalconx33
4b2d91b295 fixes: Incorrect currency value while pasting from excel sheets for other countries. 2019-10-19 15:24:46 +05:30