Commit graph

713 commits

Author SHA1 Message Date
Nabin Hait
342e3ec10a Merge branch 'master' into develop 2016-11-14 17:39:07 +05:30
Rushabh Mehta
0f6420517a [hot-fix] fix test and print format 2016-11-14 17:33:32 +05:30
Rushabh Mehta
612d612b7e [hot] fix bug that caused session crashing when cache was full 2016-11-14 17:22:08 +05:30
Saurabh
68c7b14674 [enhance] set last active time to user 2016-11-10 14:40:12 +05:30
Nabin Hait
32d158ed14 Merge pull request #2276 from rmehta/docs-for-frappe-client
[docs] for frappe client #2209
2016-11-09 11:30:54 +05:30
Rushabh Mehta
638816acd0 [docs] for frappe client #2209 2016-11-08 12:24:20 +05:30
Rushabh Mehta
e984953a0a [fix] set frappe parameters only if frappe_server_url is set (#2274) 2016-11-08 09:48:38 +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
Kanchan Chauhan
9864a5a5b7 Disables reports will not show up in list view 2016-10-24 16:54:28 +05:30
Rushabh Mehta
910e44fcba [fix] integration scheduler events 2016-10-19 14:22:37 +05:30
Rushabh Mehta
5c8df6207d [fix] integration scheduler events 2016-10-19 13:16:46 +05:30
Rushabh Mehta
7b69625cbe [fix] tests 2016-10-19 09:21:55 +05:30
Rushabh Mehta
c36055d29e [minor] added frappe.format and validate_payment in web_form.html 2016-10-18 21:52:17 +05:30
Rushabh Mehta
1026a48a97 [refactor] code for integration service scheduled events 2016-10-13 14:59:23 +05:30
Rushabh Mehta
79f51648a1 [fix] for test 2016-10-13 12:24:27 +05:30
Rushabh Mehta
ecfb630246 [minor] print format in web form 2016-10-12 14:12:41 +05:30
RobertSchouten
3730e4fa8f [fix] allow path attachements to be sent my email (#2138) 2016-10-08 11:10:08 +05:30
Rushabh Mehta
9d7ee83c5e [refactor] scheduler log is now error log and as MyISAM (commit not required) (#2152)
* [refactor] scheduler log is now error log

* [minor] new naming series

* [fix] engine

* [fix] saved by tests
2016-10-06 17:17:55 +05:30
Rushabh Mehta
0bdb4b6ec8 [fix] longer error logs 2016-10-05 17:57:26 +05:30
Rushabh Mehta
d49087cbc9 [merge] hotfix 2016-09-30 16:25:07 +05:30
Rushabh Mehta
ea9c92daa5 [hot] ignoring loading errors causes background images to not load 2016-09-30 16:20:20 +05:30
Rushabh Mehta
f1dd0c0bb8 [fix] web forms remove attachment 2016-09-29 12:38:46 +05:30
Rushabh Mehta
e091005b00 [logger] fix tests 2016-09-29 11:44:07 +05:30
Rushabh Mehta
527115ce07 [logger] log in logs/frappe.log 2016-09-29 11:40:00 +05:30
Rushabh Mehta
ce88a60153 [logger] log in logs/frappe.log 2016-09-29 11:30:29 +05:30
Rushabh Mehta
bfa938ff17 [web-forms] mandatory fields must updated before payment, customize list for webform and other fixes 2016-09-28 15:08:10 +05:30
Nabin Hait
d97d13dc22 Fixed version conflict 2016-09-28 10:48:58 +05:30
Rushabh Mehta
7f77139774 [fix] minor date-format 2016-09-26 17:56:38 +05:30
Rushabh Mehta
cd7b7ae35b [portal] enhancement to web form, introduced int, custom menu in portal settings etc 2016-09-26 17:03:55 +05:30
Rushabh Mehta
74bc80d982 [fix] pass_does_not_exist_error 2016-09-26 11:15:45 +05:30
KanchanChauhan
96e8be443e user can update image from website (#2089) 2016-09-23 21:14:18 +05:30
Nabin Hait
aef76fbb3f Fixed version conflict 2016-09-23 12:19:29 +05:30
Nabin Hait
bfea7f687b Fixed version conflict 2016-09-21 13:09:01 +05:30
Rushabh Mehta
85f24c694c [minor] keep backups 24 hours old instead of 48 hours 2016-09-21 11:26:19 +05:30
Rushabh Mehta
74c4cbdba8 [minor] ignore load issues in wkhtmltopdf 2016-09-20 17:12:25 +05:30
Rushabh Mehta
2e66bd044b [docs] and other minor fixes 2016-09-15 13:55:37 +05:30
Nabin Hait
c1e5e5dabe Fixed version conflict 2016-09-14 15:52:32 +05:30
Rushabh Mehta
541d8be95f [complete] auto email report 2016-09-14 12:00:52 +05:30
Shreyas Patil
e5bb0bb283 [Fix] Social login not allowed for a disabled user (#2032) 2016-09-12 16:06:35 +05:30
Faris Ansari
add9c74779 [enhance] search results in help (#2022) 2016-09-01 18:07:22 +05:30
Rushabh Mehta
19e955f81d [minor] catch badly formed template while building help 2016-09-01 13:17:08 +05:30
Nabin Hait
032e893ced Fixed version conflict 2016-08-29 11:45:42 +05:30
Rushabh Mehta
2491c3e335 [minor] fix for pdf print 2016-08-29 11:31:47 +05:30
Rushabh Mehta
ede3a8ca05 [fix] get_visible_columns in jinja.py 2016-08-24 18:45:29 +05:30
Rushabh Mehta
b6d7a45392 [fix] sync languages after frappe install 2016-08-24 14:50:04 +05:30
Rushabh Mehta
6157d7afc7 [fix] commands to setup help and version set as 7.1-beta 2016-08-24 12:44:04 +05:30
Rushabh Mehta
7ed7245564 [fix] tests 2016-08-24 12:04:30 +05:30
Rushabh Mehta
c034750708 [fix] for building help 2016-08-23 18:10:00 +05:30
Rushabh Mehta
8a32adcaf8 [command] bench setup-help will make the help db 2016-08-23 17:53:38 +05:30
Faris Ansari
5683f1f5aa [enhance] app wise help documentation (#2002)
* [enhance] app wise help documentation

* [fix] data-path for contextual help links
2016-08-23 16:47:59 +05:30