Commit graph

1040 commits

Author SHA1 Message Date
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
barredterra
da0ea7c225 refactor: frappe.db.exists instead of try/except 2020-11-16 16:37:06 +01:00
barredterra
645cacce30 fix: redirect back to connected app by default
(instead of to desk)
2020-11-16 16:36:03 +01:00
barredterra
63de774777 feat: allow extra parameters 2020-11-16 16:33:29 +01:00
barredterra
74a51aa177 fix: default if password is empty 2020-11-13 18:08:36 +01:00
barredterra
956e407c5f feat: toggle client credential section 2020-11-13 18:07:46 +01:00
barredterra
931a39c998 faet: display provider name in token cache 2020-11-13 16:17:34 +01:00
barredterra
631f4fab7c fix: show "Connect to {provider}" if doc is not new 2020-11-13 16:16:47 +01:00
barredterra
a582b1c364 fix: allow get_oauth2_session without user arg 2020-11-12 19:43:21 +01:00
Raffael Meyer
a0f7042f0b
Merge branch 'develop' into generic_oauth_client 2020-11-12 18:01:15 +01:00
Rushabh Mehta
75fe8a615a feat(app): move /desk to /app 2020-11-11 16:31:47 +05:30
Mangesh-Khairnar
ea0af8d2e2 chore: remove twilio from requirements 2020-11-02 13:25:22 +05:30
Revant Nandgaonkar
33813fda88 fix: Connected App
fix Get OpenID Configuration button
fix permission error on token save
2020-10-28 14:11:50 +05:30
Mangesh-Khairnar
04b1e40023 chore: remove twilio integration 2020-10-28 10:59:32 +05:30
Shivam Mishra
9e39a7464a Merge branch 'develop' of https://github.com/frappe/frappe into rebrand-ui 2020-10-21 11:55:13 +05:30
mergify[bot]
52b685ce2c
Merge pull request #11580 from Mangesh-Khairnar/mpesa-integration-changes
fix(integration-request): handle response and update status
2020-10-20 09:23:19 +00:00
barredterra
bf4fd67dbf fix: allow insecure transport in tests 2020-10-18 19:34:43 +02:00
barredterra
ab22f75b48 fix: cint for expires_in, docstring 2020-10-18 19:31:14 +02:00
barredterra
3297356e17 test: fix TestTokenCache.setUp() 2020-10-18 19:20:18 +02:00
barredterra
10423b2fc2 fix: TokenCache.get_expires_in() 2020-10-18 19:19:56 +02:00
barredterra
b6674eccff fix: remove unused import of BackendApplicationClient 2020-10-18 18:53:02 +02:00
barredterra
83b85cbdbd test: fix connected app 2020-10-18 18:48:31 +02:00
barredterra
03c1d8dc77 fix: token cache has to ignore permissions 2020-10-18 18:48:07 +02:00