Commit graph

13120 commits

Author SHA1 Message Date
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
ckosiegbu
2ad495ea27 Added ability for either Administrator or user to reset the OTP secret. A user that is not Administrator can only reset their own OTP secret. Administrator can reset OTP secret of any user. 2017-07-25 02:09:25 +01:00
ckosiegbu
97c6d74789 Updates to System Settings and login.js to allow for specification of the name of the token issuer. 2017-07-23 02:16:12 +01:00
ckosiegbu
9b4f10c204 Fixed issue with SMS sending 2017-07-23 00:27:01 +01:00
ckosiegbu
b6e65030d8 Transfer of SMS Settings and SMS Parameter to Frappe from ERPNext. Triggered by the need for SMS Sending by the Two-Factor Authentication functionality contributed by Manqala 2017-07-22 23:29:00 +01:00
ckosiegbu
3329618a14 Merge branch 'develop' into twofactor 2017-07-22 19:05:18 +01:00
crossxcell99
6f4e39fd46 fix Email otp method queue email sending 2017-07-21 17:50:31 +01:00
crossxcell99
aa45ffcac6 fix website user login bug refactor JS 2017-07-21 14:32:04 +01:00
Manas Solanki
81133888a8 [fix] add the parsed email id for the email group member (#3741)
* add the parsed email id of the email group member

* Minor fixe in the patch
2017-07-21 11:05:54 +05:30
felixvarghese
f189829240 Allow SSL connections to a remote database server (#3742)
* Allow SSL connections to a remote database server

Add the following options in site_config.json to use ssl

- "db_ssl_ca" = "/path/to/ca/cert.pem"
- "db_ssl_cert" = "/path/to/ssl/cert.pem"
- "db_ssl_key" = "/path/to/ssl/key.pem"

The files mentioned should be stored on the App server in the location mentioned.

This commit allows for basic ssl connections. X509 is still not supported.

If the above options are not set, the connection will not use an encrypted connection, and connect normally.

* docs - Allow SSL to remote database host
2017-07-20 18:00:02 +05:30
Faris Ansari
5a498616b6 Email header (#3748)
* Fix fonts for emails

* Email header with indicator

* Login emails with header

* Add tests for email header

* fix codacy
2017-07-20 17:57:57 +05:30
mbauskar
0dd91f4fef Merge branch 'master' into develop 2017-07-20 16:48:55 +05:30
mbauskar
553b30593d Merge branch 'hotfix' 2017-07-20 16:48:55 +05:30
mbauskar
7f8125e273 bumped to version 8.5.7 2017-07-20 17:18:55 +06:00
Rushabh Mehta
c3598c2521 [minor] setup wizard fixes 2017-07-20 15:54:34 +05:30
Rushabh Mehta
ebbad93d26 [minor] allow tests with longer timeout 2017-07-20 15:14:27 +05:30
Rushabh Mehta
db6743cf3c [minor] allow tests with longer timeout 2017-07-20 15:14:27 +05:30
mbauskar
e4204e9dc5 Merge branch 'hotfix' 2017-07-20 14:16:01 +05:30
mbauskar
d674a69ba6 Merge branch 'master' into develop 2017-07-20 14:16:01 +05:30
mbauskar
497103de25 bumped to version 8.5.6 2017-07-20 14:46:01 +06:00
Nabin Hait
124a326ae8 Fixed ajax count after server request failed (#3746) 2017-07-20 11:39:18 +05:30
Prateeksha Singh
680809acf8 [versioning] check for empty field values (#3739)
* [versioning] check for empty field values

* [test] get_diff for changes across docs
2017-07-20 11:00:09 +05:30
Faris Ansari
aa791ead3e Slickgrid ltr in rtl mode (#3744) 2017-07-20 10:29:42 +05:30
Narciso E. Núñez Arias
923990872b [docs] Translation of the Guides And Resources section in bench to Spanish (#3747)
* Add basic files structure for spanish translation of the doc

* Translate the video tutorial index page

* Translate Before Start page

* Translate What is an app page

* Translate the Bench page

* Translate Conslusion page of the tutorial

* Translate to spanish Tutorial Index page

* Translate to spanish Reports page

* Translate to Spanish Roles Page

* Translate to Spanish the Tutorial Model Page

* Translate to Spanish the tutorial Single Doctypes page

* Translate to Spanish the tutorial Doctype files structure page

* Translate to Spanish the tutorial Start Bench page

* Translate to Spanish the tutorial New App page

* Translate to Spanish the tutorial Client Side Script page

* Translate to Spanish the tutorial Users and records page

* Translate to Spanish the tutorial Setting Up the site page

* Translate to Spanish the tutorial Task Runner page

* Translate to Spanish the tutorial Controllers Page

* Translate to Spanish the tutorial Doctypes page

* Translate to Spanish the tutorial Naming And Linking page

* Translate to Spanish the tutorial Web Views page

* Add basic file structure to translate the bench section of the tutorial

* [docs] Translate to Spanish the tutorial Adding custom domain page

* [docs] Translate to Spanish the tutorial Configuring HTTPS page

* [docs] Translate to Spanish the tutorial Diagnosing the Scheduler page

* [docs] Translate to Spanish the tutorial Settings Site Limits\ page

* [docs] Translate to Spanish the tutorial Setup Production page

* [docs] Translate to Spanish the tutorial Bench ProcFile page

* [docs] Translate to Spanish the tutorial Manual Setup page

* [docs] Translate to Spanish the tutorial Background Services page

* [docs] Translate to Spanish the tutorial Lets Encrypt Setup page

* [docs] Translate to Spanish the tutorial Setup Multitenancy page

* [docs] Translate to Spanish the tutorial Bench Commands page
2017-07-20 10:28:15 +05:30
Faris Ansari
9418d5b6ba Auto email report redesign (#3730)
* Add auto_email_report.html

* Add table styling for email

* wip

* commonify template

* Right align numeric fields

* Add text utility classes

* fix tests
2017-07-20 10:27:40 +05:30
Prateeksha Singh
7029f8b8fd [wiz][fix] set defaults on add more (#3745) 2017-07-20 10:26:04 +05:30
crossxcell99
51858021c8 refactor code fix bug 2017-07-19 14:29:30 +01:00
Rushabh Mehta
5577442251 [tests] refactor tests (#3743)
* [tests] refactored client side tests

* [tests] refactored client side tests

* [tests] refactored client side tests
2017-07-19 18:09:06 +05:30
Faris Ansari
db22aa1c87 Email styling using email.less (#3704)
* DRY font-family declarations

* Add email.less, inline styles using premailer

* min-width 100% for mobile email clients

* Emails without header have default 100% width (like before)

* Include email.css for all apps

* Keep !important declarations

* Add test case for inlining css

* Ignore important rules in css

* minor
2017-07-19 16:21:06 +05:30
Mainul Islam
4f7feddb6a [Print format] Translate section headings, hide sections with no data (#3697)
* Section label set as translatable

* Show section title if hase data in section other
2017-07-19 15:56:41 +05:30
Makarand Bauskar
3ae5baad2e [minor] added empty line after country fixture installation (#3740) 2017-07-19 15:52:39 +05:30
Rushabh Mehta
ff52a61e03 [minor] link filters should be selectable (#3736)
* [minor] link filters should be selectable

* [test] add timeout
2017-07-19 15:52:16 +05:30
Prateeksha Singh
d230021134 [notif] fix alignment (#3734) 2017-07-19 14:50:43 +05:30
Faris Ansari
5ed241d81a Multiple filter area fix (#3738) 2017-07-19 13:49:23 +05:30
rohitwaghchaure
8c8385a37b [Fix] Calender view broken if filters has not applied (#3737) 2017-07-19 12:32:55 +05:30
Narciso E. Núñez Arias
e081dff979 Translation of the Tutorial And Videos section to Spanish (#3718)
* Add basic files structure for spanish translation of the doc

* Translate the video tutorial index page

* Translate Before Start page

* Translate What is an app page

* Translate the Bench page

* Translate Conslusion page of the tutorial

* Translate to spanish Tutorial Index page

* Translate to spanish Reports page

* Translate to Spanish Roles Page

* Translate to Spanish the Tutorial Model Page

* Translate to Spanish the tutorial Single Doctypes page

* Translate to Spanish the tutorial Doctype files structure page

* Translate to Spanish the tutorial Start Bench page

* Translate to Spanish the tutorial New App page

* Translate to Spanish the tutorial Client Side Script page

* Translate to Spanish the tutorial Users and records page

* Translate to Spanish the tutorial Setting Up the site page

* Translate to Spanish the tutorial Task Runner page

* Translate to Spanish the tutorial Controllers Page

* Translate to Spanish the tutorial Doctypes page

* Translate to Spanish the tutorial Naming And Linking page

* Translate to Spanish the tutorial Web Views page
2017-07-19 10:29:16 +05:30
Rushabh Mehta
d4ba711178 Fixing tests (#3735)
* [check] test_calendar_view.js

* [check] test_calendar_view.js

* [tests] run all together

* [tests] run all together

* [tests] that work
2017-07-19 10:21:55 +05:30
crossxcell99
b348027a17 Merge branch 'twofactor' of https://github.com/manqala/frappe into twofactor 2017-07-18 19:04:49 +01:00
crossxcell99
99700fb198 check if more than one role has 2fa enabled 2017-07-18 19:03:45 +01:00
Rushabh Mehta
2bd3d1e2ce [minor] no controller_list.js in doctype boilerplate 2017-07-18 22:44:59 +05:30
Rushabh Mehta
124c069819 [fix] formatters 2017-07-18 22:09:33 +05:30
B H Boma
cde8001369 Show twofactor auth in setup wizard 2017-07-18 17:30:11 +01:00
Saurabh
c4aa821b51 Merge branch 'hotfix' 2017-07-18 21:45:59 +05:30
Saurabh
d662f92851 Merge branch 'master' into develop 2017-07-18 21:45:59 +05:30
Saurabh
e50ade324f bumped to version 8.5.5 2017-07-18 22:15:58 +06:00
Saurabh
a21ca34db7 Merge pull request #3732 from saurabh6790/formater_fix
[hot][fix] check if option exists
2017-07-18 21:44:58 +05:30
Saurabh
bed7460616 [hot][fix] check if option exists 2017-07-18 21:39:56 +05:30
crossxcell99
f34d52fb65 Minor fix for checking successful otp login 2017-07-18 17:05:24 +01:00