Commit graph

712 commits

Author SHA1 Message Date
Revant Nandgaonkar
46d68e252f fix: id_token format
decode bytes to utf-8 string
2021-04-19 20:01:52 +05:30
mergify[bot]
2cc1733126
Merge pull request #12887 from alyf-de/fix_test_token_cache
test: fix PermissionError in test_token_cache
2021-04-19 11:56:05 +00:00
Rohan Bansal
a7794d9f6c Merge remote-tracking branch 'upstream/develop' into feat-py3-dependencies 2021-04-19 12:51:50 +05:30
barredterra
edef0a467d fix: test_token_cache PermissionError 2021-04-17 18:31:43 +02:00
Suraj Shetty
38ca6fe621
style: Remove extra space 2021-04-15 10:23:09 +05:30
Hussain Nagaria
2133777c44 test: Execute enabled webhook trigger 2021-04-15 07:46:39 +05:30
Rohan Bansal
86851028ea feat: manage Python 3 compatiblity with dependencies 2021-04-14 14:40:58 +05:30
Hussain Nagaria
1f70959fa1 feat: Add Enable/Disable Webhook via Check
- Added a new field to Webhook DocType
- Modfied the webhook run logic to only fetch enabled webhooks
2021-04-14 05:56:05 +05:30
Rushabh Mehta
3d22019b98 fix(minor): dynamically changing grid properties 2021-04-13 11:52:57 +05:30
Sagar Vora
ada4ad7514 chore: add whitelist decorator to missed methods 2021-03-30 18:31:01 +05:30
Gavin D'souza
82620d789a fix: Delete user after test is run 2021-03-15 18:53:22 +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]
f36e23e003
Merge pull request #12470 from revant/fix_openid_profile
fix(integrations): fix base url for openid_profile
2021-02-24 11:54:42 +00:00
Revant Nandgaonkar
3d26f84d33 fix(integrations): fix base url for openid_profile
if the server is behind proxy the frappe.request.url scheme
is http instead of https causing mixed content errors in browser
2021-02-24 12:31:34 +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
Suraj Shetty
603018ef53
perf: Load workspace faster (#12364) 2021-02-12 19:10:44 +05:30
Suraj Shetty
b94d5778a8 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2021-01-19 10:36:50 +05:30
barredterra
a0678a4d5f test: login twice 2021-01-18 19:27:05 +01:00
barredterra
7fd4a114a1 test: use get for login 2021-01-18 18:53:35 +01:00
barredterra
aa9a8b2f1b fix: remove unused import 2021-01-18 18:46:55 +01:00
barredterra
b9f2f5bc22 test: fix connected app 2021-01-18 18:41:11 +01:00
Rushabh Mehta
2b40c5505c
Merge pull request #11000 from alyf-de/generic_oauth_client
feat: generic oauth client
2021-01-14 09:28:07 +05:30
Shivam Mishra
f055604167 fix: default str for json dumps 2020-12-31 13:11:46 +05:30
barredterra
1d975f07e7 fix: allow insecure transport in travis 2020-12-28 17:26:57 +01:00
barredterra
f06961e001 refactor: useless try except, better error messages 2020-12-25 15:28:34 +01:00
barredterra
9a1d8ae6b2 feat: redirect to Guest to login 2020-12-25 15:23:43 +01:00
Rushabh Mehta
54cee87826 fix(minor): tests + routing 2020-12-24 14:48:40 +05:30
barredterra
301ed4c7e3 fix: rely on frappe.utils.get_url 2020-12-22 18:35:26 +01:00
barredterra
bf8b40acec fix: test records 2020-12-21 17:25:26 +01:00
barredterra
9f6fc4618f fix: base_url 2020-12-21 17:25:16 +01:00
Shivam Mishra
8b77346066 Merge branch 'rebrand-ui' of https://github.com/frappe/frappe into desk-enhancements 2020-12-16 13:18:48 +05:30
Suraj Shetty
b5a87f9487 Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-12-14 09:06:16 +05:30
barredterra
fc97e080c6 feat: remove useless functionality 2020-12-07 16:32:19 +01:00
Shivam Mishra
bd7690a9fa feat: rename desk page to workspace 2020-12-04 14:16:26 +05:30
Shivam Mishra
1cb80bbf78 feat: update desk pages json 2020-12-04 14:16:26 +05:30
Shivam Mishra
8c9cb9cccd chore: add dependencies 2020-12-04 14:16:26 +05:30
Shivam Mishra
303995d0de refactor: update desk page json 2020-12-04 14:16:26 +05:30
Shivam Mishra
de12cb845a fix: link type 2020-12-04 14:16:26 +05:30
Shivam Mishra
cd36cdb721 feat: update links in desk page json 2020-12-04 14:16:26 +05:30
Rushabh Mehta
ff71329b03 fix(merge): develop 2020-12-02 10:54:10 +05:30
Raffael Meyer
af0d2085d4
Merge branch 'develop' into generic_oauth_client 2020-11-23 12:25:40 +01:00
barredterra
e93a38f912 refactor: move encode_params from test to oauth2.py 2020-11-20 19:02:33 +01:00
barredterra
bea4f6e11b fix: remove unused import 2020-11-20 18:03:17 +01:00
barredterra
9fb635828f refactor: oauth2 2020-11-20 17:44:35 +01:00
Suraj Shetty
2e05df2680
Merge branch 'develop' into mergify/bp/develop/pr-11526 2020-11-18 15:56:38 +05:30
Suraj Shetty
189c6cb771
style: Remove unused import 2020-11-18 14:01:14 +05:30
Suraj Shetty
887f4b0d61
fix: Resolve conflicts 2020-11-18 13:54:57 +05:30
Saurabh
cb6c704671 fix: Define chunk size based on backup file size to avoid timeout issues (#11526)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
(cherry picked from commit 5020bbe4f68abaf5f9c019efff6105573d2ed5c0)

# Conflicts:
#	frappe/integrations/offsite_backup_utils.py
2020-11-18 05:42:19 +00:00
Gavin D'souza
f1cd3388ba style: Black-ish + fixed typos + Optimized imports 2020-11-17 16:29:54 +05:30
barredterra
e3e8e1dca2 test: fix method name 2020-11-16 16:41:16 +01:00