Commit graph

30845 commits

Author SHA1 Message Date
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
mergify[bot]
cbbddafc0f
Merge pull request #12268 from hasnain2808/no-assignment-rule-on-todo
fix: Do not Allow Assignment Rule on Todo
2021-02-24 11:24:12 +00:00
Suraj Shetty
2a5fbe4566
fix: Modal design for website (#12474) 2021-02-24 16:52:09 +05:30
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
mergify[bot]
3e76842765
Merge pull request #12347 from hasnain2808/better-way-to-extract-fieldname
fix: better way to extract fieldname from key_name
2021-02-24 10:08:04 +00:00
mergify[bot]
3f817a6d4f
Merge pull request #12467 from pateljannat/email-recipient-through-reply-all
fix: Email recipient through reply all
2021-02-24 10:02:02 +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
mergify[bot]
db36708bd8
Merge pull request #12348 from alyf-de/communication_language
fix: Communication language
2021-02-24 09:46:32 +00:00
hasnain2808@gmail.com
fb40a48338 chore: better error message
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-24 15:12:26 +05:30
Suraj Shetty
e906479c0f
style: Fix formatting 2021-02-24 14:38:17 +05:30
mergify[bot]
a5d5f113e5
Merge pull request #12322 from hasnain2808/email-account-status
fix(Email Account): if incoming/outgoing disabled it cannot be default
2021-02-24 09:06:28 +00:00
mergify[bot]
f955b6f5a0
Merge pull request #12282 from nextchamp-saqib/image-pf-fix
fix: broken image rendering in print format
2021-02-24 09:04:23 +00:00
Deepesh Garg
d3dbd74a0a Merge branch 'develop' of https://github.com/frappe/frappe into rebuild_tree 2021-02-24 13:00:44 +05:30
hasnain2808@gmail.com
a55e1a6394 fix(ToDo): cypress tests 2021-02-24 12:56:05 +05:30
Saqib
d9737c1d25
Merge branch 'develop' into image-pf-fix 2021-02-24 12:45:21 +05:30
hasnain2808@gmail.com
17e68da296 fix(Email Account): change warning message 2021-02-24 12:03:48 +05:30
Mohammad Hasnain Mohsin Rajan
72ad3e0711
fix: use frappe bold instead of tags
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-02-24 11:45:09 +05:30
pateljannat
3a713a015f fix: corrections to subject 2021-02-23 21:06:17 +05:30
pateljannat
1524663c6f fix: unnecesary condition removed 2021-02-23 20:06:59 +05:30
pateljannat
9e3e779442 fix: communication subject 2021-02-23 19:44:17 +05:30
pateljannat
e88d484214 fix: recipient based on communication 2021-02-23 14:00:44 +05:30
leela
b7c8e030b9 fix: Fix setting admin as user when frappe.db is not set
we are setting admin as current user, At time of request handling if
frappe.db is not set. fixed that issue by adding a check.
2021-02-22 21:45:30 +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
leela
49317ce045 refactor: Track login attempts of a user
Existing login attempt tracker is a set of funcions those are not easy
to understand. Created a tracker class that handles all tracker logic and provides
useful methods to access.

Testcases added for the same.
2021-02-22 21:08:33 +05:30
mergify[bot]
108fb84767
Merge pull request #12460 from resilient-tech/fix-optimise_cors
perf: optimise set_cors_headers
2021-02-22 13:33:19 +00:00
mergify[bot]
9f93dda074
Merge pull request #12458 from nabinhait/client-script-patch-1
fix: Changed order of renaming custom script patch
2021-02-22 13:26:06 +00:00
Sagar Vora
68c6fc4a44 fix: optimise set_cors_headers 2021-02-22 18:13:30 +05:30
Nabin Hait
0110c16dd6 fix: Changed order of renaming custom script patch 2021-02-22 17:35:42 +05:30
rohitwaghchaure
707ba94a84
Merge pull request #12459 from frappe/revert-12457-fixed-travis-for-patch-rename_page_and_role
Revert "fix: patch travis"
2021-02-22 17:29:03 +05:30
rohitwaghchaure
b1a62b7414
Revert "fix: patch travis" 2021-02-22 17:28:40 +05:30
rohitwaghchaure
939e25b961
Merge pull request #12457 from rohitwaghchaure/fixed-travis-for-patch-rename_page_and_role
fix: patch travis
2021-02-22 17:24:09 +05:30
Rohit Waghchaure
4af5cddd1e fix: patch travis 2021-02-22 17:19:31 +05:30
Suraj Shetty
4786db9a77
chore: Upgrade caniuse-lite (#12451) 2021-02-22 15:45:06 +05:30
Suraj Shetty
3f383e932a Merge branch 'develop' of https://github.com/frappe/frappe into develop 2021-02-22 14:04:07 +05:30
Suraj Shetty
f2e8a1316a fix: Update tool icon stroke color 2021-02-22 14:02:47 +05:30
mergify[bot]
5111387c09
Merge pull request #12401 from ankush/docs_update
docs: update docs of some most used functions
2021-02-22 05:50:14 +00:00
mergify[bot]
bc17e010a2
Merge pull request #12372 from pateljannat/method-not-found-error
fix: Resource not available error on Purchase Order get items
2021-02-22 05:37:35 +00:00
mergify[bot]
2e14b5b60c
Merge pull request #12411 from mainul94/Reset-Home-Patch-Error-Fix
fix: Unknow column `home_settings`  on migrate from old version.
2021-02-22 05:36:03 +00:00
Suraj Shetty
cb51df4f80
Merge branch 'develop' into docs_update 2021-02-22 11:04:25 +05:30
mergify[bot]
ecf7686ece
Merge pull request #12422 from prssanna/localforage-drafts
feat: replace localStorage with localforage for storing drafts
2021-02-22 05:31:55 +00:00
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
mergify[bot]
f6740f3d62
Merge pull request #12443 from szufisher/szufisher-fix-leaderboard-not-work
fix: leaderboard not work when lang is not English
2021-02-21 07:14:06 +00:00
Deepesh Garg
79c73fadce fix: Linting Issues 2021-02-20 19:47:44 +05:30
mergify[bot]
7f866c1e12
Merge pull request #12324 from gavindsouza/mv-custom-script-client-script
feat: Rename "Custom Script" to "Client Script"
2021-02-19 15:23:13 +00:00
Fisher Yu
2c921abdfc
fix: leaderboard not work when lang is not English
fix issue 11907
2021-02-19 23:10:47 +08:00
Gavin D'souza
6c4da1f228 Merge branch 'develop' of github.com:frappe/frappe into mv-custom-script-client-script 2021-02-19 15:37:37 +05:30
Gavin D'souza
a3a3dc3929 fix: Add awesomebar redirect for Custom to Client Script
Co-authored-by: Faris Ansari <netchamp.faris@gmail.com>
2021-02-19 15:15:20 +05:30