Commit graph

134 commits

Author SHA1 Message Date
Charles-Henri Decultot
41598d22f0 Braintree integration (#4971)
* Braintree Integration WIP

* Braintree integration

* Link in config + settings after save

* Code cleanup

* Code cleanup

* JS beautify issue

* Codacy corrections

* Spaces to tabs
2018-02-16 15:16:23 +05:30
Saurabh
45707b1153 [fix]provision to setup default aws s3 url if endpoint not found in doc while taking backup 2018-01-31 12:02:06 +05:30
Saurabh
cf4f651411
Merge pull request #4772 from mokhito/develop
Enable usage of other services than Amazon's S3 for backups.
2018-01-31 12:00:31 +05:30
mokhito
78648b97d3
Fix indentation. 2018-01-23 11:57:38 +01:00
mokhito
5bcf302325 Make Endpoint URL field optional. 2018-01-23 11:56:08 +01:00
Revant Nandgaonkar
5f22459013 Salesforce social login (#4819)
* Added Salesforce Social Login

* [Docs] Generate client_id client_secret for login providers

* [Fix] salesforce userid

Saleforce sub from openid is https://login.salesforce.com/id/ABC/XYZ
Extracting ABC/XYZ
2018-01-19 12:23:37 +05:30
Aditya Hase
8c525fc5d4 Python 3 compatibility Frappe installation fixes (#4863)
* Use consistent indentation

* Fix print syntax

* Pass unicode argument to pymysql.escape_string
2018-01-18 13:52:46 +05:30
mokhito
ab810adbbb
Add Endpoint URL field. 2018-01-06 13:02:42 +01:00
mokhito
7d7d900f0d
Add endpoint_url param when connecting to object storage. 2018-01-06 13:01:24 +01:00
Revant Nandgaonkar
bb0a2abdd5 [Fix] patch social login key refactor (#4749)
* [Fix] patch social login key refactor

* [Fix] import frappe in html_utils.py
2018-01-03 18:50:32 +05:30
Revant Nandgaonkar
02aa7b6f41 Social login refactor (#4519)
* Added DocType Social Login Key

WIP for https://github.com/frappe/frappe/issues/4496
added basic fields
after_insert add provider_username and provider_userid fields on User dt
on_trash deletes added fields on User dt

* Added field to store fontawesome icon for provider

* [Patch] Social Login Keys to Social Login Key

* [Patch] Social Login Keys to Social Login Key

* Social Login Key generates boilerplate

* patch fixed for social_login_refactor

* removed patch-not working

* use social login keys to initiate flow

* Login page shows Social Login Key

* show login via if base_url present

* removed boilerplate generator

* Multiple Changes

fix zxcvbn import in password_strength.py
use of child table instead of additional fields on user dt to store username and userid

* Fetched Template on Client JS

* Frappe social login template working

* Added Social Login Key Templates

* Codacy fixes and validate social login key urls

* [Patch] Social Login Keys (untested)

* [Fix] Patch refactor social login keys

* [Fix] Patch refactor_social_login_keys manually tested

* Refactor OAuth 2.0 related changes for Social Login Key

* [Fix] Patch refactor social login keys

* Test - Adding Frappe Social Login Key

* Social Login Key Tests

check added child table entry on user for provider frappe
it also checks if userid is created

* [WIP] Office 365 Social Login Key Template

* [Fix] Social Login - Redirect URL

* [Test] Single sign-on icons for added provider

* [Fix] Codacy Errors

* [Fix] Social Login Key Form JS

* Docs Added for Social Login Key

* [Fix] Patch Refactor Social Login Keys

* Handle different icon types

Handle different icon types (image, icon, emoji) with just icon field

* Move the login methods to a new py file

frappe.integrations.oauth2_logins added
copied whitelisted guest oauth2 redirect endpoints from login.py
removing the functions from login.py will break backward compatibility

* Social Login Key Form Changes

Moved Enable field to top
Fields which are not editable are collapsed

* [Fix] Codacy Errors

* Corrected Docs, sync.py

* [Docs] Adding a social login provider

* [Fix] set frappe userid from User Social Login

* [Fix] frappe userid in oauth.py

* removed icon_type

* Use frappe.utils.is_image
2018-01-03 14:57:16 +05:30
Saurabh
af0d0972aa [fix] Increase chunk size to 15 mb while uploading file to dropbox (#4492) 2017-12-07 13:17:42 +05:30
Nabin Hait
1ae64870be Minor fix in Google maps 2017-11-29 15:50:52 +05:30
Rushabh Mehta
aa78c34664 Update integrations.py and Standard Reply naming 2017-11-20 10:51:07 +08:00
Dominik
eafecf9241 [New Integration] Googlemaps and edit Standard Reply Naming 2017-11-17 15:46:41 +08:00
Nabin Hait
347df7942a Merge branch 'master' into develop 2017-11-15 14:07:44 +05:30
Saurabh
450a54ec69 [fix] prepare file list by including all nested files (#4491) 2017-11-15 13:59:23 +05:30
Rishabh Nambiar
fe7a7d81b2 [fix] Allow capital letters in bucket name (#4494)
fix for https://github.com/frappe/erpnext/issues/11547
2017-11-15 10:50:54 +05:30
Rishabh Nambiar
c509d73503 minor fix for capital letters in bucket name. 2017-11-14 16:43:56 +05:30
Saurabh
b6ada00bf0 [fix] first commit payment transaction status and then run post payment process method 2017-11-01 12:15:57 +05:30
almeidapaulopt
57dcc98ae8 [hotfix]Gsuite change code tag to pre (#4354)
* change code tag to pre

* gelete test files
2017-10-27 14:56:06 +05:30
Saurabh
1cf3c33838 [fix] catch dropbox api malformed_path exception and log file path with traceback (#4332) 2017-10-27 14:47:10 +05:30
Revant Nandgaonkar
4df6135c3c enqueue_after_commit option added to frappe.enqueue (#4167)
* enqueue_after_commit option added to frappe.enqueue

* Fixes

Codacy https://www.codacy.com/app/frappe/frappe/pullRequest?prid=934733
clear frappe.flags.enqueue_after_commit after executing enqueued jobs

* sync_global_search() uses enqueue_after_commit=True

* Update database.py

* webhooks enqueue after commit

* Update __init__.py
2017-10-18 11:43:02 +05:30
Rishabh Nambiar
0e412de72e [major] AWS S3 Integration for Frappé (#4272)
* Added S3 Integration, need to add backup limit

* Fix validation in s3 doctype

* Added auto-deletion of old backups and backup_limit usage

* Fixes for codacy PR review

* Improved exception handling.

* Update s3_backup_settings.py
2017-10-17 12:45:25 +05:30
Saurabh
54c989b247 Merge branch 'master' into develop 2017-10-06 17:28:04 +05:30
Saurabh
52d1e7300b [fix] generate token while initiating razorpay payment and accept payment against the token. do not pass payment arguments in url, user can modify payment parameters (#4269) 2017-10-06 17:23:12 +05:30
Revant Nandgaonkar
d80a8e8804 Oauth2 implicit grant fixes tests (#4261)
* [Fix] Implicit Grant / Token

* test for oauth2 implicit grant
2017-10-06 11:47:33 +05:30
Rushabh Mehta
a975ee2af8 Merge pull request #4166 from netchampfaris/webhook-fix
[fix] webhooks cache
2017-09-25 11:35:22 +05:30
Rushabh Mehta
562d4c4979 Merge pull request #4168 from maxtorete/develop
Fixed rounding problem in stripe integration (#10645)
2017-09-25 11:34:03 +05:30
creador30
0df3335e9e [fix] dropbox upload of unicode filenames
When using Unicode filenames Dropbox backup fails with an error similar to:
UnicodeEncodeError: 'ascii' codec can't encode character u'\u015f' in position 44: ordinal not in range(128)
This commit fixes this issue.
2017-09-24 11:12:52 +03:00
maxtorete
5f86884031 Fixed rounding problem in stripe integration (#10645) 2017-09-23 01:46:12 +02:00
Faris Ansari
0bcb4ee131 [minor] webhooks cleanups 2017-09-22 17:34:49 +05:30
Faris Ansari
1f151ee825 [fix] webhooks cache 2017-09-22 17:23:35 +05:30
Rushabh Mehta
dcaf5f98af [fix] remove prints 2017-09-21 16:47:53 +05:30
Revant Nandgaonkar
45f2ff43ad [Fix] Codacy
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990
2017-09-20 18:52:50 +05:30
Revant Nandgaonkar
2d148c804e Webhook retry 3 times 2017-09-20 18:34:28 +05:30
Revant Nandgaonkar
1f9b1e40e3 Moved run_webhooks to webhook.py 2017-09-20 16:33:28 +05:30
Revant Nandgaonkar
e7459c7e83 Clean up 2017-09-19 16:40:17 +05:30
Revant Nandgaonkar
fadb45e369 enqueue webhook request 2017-09-18 17:10:53 +05:30
Revant Nandgaonkar
421b436803 move run webhook to Document from hooks 2017-09-18 16:32:33 +05:30
Revant Nandgaonkar
cbfbaed73e [Fix] Codacy
https://www.codacy.com/app/frappe/frappe/pullRequest?prid=900990
2017-09-14 19:25:38 +05:30
Revant Nandgaonkar
cedb309446 Cleanup and Docs for Webhooks 2017-09-14 17:26:34 +05:30
Revant Nandgaonkar
24a2656746 Only allow specified fields of doc 2017-09-14 14:16:44 +05:30
Revant Nandgaonkar
beb6318d88 Webhook Data DocType added 2017-09-14 13:24:02 +05:30
Revant Nandgaonkar
4b75ec13b3 [Fix] Codacy Errors 2017-09-10 18:30:50 +05:30
Revant Nandgaonkar
a928d7ac01 [Fix] Codacy 2017-09-10 12:03:50 +05:30
Revant Nandgaonkar
8c71042c67 [fix] Codacy errors 2017-09-10 11:49:53 +05:30
Revant Nandgaonkar
3d15e6a431 Cleanup 2017-09-10 11:09:50 +05:30
Revant Nandgaonkar
f8a1d55689 Fix and Documentation
webhook_doctype field made Mandatory in Webhook
Documentation and screenshot added
2017-09-10 10:58:33 +05:30
Revant Nandgaonkar
0b1a655da1 [Fix] filter only existing webhooks 2017-09-09 19:26:50 +05:30