Commit graph

31057 commits

Author SHA1 Message Date
mergify[bot]
1448a47f62
Merge pull request #12567 from hasnain2808/fix-multiselect-dialog
test: encoding @ since we encode each url
2021-03-11 16:10:21 +00:00
hasnain2808@gmail.com
85de1a01df test: encoding @ since we encode each url 2021-03-11 20:43:44 +05:30
mergify[bot]
e9aa93fe98
Merge pull request #12424 from CaseSolvedUK/sitemapfix-v13
fix: Bug preventing proper detection of pages
2021-03-11 08:58:13 +00:00
Fisher Yu
8ef2545665
fix: encode filename to handle special characters (#12478)
* fix: same as previous row treated as one doc

treat repeated parent doc rows as same doc(parent), because legacy system downloaded data with inner join will normally have repeat same content for the parent docs

* fix: attached url with utf8 characters file name e.g Chinese

fix attached file via URL in comment by file name with utf8 characters

* fix: revert as it is already in other PR

* refactor: use frappe.safe_encode

Co-authored-by: Faris Ansari <netchampfaris@users.noreply.github.com>
2021-03-11 08:57:37 +00:00
Faris Ansari
5e5f470272
Merge pull request #12464 from prssanna/docname-trailing-space
fix: include space and tab in special characters to match to encode url
2021-03-11 14:18:01 +05:30
Faris Ansari
a0d3ddbf6b
fix: encode URI unconditionally
ref: https://stackoverflow.com/a/29948396

Co-authored-by: Rohan <Alchez@users.noreply.github.com>
2021-03-11 14:09:11 +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
Prssanna Desai
8c799ef43a
Merge pull request #12527 from pateljannat/gantt-progress-on-the-bar 2021-03-11 12:39:29 +05:30
mergify[bot]
f0c3788b66
Merge pull request #12565 from leela/import-templates
perf: Increase data import's download template perf over 10x
2021-03-11 07:01:50 +00:00
pateljannat
645c6dc221 Merge branch 'develop' of https://github.com/frappe/frappe into gantt-progress-on-the-bar 2021-03-11 11:20:21 +05:30
pateljannat
deec4c4681 fix: indentation 2021-03-11 11:19:43 +05:30
Ankush Menat
6c2d377e74
fix: use semgrep cli instead of docker image (#12566)
CLI is more flexible at present. Until github action catches up,
switch to CLI version.

This also fixes failure from forks which don't contain semgrep config
yet.
2021-03-11 10:42:42 +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
Afshan
a342ca2386
fix: Get file name from path (#12437)
* fix: get file name from path

* Update frappe/integrations/doctype/dropbox_settings/dropbox_settings.py

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* fix: upload only files which have file url

* fix: patch to fix files name and url

* fix: fixing patch

* refact: patch refactor

* fix: missing :

* fix: renamed variables

* fix: refactoring patch

* fix: update file exists function

* fix: added patch path in patch.txt

* fix: added try except

* fix: Use set_value instead of set_values

* style: Fix formatting

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2021-03-10 18:36:10 +00:00
mergify[bot]
856e9adf38
Merge pull request #12558 from resilient-tech/fix-rename-doc
fix: Document rename
2021-03-10 13:46:18 +00:00
Sagar Vora
224a80aa9d fix: old doc not found error when renaming doc 2021-03-10 18:20:20 +05:30
mergify[bot]
15a9b6a727
Merge pull request #12556 from resilient-tech/fix-recorder-routing
fix: routing issues in recorder
2021-03-10 12:19:38 +00:00
this-gavagai
e2b91b5454
chore(calendar): Updated fullcalendar.js to v3.10.2 (#12519)
Co-authored-by: theopen-institute <admin@theopen.institute>
2021-03-10 17:19:53 +05:30
mergify[bot]
e2c2e88610
Merge pull request #12530 from resilient-tech/fix-dashboard-view
fix: allow navigating back from dashboard view
2021-03-10 11:27:22 +00:00
Sagar Vora
0588e9c7ff fix: routing issues in recorder 2021-03-10 16:55:03 +05:30
mergify[bot]
2e20158753
Merge pull request #12529 from resilient-tech/fix-router
fix(router): navigating forward not working for routes in frappe.re_route
2021-03-10 11:24:50 +00:00
Sagar Vora
9aeb9ac185 fix(router): navigating forward not working for routes in frappe.re_route 2021-03-10 16:08:18 +05:30
pateljannat
9e6946417e fix: conditions 2021-03-10 15:39:45 +05:30
mergify[bot]
7eee5c1a35
Merge pull request #11643 from Alchez/feat-remove-failed-queue
feat: Clear failed jobs queue
2021-03-10 05:20:53 +00:00
pateljannat
68557ed1b9 Merge branch 'gantt-progress-on-the-bar' of https://github.com/pateljannat/frappe into gantt-progress-on-the-bar 2021-03-10 10:39:46 +05:30
pateljannat
b21e73cf00 fix: handled no progress field scenario 2021-03-10 10:39:40 +05:30
mergify[bot]
0b7b6a863e
Merge pull request #12555 from netchampfaris/web-fixes-24
fix: Website fixes
2021-03-10 05:06:53 +00:00
Andy Zhu
138c7841c2
fix: set_primary and set_primary_email bug (#12299)
* fix: set_primary and set_primary_email bug

When user untick the `is_primary_phone` or `is_primary_mobile` from the contact numbers table, we should reset the phone, mobile number etc.
Same goes for the email address table.

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* Update frappe/contacts/doctype/contact/contact.py

fix variable naming as suggested

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>

* test: Set empty string instead of none for number

Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
Co-authored-by: Suraj Shetty <surajshetty3416@gmail.com>
2021-03-10 05:02:50 +00:00
Suraj Shetty
7c05fd2a17 test: Wait for enqueued job to execute 2021-03-10 10:29:07 +05:30
Suraj Shetty
bcd3f7540d
Merge branch 'develop' into feat-remove-failed-queue 2021-03-10 10:03:19 +05:30
Suraj Shetty
5e6283f33d
test: Reset recorder before each test to avoid flaky tests (#12554) 2021-03-09 22:27:16 +05:30
Faris Ansari
51ee995c07 fix: Bolder font-weight for h2, like h1 and h3 2021-03-09 21:55:22 +05:30
Faris Ansari
45c07f14a5 fix: Make feature card fully clickable 2021-03-09 21:54:44 +05:30
mergify[bot]
8ededc20fb
Merge pull request #12549 from resilient-tech/fix-oauth-login
fix: create gender only if provided while creating oauth user
2021-03-09 16:20:11 +00:00
mergify[bot]
ae22231747
Merge pull request #12492 from shariquerik/improve-message-fix
fix: Email Password popup grammar fix
2021-03-09 11:54:24 +00:00
Sagar Vora
5cd3f8534b fix: create gender only if provided while creating oauth user 2021-03-09 16:47:21 +05:30
Prssanna Desai
a4b75e7844
fix: translation syntax 2021-03-09 16:34:54 +05:30
shariquerik
78a8cd74d0 fix: sider fix 2021-03-09 15:22:22 +05:30
Rohan Bansal
e675043e9d Merge remote-tracking branch 'upstream/develop' into dev-import-file-error 2021-03-09 15:21:45 +05:30
Rohan Bansal
a94a55212b Merge remote-tracking branch 'upstream/develop' into feat-remove-failed-queue 2021-03-09 15:20:52 +05:30
shariquerik
3717c98154 fix: implemented suggestions 2021-03-09 15:18:44 +05:30
mergify[bot]
416ec53410
Merge pull request #12525 from leela/rate-limit-endpoints
refactor: Rate limiting decorator for endpoints
2021-03-09 09:10:07 +00:00
leela
0fb2d330c9 test: Fix rate limiting reset password test 2021-03-09 14:03:00 +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
14b3d344a5 test: Testcase for rate_limit decorator 2021-03-09 13:53:00 +05:30
leela
2af0778857 refactor: Use rate_limit decorator for reset password
Using rate limit decorator for reset password endpoint.
2021-03-09 13:53:00 +05:30
leela
ba16e4737b refactor: rate limiter decorator added
We have rate limiter for reset passowrd alone and it is not re-usable
for other endpoints. Added a generic rate limiter decorator that can be
used for any endpoint.
2021-03-09 13:53:00 +05:30
Suraj Shetty
a19c809a04
chore: Update CODEOWNERS 2021-03-09 13:11:47 +05:30
Prssanna Desai
c66b079301
Merge pull request #12476 from shariquerik/customize-form-doc-type-fix
fix: Cannot change Entry Form Type
2021-03-09 12:19:37 +05:30
mergify[bot]
a658304084
Merge pull request #12477 from szufisher/szufisher-all-repeated-parent-rows
fix: same as previous row treated as one doc
2021-03-09 06:48:15 +00:00