Commit graph

586 commits

Author SHA1 Message Date
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
Mangesh-Khairnar
ea0af8d2e2 chore: remove twilio from requirements 2020-11-02 13:25:22 +05:30
Mangesh-Khairnar
04b1e40023 chore: remove twilio integration 2020-10-28 10:59:32 +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
Mangesh-Khairnar
4f3ec03fd6 fix: follow single responsibility principle 2020-10-15 19:01:40 +05:30
Mangesh-Khairnar
6274ec19a7 fix: handle success and failure separately 2020-10-09 12:51:20 +05:30
Abhishek Balam
414c15302e fix: use frappe.db.get_single_value instead of get_value 2020-09-30 11:36:31 +05:30
Abhishek Balam
cba0050db8 fix: s3 sucess email sent even when checkbox not selected 2020-09-30 03:52:21 +05:30
Mangesh-Khairnar
c3e636914f fix(integration-request): handle response and update status 2020-09-28 02:08:24 +05:30
Abhishek Balam
6bddca6598 fix: change owner value in doctype jsons to Administrator 2020-09-18 18:05:40 +05:30
Gavin D'souza
843718f87b fix: Update integrations with new API 2020-09-15 17:31:02 +05:30
Suraj Shetty
0b1c248a7c
Merge branch 'develop' into fix-notification-links 2020-09-09 14:41:50 +05:30
Shivam Mishra
a8e7ffd767
refactor: don't attach secret to self (#11428) 2020-09-07 11:36:31 +05:30
Suraj Shetty
94cfd20a77
Merge branch 'develop' into razorpay 2020-09-07 09:24:51 +05:30
Shivam Mishra
cd39bbc338 feat: add init client API 2020-09-04 15:52:21 +05:30
Rushabh Mehta
8c8f7313f4
fix(minor): make utils explicit in safe_globals (#11408)
* fix(minor): make utils explicit in safe_globals

* fix(minor): import subprocess

* fix(minor): fix globals in safe_eval;

* fix(minor): import subprocess

* fix(minor): add test

* fix(minor): webhook.py

* fix(minor): document_type_mapping.py
2020-09-03 14:26:01 +05:30
Mangesh-Khairnar
b9e0760487 fix: add a check to enable the twilio settings 2020-09-03 14:11:31 +05:30
Mangesh-Khairnar
1359c1c8b6 fix: add correct slack webhook url link 2020-09-03 12:35:12 +05:30
Saurabh
534cf5c512
fix: Handle empty conditions in s3 backup (#11258) 2020-08-24 16:38:51 +05:30
mergify[bot]
2d074541f8
Merge pull request #11332 from Mangesh-Khairnar/add-dashbord-changes
fix: Add validation for twilio sid and token
2020-08-21 15:32:46 +00:00
Saurabh
fa1e8aef02
fix: upload file backup on S3 (#11326)
1. if file backup is scheduled, and system not have file backup tar t…hen prepare files bakcup before uploading it to s3

2. fix regex for public files
2020-08-21 15:58:32 +05:30
Mangesh-Khairnar
0631055369 feat: add validation for twilio credentials 2020-08-19 22:32:45 +05:30
mergify[bot]
e819c75734
Merge pull request #11217 from gavindsouza/rename-backups
fix: fetch correct backup files
2020-08-15 06:04:50 +00:00
Gavin D'souza
9e00039351 style: Black 2020-08-14 17:25:18 +05:30
Mangesh-Khairnar
b49571f9b3
feat(notification): Add WhatsApp/SMS channels (#9623)
Co-authored-by: Suraj Shetty <13928957+surajshetty3416@users.noreply.github.com>
2020-08-13 17:53:09 +05:30
gavin
5b3fa971b5 Revert "fix: add a distinct identifier for public files backup (#11201)"
This reverts commit ef4a28e10c.
2020-08-07 13:14:29 +05:30
Gavin D'souza
62e718a813 fix: Remove duplicate code
Use BackupGenerator instead of custom code for integrations
2020-08-07 13:13:49 +05:30
Mangesh-Khairnar
ef4a28e10c
fix: add a distinct identifier for public files backup (#11201) 2020-08-06 09:32:04 +05:30
Matteo D
219fbc8e88
fix: Added AWS S3 missing regions (#11109) 2020-07-29 20:58:46 +05:30
Suraj Shetty
942835b581
Merge branch 'develop' into fix-google-drive-backups 2020-07-27 19:09:53 +05:30
Mangesh-Khairnar
ab8a63d6fe fix: minor changes 2020-07-24 22:59:16 +05:30
Mangesh-Khairnar
bc56a59671 fix(paytm-integration): simplify code and remove additional loop 2020-07-24 20:19:35 +05:30
Mangesh-Khairnar
441630acc4 fix: check file backup config before backing up files 2020-07-23 23:43:35 +05:30
Mangesh-Khairnar
48e6f8999d
Merge branch 'develop' into paytm-integration 2020-07-21 00:13:59 +05:30
Mangesh-Khairnar
0ae7d40ebe fix(paytm-integration): use checksum library to generate/verify checksum 2020-07-20 23:08:50 +05:30
mergify[bot]
62957312c5
Merge pull request #10965 from gavindsouza/mv-migrate-to
fix: remove Frappe Cloud migrator logic from frappe
2020-07-13 06:24:55 +00:00
Aditya Hase
912763d3b9
fix: Typo 2020-07-13 10:53:44 +05:30
Gavin D'souza
7e223f3f3a fix: typo 2020-07-10 12:08:41 +05:30
Gavin D'souza
6f51b12fe4 fix: run file directly instead of using exec 2020-07-10 12:03:00 +05:30
Gavin D'souza
517752c4d4 fix: PY2 compatibility change 2020-07-10 11:14:52 +05:30
Mangesh-Khairnar
d2c913331e fix(google-drive): fetch basename for backup 2020-07-10 00:14:09 +05:30
Gavin D'souza
f9bf0c1951 fix: remove Frappe Cloud migrator logic from frappe 2020-07-09 20:22:21 +05:30
Suraj Shetty
b4fc08883a
Merge branch 'develop' into fix-sync-password 2020-07-01 13:01:02 +05:30