Nabin Hait
a350d473a6
Merge branch 'master' into develop
2016-11-10 15:25:04 +05:30
Nabin Hait
e60d438a28
bumped to version 7.1.9
2016-11-10 15:55:03 +06:00
rohitwaghchaure
d8204d0891
[Fix] Disabled print settings for the custom print format ( #2291 )
2016-11-10 14:55:24 +05:30
Saurabh
36f3ae1562
[fix] check if user exists while setting last active date
2016-11-10 14:40:12 +05:30
Saurabh
68c7b14674
[enhance] set last active time to user
2016-11-10 14:40:12 +05:30
KanchanChauhan
e8a575c71e
[Minor] Updated Standard Reply example ( #2283 )
2016-11-10 12:57:39 +05:30
Rushabh Mehta
9610e32d08
[minor] do not throw an exception if user tries to complete setup again
2016-11-10 12:56:17 +05:30
Saurabh
9ff094d8de
[fix] paypal sandboxing to test dummy payments ( #2281 )
...
* [fix] paypal sandboxing to test dummy payments
* [fix] sandbox testing for razorpay
2016-11-10 09:58:56 +05:30
Nabin Hait
ff9819ed8f
Merge branch 'hotfix'
2016-11-09 14:50:05 +05:30
Nabin Hait
541891d5e1
Merge branch 'master' into develop
2016-11-09 14:50:05 +05:30
Nabin Hait
e4caa4e944
bumped to version 7.1.8
2016-11-09 15:20:05 +06:00
Nabin Hait
f2eebc30cf
Merge pull request #2273 from rmehta/limit-emails-if-set
...
[fix] limit monthly emails only if set
2016-11-09 11:32:10 +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
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
Nabin Hait
375b7b911f
Merge pull request #2278 from frappe/add-right-align-6730
...
Add right alignment tool in editor
2016-11-09 11:28:38 +05:30
Nabin Hait
a8c9ea96b6
Merge pull request #2279 from pratu16x7/alignment_fix
...
Add right alignment tool in editor
2016-11-09 11:28:20 +05:30
Nabin Hait
aef19a8ec3
Merge pull request #2280 from rmehta/cache-fix
...
[fix] changing timezone does not reflect in system settings
2016-11-09 11:28:03 +05:30
Rushabh Mehta
89885fe6a9
[fix] changing timezone does not reflect in system settings
2016-11-08 18:15:17 +05:30
Nabin Hait
b1ba2f5ccf
Merge branch 'hotfix'
2016-11-08 15:20:34 +05:30
Nabin Hait
178be8893c
Merge branch 'master' into develop
2016-11-08 15:20:34 +05:30
Nabin Hait
f17bae772c
bumped to version 7.1.7
2016-11-08 15:50:34 +06:00
pratu16x7
60a11bcd15
Add right alignment tool in editor
2016-11-08 15:16:17 +05:30
pratu16x7
1c0f9a1a3e
Add right alignment tool in editor
2016-11-08 14:52:19 +05:30
Rushabh Mehta
638816acd0
[docs] for frappe client #2209
2016-11-08 12:24:20 +05:30
Rushabh Mehta
80354e1567
[fix] label for document type, fixes #2165
2016-11-08 11:48:22 +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
Rushabh Mehta
d8b9722b21
[fix] limit monthly emails only if set
2016-11-07 22:14:21 +05:30
Rushabh Mehta
9486968891
[fix] z-index for datepicker ( #2271 )
2016-11-07 17:18:58 +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
Nagarajan
e5976c0a57
Update index.md ( #2264 )
2016-11-07 16:59:00 +05:30
pratu16x7
13661acbe5
Merge pull request #2265 from frappe/#6718-website-footer-reorg
...
Reorganise footer links
2016-11-05 15:55:12 +05:30
pratu16x7
edf4fcb522
Reorganise footer links
2016-11-05 15:48:50 +05:30
Rushabh Mehta
b2633ef36e
[minor] fix test
2016-11-04 18:52:16 +05:30
Rushabh Mehta
de1d4b2056
[minor] rebuilt desk.css
2016-11-04 18:42:44 +05:30
Rushabh Mehta
716c045d92
[fix] web form for guest
2016-11-04 18:41:59 +05:30
Nabin Hait
abe75f062b
Merge pull request #2263 from KanchanChauhan/attachment-fix
...
[Minor Fix] Error in selecting or creating file fixed
2016-11-04 18:07:29 +05:30
Kanchan Chauhan
79578f4889
[Fix] Customer Addresses and Contacts report fixed for CRM module
2016-11-04 17:30:24 +05:30
Nabin Hait
bf61e77be4
Merge branch 'hotfix'
2016-11-04 16:52:13 +05:30
Nabin Hait
fb377313ab
Merge branch 'master' into develop
2016-11-04 16:52:13 +05:30
Nabin Hait
1e0f191408
bumped to version 7.1.6
2016-11-04 17:22:13 +06:00
Nabin Hait
3839edd0d1
Merge pull request #2261 from strixaluco/develop
...
[typo] uncatagorised → uncategorised
2016-11-04 15:49:15 +05:30
strixaluco
de68489a62
[typo] uncatagorised → uncategorised
2016-11-04 17:45:26 +08:00
Rushabh Mehta
98a7d8e2d0
[feature] Add totals row in report ( #2249 )
...
* Fixes issues with old branch
* [fixes] remember totals row option and calculate in the browser if possible
2016-11-04 13:33:08 +05:30
Nabin Hait
7cfe6c5ff6
[fix] Don't remove last columns if empty ( #2256 )
2016-11-04 13:32:58 +05:30
Saurabh
66052b4747
[fix] pass kargs doctype in has_website_permission ( #2251 )
2016-11-04 13:32:37 +05:30
Nabin Hait
e8a4077de6
Merge pull request #2254 from shreyasp/def-backup-limit
...
[Fix] Set default backup limit for sites which are not set
2016-11-03 17:00:49 +05:30
shreyas
7340aceddb
[Fix] Set default backup limit for sites which are not set
2016-11-03 16:44:19 +05:30
Nabin Hait
4a5fa154ac
Fixed merge conflict
2016-11-03 15:16:33 +05:30
