vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

Merge branch 'hotfix'

Browse source
This commit is contained in:
Nabin Hait 2017-12-25 19:14:33 +05:30
commit 4a336aa81f
3 changed files with 2 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -14,7 +14,7 @@ import os, sys, importlib, inspect, json
from .exceptions import *
from .utils.jinja import get_jenv, get_template, render_template, get_email_from_template
__version__ = '10.0.1'
__version__ = '10.0.2'
__title__ = "Frappe Framework"
local = Local()

6
frappe/desk/page/setup_wizard/setup_wizard.js
View file

@ -217,12 +217,6 @@ frappe.setup.SetupWizard = class SetupWizard extends frappe.ui.Slides {
this.$working_state.find('.state-icon-container').html('');
fail_msg = fail_msg ? fail_msg : __("Failed to complete setup");
if(error && !frappe.boot.developer_mode) {
frappe.msgprint(`Don't worry. It's not you, it's us. We've
received the issue details and will get back to you on the solution.
Please feel free to contact us on support@erpnext.com in the meantime.`);
}
this.update_setup_message('Could not start up: ' + fail_msg);
this.$working_state.find('.title').html('Setup failed');

2
frappe/templates/includes/login/login.js
View file

@ -18,7 +18,7 @@ login.bind_events = function() {
var args = {};
args.cmd = "login";
args.usr = frappe.utils.xss_sanitise(($("#login_email").val() || "").trim());
args.pwd = frappe.utils.xss_sanitise($("#login_password").val());
args.pwd = $("#login_password").val();
args.device = "desktop";
if(!args.usr || !args.pwd) {
frappe.msgprint("{{ _("Both login and password required") }}");