Nabin Hait
ec42dcd4f7
minor fix for function import
2016-12-28 12:17:32 +05:30
Saurabh
f246cc3810
[fix] reset simultaneous sessions after disabling users
2016-12-27 19:20:17 +05:30
Nabin Hait
f2bc961e1b
Fixed merge conflict
2016-12-23 17:35:38 +05:30
Saurabh
0577fcff3b
[fix] exclude one user with system manger role while pulling active users list
2016-12-21 13:31:37 +05:30
Rushabh Mehta
17d78e2bbb
[fix] email validation
2016-12-21 12:41:51 +05:30
Saurabh
b627342a9b
[fix] testcase fix for deactivating additional users after limit set
2016-12-21 12:34:28 +05:30
Saurabh
86ebaf22aa
[fix] dissable additiona users by creation date
2016-12-21 12:34:28 +05:30
Rushabh Mehta
1f8f1ef2dc
[fix] filter can_import with can_create, fixes frappe/erpnext#6966
2016-12-21 11:39:05 +05:30
Rushabh Mehta
a6d5cec95c
[minor] unicode fix for frappe/erpnext#7070 ( #2478 )
2016-12-20 16:21:50 +05:30
Rushabh Mehta
5d7eb494a0
[minor] frappe.as_unicode
2016-12-20 12:35:59 +05:30
Rushabh Mehta
db25d89d00
[fix] password strength (via error snapshot)
2016-12-20 11:38:19 +05:30
Rushabh Mehta
ac69247325
[feature] checkboxes in grid #2451
2016-12-15 14:48:43 +05:30
Rushabh Mehta
ca97204bdb
[fix] tests + add google analytics id in docs
2016-12-09 16:39:38 +05:30
Nabin Hait
958d8ea6c0
Merge branch 'master' into develop
2016-12-08 12:32:20 +05:30
robert schouten
acfb0996cf
hide disabled reports ( #2427 )
...
* hide disabled reports
* Update moduleview.py
2016-12-07 14:40:39 +05:30
KanchanChauhan
054d0f663f
Invalid language error on creation of Language ( #2390 )
2016-12-05 18:20:36 +05:30
Rushabh Mehta
c67d3bfe01
Add attachment from email and copy attachments to Communication Record ( #2412 )
...
* Carry over file attachments in email communications
* [fix] style
2016-12-05 14:59:00 +05:30
Rushabh Mehta
7bc7e3bc63
Upgrade Font Awesome ( #2410 )
...
* Font-Awesome V3.x to V4.x
Font-Awesome V3.x to V4.x
* Font Tidy
Font Tidy
* FA4 Upgrade - Html Js & Json
FA4 Upgrade - Html Js & Json
* Minor
Minor
2016-12-05 13:07:03 +05:30
Nabin Hait
4cf123bd8f
Fixed merge conflict
2016-11-28 14:25:11 +05:30
Rushabh Mehta
4bd2285159
File Based Locking at Document Level ( #2374 )
...
* [redesign] improved locking in documents and redesigned recent documents
* [minor] patch to update doctype in existing documents
2016-11-25 16:14:00 +05:30
rohitwaghchaure
e03d56adb6
[Fix] Multiple letter head printing issue on print format ( #2365 )
2016-11-25 16:10:42 +05:30
Faris Ansari
81ef23ab0b
pdf prompt for orientation ( #2358 )
2016-11-25 16:01:00 +05:30
Saurabh
6b3bf22462
[enhance] set last active time to user
2016-11-22 12:12:34 +05:30
Rushabh Mehta
7c8652fbf2
[docs] added some style and some fixes ( #2352 )
2016-11-22 10:55:32 +05:30
Rushabh Mehta
a099690e8f
Revert "[optimize] remove count(*) from queries" ( #2353 )
2016-11-22 10:55:13 +05:30
Rushabh Mehta
3c7c17215d
[fix] fix toc for docs, url for local and other fixes #2293 ( #2346 )
2016-11-21 16:43:16 +05:30
Rushabh Mehta
0ff140fa2b
[optimize] remove count(*) from queries
2016-11-21 14:58:18 +05:30
Rushabh Mehta
a256e029b6
[minor] UI fixes ( #2345 )
2016-11-21 13:29:36 +05:30
Rushabh Mehta
fac7f1e31b
[fix] [hot] hset bug
2016-11-19 17:16:49 +05:30
Rushabh Mehta
ddbf3d2662
[fix] always save site encoded keys in local and redis
2016-11-18 18:37:15 +05:30
robert schouten
5ede870700
daterangepicker now as control for filtering ( #2324 )
...
* daterangepicker now as control for filtering
* rename daterange picker options
* cleanup name reference
* allow greater control of daterangepicker options
* Update data.py
comma + space
2016-11-18 14:03:56 +05:30
Rushabh Mehta
4df583b1cf
[fix] email, deprecate frappe.email.sendmail, use frappe.sendmail
2016-11-18 11:32:18 +05:30
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
