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

Merge branch 'develop'

Browse source
This commit is contained in:
Nabin Hait 2017-05-10 14:03:12 +05:30
commit 4caef97eeb
3 changed files with 6 additions and 7001 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

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

7002
frappe/public/js/lib/socket.io.min.js vendored
View file

File diff suppressed because one or more lines are too long

3
frappe/utils/data.py
View file

@ -613,6 +613,9 @@ def get_url(uri=None, full_address=False):
if not uri and full_address:
uri = frappe.get_request_header("REQUEST_URI", "")
if frappe.conf.http_port:
host_name = host_name + ':' + str(frappe.conf.http_port)
url = urllib.basejoin(host_name, uri) if uri else host_name
return url