Commit graph

1025 commits

Author SHA1 Message Date
Rushabh Mehta
7965deaae3
[feature] add bench auto-deploy command (#4894) 2018-01-23 15:18:51 +05:30
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
Saurabh
3f43899839 resolved merge conflicts 2018-01-15 18:34:11 +05:30
Manas Solanki
edbbf4b464 add the field attach_to_field in the file (#4823) 2018-01-15 18:10:53 +05:30
Nabin Hait
f3e8446a82 Don't set window size in selenium tests 2018-01-11 12:05:40 +05:30
Saurabh
11be75723b Merge branch 'master' into develop 2018-01-09 12:15:49 +05:30
Shridhar Patil
56fa6e1cc8 Logout from all sessions on password change (#4542)
* Logout from all sessions on password change

Add checkbox to logout from all sessions
If checked logout from all sessions

https://github.com/frappe/frappe/issues/4383

* Changed spaces to tabs

* Send logout_all_sessions as 0 or 1

Convert it to in on server side and pass to update_password

* changed logout_all_sessions from bolean to int

* Move checkbox inside form
2018-01-09 10:57:42 +05:30
Zlash65
634e3f3dbb bypass root node validation if no parent found 2018-01-08 11:53:29 +05:30
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
Faris Ansari
6f4e2b046c
[fix] get_icon_html (#4748) 2018-01-03 18:07:38 +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
tundebabzy
27df2485d9 UnboundLocalError When Trying To Upload File #4692 (#4693)
* allow to attach empty files

* PEP8 compliance
2017-12-28 12:56:34 +05:30
Nabin Hait
8a09f915e9 Merge branch 'master' into develop 2017-12-25 13:30:48 +05:30
Prateeksha Singh
ae0234e7e6 [export-fields] export comma separated lines for long values (#4667)
* [export-fields] export comma separated lines for long values, fixes frappe/erpnext#12085

* Update xlsxutils.py
2017-12-22 11:11:13 +05:30
Rohit Waghchaure
0a367e837e [Fix] Decimal issue 2017-12-21 15:53:22 +05:30
Nabin Hait
2e46b1d70c Merge branch 'master' into develop 2017-12-15 12:52:55 +05:30
Manas Solanki
520bfc2ae4 New data import (#4601)
* created/moved the files

* added the model for the downloading the data

* add the file with the error data

* changes added other changes and fix codacy

* changes in the config and utils files

* fixed the test cases

* minor changes in the data keys dict

* changed the test file location

* fixed the tests

* set the route in the list view and show only erors

* minor fixes in the childtable import and log tables rendering

* Refactor Download dialog to use MultiCheck
2017-12-15 12:17:24 +05:30
tundebabzy
d5dcc0b98f Issue 4616 (#4617)
* fail silently when key not found

* PEP 8: spacing, docstrings

* codacy
2017-12-14 14:57:05 +05:30
Nabin Hait
7506c49dc4 Fixed Merge conflict 2017-12-12 19:08:53 +05:30
Faris Ansari
49b63d7680 Add is_image util (#4605) 2017-12-12 19:04:38 +05:30
Brown-Harry Boma
b9201dbdd0 Make improve page link generic in help documentation (#4586) 2017-12-12 12:53:59 +05:30
Achilles Rasquinha
79a8be3633 [HOTFIX] Currency Format on Print (#4584)
* [HOTFIX] fix currency issue on print

* [HOTFIX] fix currency issue on print

* added value check for format

* added value check for format

* fix codacy
2017-12-11 15:10:32 +05:30
Prateeksha Singh
d1aa5c60b4 [Multicheck control] (#4529)
* multicheck control

* [checkboxes] replace in domain settings

* [checkboxes] use in setup_wizard domains

* [multicheck] minor

* [multicheck] set and get value as an array

* [multicheck] make controls.less

* basic view control with value as array object

* load active domains

* selenium helper: multicheck

* [multicheck] make field if not present

* [multicheck] append control in an HTML field
2017-12-06 13:25:33 +05:30
Sushant Nadkar
0ca98a0c74 Added additional_offset parameter to scroll_to and login functions (#4545) 2017-11-30 14:27:53 +05:30
Zarrar
9927eecc9c fix issue with node delete for tree based doctypes (#4554) 2017-11-30 11:51:43 +05:30
rohitwaghchaure
ef7c6c3389 [fix] Item group test cases (#4555) 2017-11-30 11:48:59 +05:30
Zarrar
bef90ee10e making nestedset a bit more flexible (#4552) 2017-11-29 18:39:56 +05:30
Prateeksha Singh
b1e25ee7f4
Merge pull request #4524 from pratu16x7/update-charts
Update charts version
2017-11-24 14:19:51 +05:30
Saurabh
20fff6e874 Merge branch 'master' into develop 2017-11-22 18:02:53 +05:30
pratu16x7
7a41980b41 [charts] update color usage 2017-11-22 10:23:00 +05:30
rohitwaghchaure
922b1237e7 [Fix] Desktop icon page not showing for french language (#4518) 2017-11-21 15:57:49 +05:30
Valmik
fe9ae224f6 Add timeout to click method (#4500) 2017-11-17 11:34:38 +05:30
Nabin Hait
4b5893509a Fixed Merge Conflict 2017-11-14 13:56:42 +05:30
rohitwaghchaure
0db18fdf91 [Fix] Letterhead appearing on PDF even when not selected (#4484) 2017-11-14 13:43:33 +05:30
Rushabh Mehta
07532c93d0 [minor] selenium_testdriver.py where message has no length 2017-11-14 09:33:51 +05:30
Prateeksha Singh
3bb628ffdb update charts to latest (#4472) 2017-11-13 17:21:13 +05:30
Manas Solanki
3c7683e6a1 option to logout from all devices while changing password (#4419) 2017-11-10 12:11:22 +05:30
Nabin Hait
e7beaacc9e
Nestedset model fixes for changing parent and renaming (#4436)
* Nestedset model fixes for changing parent

* Rename function of File
2017-11-10 11:11:59 +05:30
Saurabh
8f07515b45 Merge branch 'master' into develop 2017-11-08 12:03:43 +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
Rohit Waghchaure
f8928dc999 [fix] Not able to export general ledger report's data if data has illegal characters 2017-11-03 15:01:42 +05:30
Saurabh
26bad9c672
Merge pull request #4422 from saurabh6790/revert_encode
[fix] revert unicode decoding
2017-11-03 11:49:42 +05:30
Saurabh
133df77d31 [fix] revert unicode dencoding 2017-11-03 11:47:39 +05:30
Saurabh
a5ffa5755a Merge branch 'master' into develop 2017-10-31 12:26:48 +05:30
Rohit Waghchaure
05808554a0 [fix] Not able to export general ledger report's data in excel 2017-10-30 13:42:49 +05:30
Saurabh
33644ebfb2 [fix] merge conflicts 2017-10-27 16:05:45 +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
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
Faris Ansari
affd84c469 [formatdate] Return empty string if no date provided (#4385) 2017-10-26 17:35:57 +05:30
Prateeksha Singh
56e0b470d6 Merge pull request #4364 from netchampfaris/calendar-view
Generic Calendar View for all DocTypes
2017-10-25 15:40:20 +05:30