Commit graph

89 commits

Author SHA1 Message Date
tundebabzy
a5cd234326 remove psycop from requirements (#4562) 2017-12-01 12:06:15 +05:30
Dominik
eafecf9241 [New Integration] Googlemaps and edit Standard Reply Naming 2017-11-17 15:46:41 +08:00
Nabin Hait
4b5893509a Fixed Merge Conflict 2017-11-14 13:56:42 +05:30
Saurabh
21ee6ffed0 [fix] temporarily freeze html2text to version 2016.9.19 (#4478) 2017-11-14 13:46:24 +05:30
Achilles Rasquinha
3343153365 Remove psutil (#4437) 2017-11-06 18:38:05 +05:30
Achilles Rasquinha
b8825ca116 Pure Python MySQL instead mysqlclient (with Python C API) (#4280)
* added PyMYSQL instead mysqlclient-python

* added pymysql import

* fixed db module import

* foxed self._conn wrapper

* updated cursor migration

* removed existent converters

* some more fixes towards API port

* modified travis

* updated doctype and revereted yml

* modified travis

* refreshed logging

* raw fix

* moved from hard coded constants to declarable instances

* moved from hard coded constants to declarable instances

* refactoring and logging

* moved to global import declaration

* fixed codacy

* unfixed codacy

* minor fix

* binary_type has a single

* deprecated alternative

* merged with latest

* fixed merge conflicts

* using deprecated alternative

* raw fix

* stupid fix

* using StringTypes instead

* brutal hack

* log

* tundebazy to the rescue

* fixed content_hash error

* frappe/database.py

* frappe/database.py

* updated database.py

* updated requirements

* updated requirements

* fixed codacy

* fixed codacy

* moved from DatabaseOperationalError to pymysql.InternalError

* moved from DatabaseOperationalError to pymysql.InternalError

* fixed codacy

* empty commit

* fixed codacy

* fixed codacy
2017-11-06 16:42:01 +05:30
Faris Ansari
80054e0f28 Data Migration Tool Hotfix (#4396)
* Add get_source_value to utils, and use it to get value from object or dict

* GitHub connector

* fix codacy

* remove print statement

* Remove Github Connector

* Data Migration Connector

- Create new connection with boilerplate
- Add Run button in Data Migration Plan

* minor

* fix codacy

* remove pygithub

* Minor

- Remove button from form and add to custom button
- Remove is_custom field
- Add Connector Type 'Custom'
- Show New Connection button only in developer mode

* [fix] logging

- only store the name, not the whole json

* [fix] tests
2017-10-27 15:55:41 +05:30
Britlog
355b1d98b6 Change mysqlclient package to avoid error in Debian (#4393) 2017-10-27 15:32:02 +05:30
joezsweet
299ab6198a Cron like events scheduler (#4339)
* - trigger new "cron" event
- check cron string syntax
- added croniter to requirements

* - run scheduler ever 60 sec
- trigger all enabled events
- enqueue if now >= next time execution since last one

* Update task-runner.md

* fixed tests

* fix triggering with now = True

* modified sobstitution to cron_map
modified annually label to annual

* ability to use labels defined in cron_map in cron string definition
2017-10-27 14:48:48 +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
Faris Ansari
d20f9e2895 Data Migration Tool (for hub) (#4144)
* migration tool

* custom field for primary key added

* foreign key and multiple linking F_key issue resolved

* refined code

* many-to-one mapping temp fix

* added support for pre-process + cleaned up code

* [various] fixes to setup wizard for developer mode, frappe.enqueue_doc, share with assign

* Refactor data migration module

* added migration for hub

* Add "Skip errors" in data import tool

* move db_set to document.py

* Add Data Migration Run

* Dynamic Migration ID

* move run() from Mapping to Run

* Push Deleted Documents

* fixes

* [migration] doc operation counts

* insert and update instead of push in connection

* fix count and total_pages, skip sync if total_pages is 0

* [migration] child tables

* fix complete()

* [page] remove required libs

* Add sidebar.js, rename old sidebar.js to form_sidebar.js

* [minor] get_empty_state fixes

* svg in icon

* remove image check

* fix codacy

* fix is_child_table check

* [connector] add get_list()

* Add test for Data Migration Run

* fix test

* truncate tabNote

* fix test

* sync todo with event to fix test

* fix db count

* [mapping] export Mapping to json

* Add docs for Data Migration Tool

* [migration] pull data as list, test case

* [hub] remove mapping export to files

* Pull refactor

* [test]

* Add comments

* [mapping] exec in mapping formula

* fix codacy

* fix codacy

* Remove exec for pre-process and post-process

* Add pre and post process for Push

* Remove formula

* fixes

* [refactor] add failed_log to pull, handle error in pull

* [test] Push, pull, update

* Fix codacy, fix insert_doc for pull

* Set migration id on successful insert

* fix update_doc

* fix update_doc

* method is a function

* child table mapping

* Refactor logging

* fix update_doc again

* fix hostname, password

* update docs, minors

* Remove assign_if_none

* Remove error handling from connection methods

* [refactor] Data migration run

* Break push stages into methods

* Migration run refactor

- fix test
- add separate fields for logging

* fix codacy

* fix hostname password

* fix test
2017-10-05 11:15:35 +05:30
Achilles Rasquinha
e2d87e7887 fix for mariadb@10.2 2017-09-29 13:35:35 +05:30
Rushabh Mehta
4e7a6f7c28 [minor] updated num2words 2017-09-12 09:10:29 +05:30
Aditya Hase
000d9a41b6 Use PyPDF2 instead of pyPdf 2017-08-11 00:39:24 +05:30
Rushabh Mehta
9785e925b7 [fix] for ci 2017-08-10 14:55:04 +05:30
B H Boma
dcee43f646 Settings to send Qrcode as email to user 2017-07-27 17:59:43 +01:00
ckosiegbu
3329618a14 Merge branch 'develop' into twofactor 2017-07-22 19:05:18 +01:00
Faris Ansari
db22aa1c87 Email styling using email.less (#3704)
* DRY font-family declarations

* Add email.less, inline styles using premailer

* min-width 100% for mobile email clients

* Emails without header have default 100% width (like before)

* Include email.css for all apps

* Keep !important declarations

* Add test case for inlining css

* Ignore important rules in css

* minor
2017-07-19 16:21:06 +05:30
ckosiegbu
fd3f0ced7a Include pyqrcode in requirements.txt 2017-07-16 15:28:36 +01:00
ckosiegbu
03718b9ba3 Merge branch 'develop' into twofactor 2017-07-14 12:43:41 +01:00
ckosiegbu
73d772604b Added pyotp to requirements.txt 2017-07-12 23:48:04 +01:00
Manas Solanki
b7e1060ea7 removed the xlwt and use the openpyxl for sending the auto email report in xlsx format (#3590) 2017-07-03 12:27:34 +05:30
rohitwaghchaure
1767922b8d [Fix] In words for polish lanaguage (#3577) 2017-06-28 14:38:55 +05:30
Sophat Vathana
7074d0cfe1 Update requirements.txt (#3522) 2017-06-23 18:01:25 +05:30
mbauskar
49ac5cc9e5 [minor] updated requirement for dropbox 2017-06-22 16:14:25 +05:30
tundebabzy
6a92612e45 changes mysql-python to mysqlclient for py3 support (#3301) 2017-05-19 10:35:14 +05:30
Manas Solanki
001e2d18e9 Add openpyxl in requirements 2017-02-14 18:34:35 +05:30
Nabin Hait
4cf123bd8f Fixed merge conflict 2016-11-28 14:25:11 +05:30
rohitwaghchaure
e03d56adb6 [Fix] Multiple letter head printing issue on print format (#2365) 2016-11-25 16:10:42 +05:30
Revant Nandgaonkar
a16e6a143f OpenID Connect for Frappe (#2227)
* Add field for client_secret in Oauth Client Doctype

* openid_profile endpoint in oauth2.py

* added stub methods for OpenID Connect in RequestValidator

* [Fix] using werkzeug url_fix on uri

* added 3 oidc methods in RequestValidator

* Added Frappe Section in Social Login Keys

Add section in `Social Login Keys` for fields `Frappe Client ID` and `Frappe Client Secret` and additional field Frappe OAuth 2 Server because github, facebook and google have fixed urls, Frappe server URL can change as per the hosting domain/server/company

* [Fix] accept code id_token param for oidc

* generate id_token jwt alg HS256

* Updates to OAuth 2 and OIDC

`OAuth Authorization Code` and `OAuth Bearer Token` DocType made RO
Delete Invalid Codes and Revoked Tokens periodically
generate and send `id_token` only if scope of token is `openid`

* [Fix] Periodically delete revoked tokens

* Social Logins untested

* Enabled Frappe social login

* [Docs] OpenID Connect and Frappe social login

* [Fix] Allow multiple scopes for OAuth 2

* [Docs] Added screenshot steps to configure openid and frappe social login

* saved doctype to solve merge conflict

* [fix] re-added client_secret after resolving merge conlict

* [Fix] frappe_userid and default scope
2016-11-07 22:25:11 +05:30
Revant Nandgaonkar
d48b270bf5 OAuth 2 Provider for frappe (#2167)
* OAuth 2.0 Classes Added

Added oauthlib in requirement.txt
Added class WebApplicationServer for Authorization code grant and Bearer tokens.
Added class OAuthWebRequestValidator for Validating Oauth Request for Web Application

* copied code from mnt_oauth needs review

* [New] OAuth2 Doctypes and endpoints added

Integrations > OAuth Provider Settings
Integration Broker > OAuth Bearer Token
Integration Broker > OAuth Authorization Code
Integration Broker > OAuth Client
endpoints for authorize, approve, get_token, revoke_token and test_resource

* oauth2.py: renamed skipauth to skip_auth

* [Fix] Parse URL instead of storing it in settings

* [Fix] get skip_auth from OAuth Provider Settings

* Success URL format. Failure URL added. Confirmation dialog layout changed.

* Validate access token if passed during use of REST API

* OAuth Confirmation colours fixed

* Multiple Changes

Added links for OAuth under Integrations in Module list.
Updated permissions on OAuth doctypes.
Updated layout of OAuth Client doctype.

* [Docs] Integrations > How to setup OAuth

* [Docs] Integration > Using OAuth

* [Fix] get_token endpoint must to handle POST request

* [Fix] http verbs and responses for OAuth 2.0 Endpoints

* [Fix] accept oauth2 access_token from headers

* Removed unused imports from api.py
2016-10-25 10:28:32 +05:30
Saurabh
205ae26751 [fix] refactor integration services (#2087)
* [fix] refactor integration services

* [fix] patch fix

* [fix] added redirect url.

* [fix] custom redirect to and reditect message for paypal and service setup information

* [minor][fix] remove ldap dependancy from requirements
2016-10-10 17:16:21 +05:30
Saurabh
18c62f0470 Integration broker (#1968)
* [enhancement] integration borker and controller

* [minor][fix] parameter naming changes

* [fix] common scheduler for integration service

* [fix] integrations

* [patch] patch to move payment gateway in Integration Service

* [fix] add payment success, cancel and failuer handling pages

* [enhancment] dropbox integration merged in integration services

* provision to add custom parameters

* [fixes] patch fix to setup dropbox settings

* [fixes] removed dropbox backup, api usage note for paypal and razorpay

* [minor][fix] deprecate service events

* [fix] return type fix for checkout urls

* [fix] add custom settings via patch for dropbox backup frequency

* [fix] remove gride editting

* [enhance] ldap based login

* [enhance] login via ldap credentails

* [commit] remove parameter table, save params as json dict
2016-09-09 11:15:18 +05:30
Rushabh Mehta
19e955f81d [minor] catch badly formed template while building help 2016-09-01 13:17:08 +05:30
Felipe Orellana
d07e6759a1 Added junit xml reporting capability to test_runner. Added new --junit-xml-output flag to frappe run-test bench command. Updated requirements file to include xmlrunner to generate junit xml reports. (#1995) 2016-08-23 16:49:08 +05:30
Rushabh Mehta
512fc3a5c2 [feature] [api] frappe.client.insert_many 2016-08-09 11:09:31 +05:30
Anand Doshi
19ece064cd Merge pull request #1802 from anandpdoshi/password-strength
[security] test password strength
2016-06-16 18:25:14 +05:30
Anand Doshi
155d065807 [cleanup] remove celery from requirements.txt 2016-06-16 11:58:14 +05:30
Anand Doshi
f176555dd5 [security] test password strength 2016-06-15 19:22:18 +05:30
Anand Doshi
526e9ea2d7 [security] encrypt passwords that need to be retrievable, except User password which should be hashed 2016-06-13 17:18:59 +05:30
Anand Doshi
a48dd50381 [fix] with frappe.init_site, worker and schedule commands, cleanup and fixes to rq code 2016-04-13 19:28:04 +05:30
Valmik Jangla
a2ad631754 Removed / Replaced Celery related code 2016-04-11 17:39:06 +05:30
Valmik Jangla
6d0563e8ea WIP code migration from Celery to RQ 2016-04-11 17:36:27 +05:30
Anand Doshi
353e8a9d1f [fix] Sanitize form_dict and doc values to prevent XSS 2016-02-23 12:11:28 +05:30
gabtzi
b6d321a921 Added requirement for beautifulsoup4 2016-01-27 20:51:23 +05:30
Paul Belanger
a4751e1d80 Drop slugify from requirements
I could not see where this was actually needed.

Signed-off-by: Paul Belanger <pabelanger@redhat.com>
2016-01-14 11:38:55 -05:00
Anand Doshi
e7738da5fc [fix] hotfix use https in cloning pdfkit 2015-12-09 15:12:07 +05:30
Anand Doshi
8a5addaae7 [feature] Private files. Fixes #927
- Option during upload + all new incoming email files will be private
- Paired with @rmehta
2015-12-09 14:02:14 +05:30
Rushabh Mehta
9231b9a9b8 [enhancement] added 'make_thumbnail' to File and will be saved as thumbnail_url 2015-10-07 14:28:42 +05:30
Anand Doshi
587e43c7b0 [fix] sanitize html for guest methods if guest user 2015-09-23 18:25:36 +05:30