Commit graph

1018 commits

Author SHA1 Message Date
Rushabh Mehta
9ef8f18fcf [fix] for tests, and db_set now accepts dict 2016-11-17 09:45:44 +05:30
Rushabh Mehta
c97d372655 [fix] set message-id and sync threads 2016-11-17 09:45:44 +05:30
Rushabh Mehta
2fe0e2acad [fix] set Message-Id in email based on reference and tag replies to the same object 2016-11-17 09:45:44 +05:30
Rushabh Mehta
819983a7b6 Merge branch 'master' into develop 2016-11-16 11:20:42 +05:30
Rushabh Mehta
bd36f63a7b [minor] supress duplicate icon error in setup wizard (#2327) 2016-11-16 11:19:36 +05:30
KanchanChauhan
ca22d756e3 Send unsubscribe message in email option added to Email Account (#2298) 2016-11-14 12:06:59 +05:30
Nabin Hait
eaf06c4271 Merge pull request #2289 from saurabh6790/set_last_active
Set last active
2016-11-11 15:29:40 +05:30
Nabin Hait
2ffa35b38a Fixed merge conflict 2016-11-11 15:10:35 +05:30
Rohit Waghchaure
fc454e014d [Fix] break fieldtype issue in the auto email report, object split issue for the columns which has list and dictionary 2016-11-10 19:16:15 +05:30
Saurabh
68c7b14674 [enhance] set last active time to user 2016-11-10 14:40:12 +05:30
Nabin Hait
d3c75b6260 Merge pull request #2275 from rmehta/document-type-fix
[fix] label for document type, fixes #2165
2016-11-09 11:31:21 +05:30
Rushabh Mehta
89885fe6a9 [fix] changing timezone does not reflect in system settings 2016-11-08 18:15:17 +05:30
Nabin Hait
178be8893c Merge branch 'master' into develop 2016-11-08 15:20:34 +05:30
Rushabh Mehta
80354e1567 [fix] label for document type, fixes #2165 2016-11-08 11:48:22 +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
Rushabh Mehta
95fdfe44d3 [minor] added default standard filters (#2270)
* [minor] added default standard filters

* [fix] frappe.sendmail

* [fix] frappe.sendmail
2016-11-07 17:18:49 +05:30
robert schouten
aa94847574 [minor]dont show doctypes with all disabled roles in permission manager (#2268) 2016-11-07 16:59:52 +05:30
Nabin Hait
4a5fa154ac Fixed merge conflict 2016-11-03 15:16:33 +05:30
rohitwaghchaure
06b2b44b45 Remember last selected value (#2203) 2016-11-03 11:12:48 +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
5c07b355fe filter_dashboard 2016-10-26 19:33:04 +05:30
robert schouten
074f0fcc0b tag catagories 2016-10-26 19:33:04 +05:30
Rushabh Mehta
5edcf3ccda [fix] user name must also be a valid email (#2196) 2016-10-26 10:52:56 +05:30
Rushabh Mehta
89a77016a5 [minor] dont show disabled roles in permission manager (#2180) 2016-10-25 10:59:41 +05:30
Nabin Hait
b208dcb16b Fixed version conflict 2016-10-18 15:24:38 +05:30
Rushabh Mehta
7d1b29a413 [fix] [import] ignore if time missing while file import 2016-10-18 14:25:11 +05:30
KanchanChauhan
6e9fb3b04c DocShare perm fixed, can read if share permissions (#2171) 2016-10-18 14:16:27 +05:30
Rushabh Mehta
79f51648a1 [fix] for test 2016-10-13 12:24:27 +05:30
Rushabh Mehta
73b66137af [minor] tests and fix for check type filters 2016-10-13 11:08:39 +05:30
Rushabh Mehta
bae97cfed4 Email Alert on any controller method (#2157)
* [docs] typo

* [email alert] now on any standard controller method

* [minor] install customizations with intall;

* [test] [fix] and truncate subject in email;

* [fix] error log seen issue
2016-10-08 11:11:36 +05:30
RobertSchouten
0d2e01720c fix for write share permission #1996 (#2016)
* add write perm as cascade has been removed

* remove cascade permission from docshare 

to allow read only access to share

* remove cascade permission for write permission

* check existing shares for write permission

* unset permissions on read
2016-10-08 11:06:27 +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
Nabin Hait
41c3e7bb25 Fixed version conflict 2016-10-04 17:43:50 +05:30
Rohit Waghchaure
98304ca1e2 [Fix] data import tool, file format issue 2016-10-04 17:29:52 +05:30
Rushabh Mehta
88afbcf9e4 [enhance] a better way to export customzations and Email Alert can now be standard and in app (#2134) 2016-10-02 23:32:34 +05:30
Rushabh Mehta
d0aecc0be6 [fix] print report issue 2016-09-29 17:44:50 +05:30
mbauskar
660012c55d [minor] validated field name in autoname 2016-09-28 12:46:34 +05:30
KanchanChauhan
983796fbd4 Select only mandatory childtable fields on Select Mandatory (#2092) 2016-09-26 18:16:50 +05:30
Shreyas Patil
0770b2a224 [Minor] Allow user to change files private to public and vice-versa (#2079)
* [Minor] Allow user to change files private to public and vice-versa

* [Fix] Using db_get instead of get_doc
2016-09-26 18:15:26 +05:30
Rushabh Mehta
515d952e16 [fix] signup 2016-09-24 17:50:09 +05:30
Rushabh Mehta
c285d3bb65 [fix] signup 2016-09-24 17:49:03 +05:30
Rushabh Mehta
97558a5910 [fixes] [web forms] 2016-09-24 14:09:50 +05:30
Rushabh Mehta
59af5bfbf3 [fix] for welcome email 2016-09-24 13:42:53 +05:30
Rushabh Mehta
4148cea083 [enhance] save redirect info on sign-up 2016-09-24 13:05:05 +05:30
Rushabh Mehta
051bed78da [minor] allow ignore_validate for user 2016-09-24 00:16:58 +05:30
Rushabh Mehta
a703e3f882 [minor] allow ignore_validate for user 2016-09-24 00:13:06 +05:30
Rushabh Mehta
8899a46faa [enhance] added roles for portal users #2091 (#2093)
* [enhance] added roles for portal users #2091

* [fix] test

* [fix] make default roles have desk access
2016-09-23 21:44:20 +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