Commit graph

2135 commits

Author SHA1 Message Date
Suraj Shetty
a2af812dfb
Merge pull request #12844 from surajshetty3416/group-mentions 2021-04-15 16:38:45 +05:30
Faris Ansari
8678c09e91
feat: Add log_error and FrappeClient to restricted python (#12857) 2021-04-15 14:34:23 +05:30
Suraj Shetty
a1190a0c4a feat: Add option to mention a group of users 2021-04-12 16:35:11 +05:30
Leela vadlamudi
e5d3aac707
Merge pull request #12693 from leela/notifications-into-timeline
feat: Include automated mail notifications in timeline
2021-04-08 20:38:29 +05:30
Suraj Shetty
f53c09ada2
Merge branch 'develop' into custom-user-type-feat 2021-04-05 19:01:42 +05:30
Suraj Shetty
60aae80f39
chore: Update develop with Version 13 (#12803) 2021-04-05 14:10:37 +05:30
leela
5c2bda478c Refactor(Improv): Include automated mail notifications in timeline
Notifications sent through notifications doctype are not part of
communications doctype and also not into timelines. Added these
notifications into timeline by adding docs into Communication doctype.
2021-04-05 09:45:17 +05:30
Suraj Shetty
efba586054
Merge branch 'develop' into remove-password 2021-04-02 09:46:57 +05:30
Faris Ansari
bcb01f6491 fix: Remove encrypted password when it is unset 2021-04-01 17:48:20 +05:30
Rohit Waghchaure
112784e7ae feat: custom user type with doctypes 2021-04-01 13:54:11 +05:30
Leela vadlamudi
4ef7f11751
Merge pull request #12729 from leela/code-cleanup
refactor: Code cleanup and attempt tracker for 2FA
2021-03-31 19:06:44 +05:30
leela
1f6f02fd5a fix: Track 2FA OTP attempts using login tracker 2021-03-31 12:49:31 +05:30
mergify[bot]
a1f15245f7
Merge pull request #12726 from zerodha/check_connections
fix: global get_conf() fails to return site config
2021-03-30 15:11:45 +00:00
Shridhar
86d372c4f6 fix: global get_conf() fails to return site config 2021-03-30 17:13:04 +05:30
Shridhar
5deec996b6 fix: updated postgres default port 2021-03-29 15:16:27 +05:30
Suraj Shetty
ac7b40a7e3 fix: Do not show progress bar in CI environ 2021-03-19 18:57:31 +05:30
Britlog
662f409604
feat: Add quoting parameter in the UnicodeWriter constructor (#12578)
* Add quoting parameter in the constructor

* fix: Use quoting kwarg to pass quoting value

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-17 12:50:20 +00:00
gavin
2536f73e2d
Merge pull request #12502 from gavindsouza/refactor-personal-data-deletion
refactor: Personal Data Deletion Request
2021-03-17 13:31:30 +05:30
Syed Mujeer Hashmi
13a57d141e fix: timespan filter for next and last timespans
The timespan filter now considers calendar month, quarter,
half-year, and year for last and next timespans.

Signed-off-by: Syed Mujeer Hashmi <mujeerhashmi@4csolutions.in>
2021-03-16 21:12:07 +05:30
Gavin D'souza
48c0160b6a Merge branch 'develop' of github.com:frappe/frappe into refactor-personal-data-deletion 2021-03-15 16:07:17 +05:30
Leela vadlamudi
a2e791eaa0
Merge pull request #12455 from Alchez/dev-import-file-error
fix: error while using data import and importing docs (develop)
2021-03-11 13:00:09 +05:30
leela
a62cc40885 perf: Improve import template performance by 10 times
Removed nested forloop to get the performace and also using generators
to reduce memory usage.
2021-03-11 09:52:40 +05:30
Sagar Vora
5cd3f8534b fix: create gender only if provided while creating oauth user 2021-03-09 16:47:21 +05:30
Rohan Bansal
e675043e9d Merge remote-tracking branch 'upstream/develop' into dev-import-file-error 2021-03-09 15:21:45 +05:30
leela
de210260a7 refactor: allow callable limit arg for ratelimit deco
As we make all configurations editable through dashboard(ex: password_reset_limit), it makes sense
to provide limit as a callable so that it can be accessed dynamically.
2021-03-09 13:59:49 +05:30
Leela vadlamudi
08e2ad9904
feat: Lazy import functionality added (#12517) 2021-03-09 11:59:17 +05:30
Gavin D'souza
da427111dc Merge branch 'develop' of github.com:frappe/frappe into refactor-personal-data-deletion 2021-03-04 18:36:15 +05:30
Gavin D'souza
cd94227aa5 refactor(hooks): Personal Data Deletion Request
Changes:
* Renamed hook from `user_privacy_documents` to `user_data_fields`
* Renamed ref field from `match_field` to `filter_by`
* Renamed ref field from `personal_fields` to `redact_fields`
* Removed ref field `applies_to_website_user` from hook options -- let's
treat all requests equally and redact data from all privacy docs
* Added boilerplate hook for new apps
2021-02-26 20:31:02 +05:30
mergify[bot]
465404f66e
Merge pull request #12447 from adityahase/perf-cli
perf: Faster CLI
2021-02-25 01:44:36 +00:00
mergify[bot]
340446c313
Merge pull request #12270 from deepeshgarg007/rebuild_tree
feat: Provision to rebuild NSM from treeview
2021-02-24 11:24:51 +00:00
Deepesh Garg
f2d619bb2c fix: Check for command in case of API call 2021-02-24 15:43:03 +05:30
mergify[bot]
86407e5b48
Merge pull request #12446 from leela/login-attempt-tracker
refactor: Track consecutive login attempts
2021-02-24 10:11:04 +00:00
Deepesh Garg
38861decab fix: Only for system manager 2021-02-24 15:23:49 +05:30
Deepesh Garg
ce9843ee4a fix: Only for system manager 2021-02-24 15:22:17 +05:30
Deepesh Garg
d3dbd74a0a Merge branch 'develop' of https://github.com/frappe/frappe into rebuild_tree 2021-02-24 13:00:44 +05:30
Saqib
d9737c1d25
Merge branch 'develop' into image-pf-fix 2021-02-24 12:45:21 +05:30
leela
6e5e0890f3 refactor: Cleaned authentication logic
Auth flow is changed to use login attempt tracker.
2021-02-22 21:11:18 +05:30
Rohan Bansal
7b4e75e15d fix: error while using data import and importing docs 2021-02-22 17:15:49 +05:30
Aditya Hase
56d1954591
fix: Add missing imports 2021-02-22 11:53:26 +05:30
Suraj Shetty
cb51df4f80
Merge branch 'develop' into docs_update 2021-02-22 11:04:25 +05:30
Deepesh Garg
9e19d13262 fix: Check for perm 2021-02-21 18:35:34 +05:30
Deepesh Garg
d01536f72d Merge branch 'develop' of https://github.com/frappe/frappe into rebuild_tree 2021-02-21 18:17:43 +05:30
Aditya Hase
365ad34b40
perf: Remove six.moves.html_parser from import tree 2021-02-21 09:59:48 +05:30
Aditya Hase
0ba2fc0440
perf: Remove dateutil.parser from import tree 2021-02-21 09:59:12 +05:30
Aditya Hase
bbb898cf9b
Merge branch 'develop' of https://github.com/frappe/frappe into perf-cli 2021-02-21 09:58:21 +05:30
Aditya Hase
09b87f8a2d
perf: Remove frappe.website.render from import tree 2021-02-21 09:47:05 +05:30
Aditya Hase
56deeafe00
perf: Remove dateutil from import tree 2021-02-21 09:46:44 +05:30
Aditya Hase
64517ef272
perf: Remove babel from import tree 2021-02-21 09:46:31 +05:30
Aditya Hase
e209722624
perf: Remove num2words from import tree 2021-02-21 09:45:24 +05:30
Aditya Hase
b35a63c05f
perf: Remove html2text from import tree 2021-02-21 09:44:07 +05:30