Browse Source

Merge branch 'master' into develop

version-14
Nabin Hait 7 years ago
parent
commit
2150d85f73
2 changed files with 2 additions and 2 deletions
  1. +1
    -1
      frappe/__init__.py
  2. +1
    -1
      frappe/templates/includes/login/login.js

+ 1
- 1
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()


+ 1
- 1
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") }}");


Loading…
Cancel
Save