Nabin Hait
010a32d95a
[fix] Header for sms send request ( #4417 )
2017-11-03 16:20:53 +05:30
Nabin Hait
8db6c97f8a
Merge branch 'master' into staging
2017-10-23 13:02:09 +05:30
Nabin Hait
c4adaa653a
[fix] Two factor authentication via SMS ( #4359 )
2017-10-23 13:01:30 +05:30
Aditya Hase
d5d9fd5283
More Python 3 compatibility Frappe test fixes ( #4321 )
...
* stream object should be BytesIO instead of StringIO
* Convert filter to list explicitly before checking length
* Decode sent_email and content before string operations
2017-10-17 17:45:49 +05:30
Rushabh Mehta
33caea5e21
Merge pull request #4023 from schilgod/develop
...
Bypass 2FA if user login from restricted IP Address
2017-09-14 11:23:16 +05:30
Nabin Hait
7266e673ac
Merge branch 'master' into develop
2017-09-12 16:09:19 +05:30
mbauskar
90ebd643a7
[hotfix] minor fixes for text editor, report print and 2fa
2017-09-10 11:21:17 +05:30
Sunny
df343aec64
merge with upstream/frappe
2017-09-07 16:04:55 +08:00
Sunny
fe8bae82e8
merge with upstream/frappe
2017-09-07 15:58:56 +08:00
Sunny
d902975080
Bypass 2FA if user login from restricted IP Address
2017-09-07 15:17:35 +08:00
mbauskar
226522746a
resolved merge conflicts
2017-09-05 08:41:25 +05:30
Rushabh Mehta
4fcd96a26b
Merge pull request #4050 from adityahase/tests3
...
Python 3 comapatibility Fixes
2017-09-04 20:39:17 +05:30
mbauskar
a8a5347d09
[minor] fixes for https://github.com/frappe/frappe/issues/4035
2017-09-04 17:12:32 +05:30
Aditya Hase
90d7819da9
Use six.iteritems(dict) instead of dict.iteritems()
2017-09-04 16:05:57 +05:30
Mohammed Eldadah
db7ead1435
Update twofactor.py
...
check twofactors in system settings
2017-09-03 19:40:27 +03:00
Rushabh Mehta
a5096464a7
Merge pull request #3914 from adityahase/fix-stringio-2fa
...
Import six.StringIO instead of StringIO.StringIO
2017-08-11 13:02:07 +05:30
Aditya Hase
29dfc26a76
Import six.StringIO instead of StringIO.StringIO
2017-08-11 00:40:31 +05:30
Aditya Hase
769338f136
Replaced all instances of basestring with six.string_types
2017-08-11 00:10:11 +05:30
Rushabh Mehta
92403aabba
[fix] disable twofactor
2017-08-09 16:27:56 +05:30
Rushabh Mehta
e5138af195
[add] disable 2fa
2017-08-08 14:32:32 +05:30
Rushabh Mehta
bc4d46a362
[fix] style and move setup to system settings
2017-08-08 14:29:22 +05:30
B H Boma
64048e14ac
Enable 2fa in sites config instead of system settings, also enabled for admin
2017-08-04 15:59:29 +01:00
B H Boma
8f68d252f0
[fix]Email being sent after each failed login
2017-08-01 18:26:17 +01:00
B H Boma
746c2d6ac8
Tests for twofactor
2017-08-01 14:24:42 +01:00
ckosiegbu
08743b8100
Changes to OTP settings in System Settings
2017-07-31 02:06:23 +01:00
ckosiegbu
6b06f9e943
Various fixes. Barcode email now sent only once instead of on each login.
2017-07-31 00:02:53 +01:00
B H Boma
94cc69dfa5
[WIP]Add QRCode email feature
2017-07-28 17:48:36 +01:00
B H Boma
636792489c
[fix]Prevent future of qrcode if user login
2017-07-27 18:02:26 +01:00
B H Boma
dcee43f646
Settings to send Qrcode as email to user
2017-07-27 17:59:43 +01:00
B H Boma
68251a6112
[WIP][Refactor] Redo twofactor code
2017-07-27 01:12:22 +01:00
B H Boma
a8b526bfd1
[WIP][Refactor] Redo twofactor code
2017-07-26 17:34:36 +01:00
