Commit graph

10857 commits

Author SHA1 Message Date
Faris Ansari
2cbab3e6da [ui] fix datepicker z-index 2016-10-28 18:14:34 +05:30
Nabin Hait
7c4f40b631 fixed conflict 2016-10-27 19:13:44 +05:30
Nabin Hait
9f93076394 Merge branch 'hotfix' 2016-10-27 19:07:25 +05:30
Nabin Hait
c7ebe79330 bumped to version 7.1.2 2016-10-27 19:37:25 +06:00
Nabin Hait
8cd4702dc4 Merge pull request #2223 from saurabh6790/hotfix
[fix] add get_query via individual _tree
2016-10-27 15:36:42 +05:30
Saurabh
a940923e75 [fix] add get_query via individual _tree 2016-10-27 15:21:47 +05:30
Nabin Hait
6956f8d1f2 Merge pull request #2220 from netchampfaris/hotfix
[ui] datepicker z-index fix
2016-10-27 12:51:38 +05:30
Faris Ansari
2002d097c8 [fix] datepicker z-index 2016-10-27 12:49:00 +05:30
Nabin Hait
37614ed43b Merge branch 'master' into develop 2016-10-27 12:38:27 +05:30
Nabin Hait
563e061876 Merge branch 'hotfix' 2016-10-27 12:38:27 +05:30
Nabin Hait
a2f2340f25 bumped to version 7.1.1 2016-10-27 13:08:27 +06:00
Nabin Hait
f93e93d7f1 Merge pull request #2219 from nabinhait/hotfix
minor fix in patch
2016-10-27 12:37:21 +05:30
Nabin Hait
a6405995ee minor fix in patch 2016-10-27 12:36:12 +05:30
Nabin Hait
bdebbe1a19 Merge pull request #2217 from saurabh6790/hotfix
[fix][patch] refactor integration service setup
2016-10-27 12:15:26 +05:30
Saurabh
a9f8ac34fb [fix][patch] refactor integration service setup 2016-10-27 12:13:20 +05:30
Rushabh Mehta
8f6d3d9a11 [fix] in_standard_filter should be in docfield, not doctype 2016-10-26 19:33:04 +05:30
Rushabh Mehta
f124354250 [fix] default value for check 2016-10-26 19:33:04 +05:30
Rushabh Mehta
aece05a792 [fix] default for checks in db_insert and show top 20 filter values 2016-10-26 19:33:04 +05:30
Rushabh Mehta
603f163dd8 [minor] fix style for no data 2016-10-26 19:33:04 +05:30
Rushabh Mehta
424f99e6f3 [cleanup] dashboard filters 2016-10-26 19:33:04 +05:30
robert schouten
01a4845ce7 assorted cleanup and v7.1 fixes 2016-10-26 19:33:04 +05:30
robert schouten
f0464dbdf1 updating sidebar stats to list_sidebar 2016-10-26 19:33:04 +05:30
robert schouten
5c07b355fe filter_dashboard 2016-10-26 19:33:04 +05:30
robert schouten
074f0fcc0b tag catagories 2016-10-26 19:33:04 +05:30
Nabin Hait
25608cccc8 Merge branch 'develop' 2016-10-26 17:51:25 +05:30
Nabin Hait
e0f09fe3dd bumped to version 7.1.0 2016-10-26 18:21:25 +06:00
Nabin Hait
a5abf3d6b4 Update __init__.py 2016-10-26 17:50:24 +05:30
Nabin Hait
c837deff60 Merge branch 'develop' 2016-10-26 17:46:25 +05:30
Nabin Hait
f212851380 bumped to version 7.2.0 2016-10-26 18:16:25 +06:00
Nabin Hait
926ee60c6d [translations] 2016-10-26 17:44:31 +05:30
Nabin Hait
f9f203dcb6 Fixed version conflict 2016-10-26 16:43:31 +05:30
Nabin Hait
fe98b32e97 Merge branch 'hotfix' 2016-10-26 16:42:20 +05:30
Nabin Hait
4b66baea74 bumped to version 7.0.47 2016-10-26 17:12:20 +06:00
Nabin Hait
bedc4e6edc Merge pull request #2201 from nabinhait/develop
Change Logs for v7.1
2016-10-26 16:35:24 +05:30
Nabin Hait
a08d43d707 Merge pull request #2199 from netchampfaris/ui-fixes
[ui-fix] Help link alignment #2046
2016-10-26 16:33:39 +05:30
Nabin Hait
b5def18aa8 Merge pull request #2200 from KanchanChauhan/diabled-report-hide-awesome-bar
Disabled reports will not be searchable from Awesome Bar
2016-10-26 16:33:28 +05:30
Nabin Hait
e39f15d254 Change Logs for v7.1 2016-10-26 16:28:16 +05:30
Nabin Hait
3e8baaa911 minor fix 2016-10-26 16:00:19 +05:30
Kanchan Chauhan
140521da60 Disabled reports will not be searchable from Awesome Bar 2016-10-26 15:20:22 +05:30
Faris Ansari
d6116985a8 [fix] Help link alignment 2016-10-26 13:54:18 +05:30
Rushabh Mehta
5edcf3ccda [fix] user name must also be a valid email (#2196) 2016-10-26 10:52:56 +05:30
Saurabh
dc397b5949 Merge pull request #2197 from saurabh6790/integration_fix
[fix] Scheduler fixes for Integration Services
2016-10-25 13:04:00 +05:30
Saurabh
6f210f9401 [fix] typo fix 2016-10-25 13:03:34 +05:30
rohitwaghchaure
63a0e5cbdd Added setup_field_label_map method in utils (#2178) 2016-10-25 13:02:35 +05:30
Saurabh
6764e2236f [fix] page break fix in print format (#2193) 2016-10-25 11:26:55 +05:30
Faris Ansari
8d7d47db9f [ui-fix] ui-autocomplete z-index fix (#2191) 2016-10-25 11:26:25 +05:30
KanchanChauhan
267b3bb0cc [WIP] Option to align field in Print Format Builder (#2109) 2016-10-25 11:26:04 +05:30
Rushabh Mehta
89a77016a5 [minor] dont show disabled roles in permission manager (#2180) 2016-10-25 10:59:41 +05:30
Neil Trini Lasrado
a0d514a2e6 [fix] Quick entry from grid view (#2194) 2016-10-25 10:29:05 +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