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

Merge branch 'staging-fixes' into staging

Browse source
This commit is contained in:
Ameya Shenoy 2018-10-23 12:54:56 +00:00
commit d4ed8f1028
No known key found for this signature in database
GPG key ID: AC016A555657D0A3
5 changed files with 5 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
frappe/__init__.py
View file

@ -17,7 +17,7 @@ from faker import Faker
from .exceptions import *
from .utils.jinja import (get_jenv, get_template, render_template, get_email_from_template, get_jloader)
__version__ = '10.1.55'
__version__ = '10.1.56'
__title__ = "Frappe Framework"
local = Local()

2
frappe/config/docs.py
View file

@ -2,5 +2,5 @@
from __future__ import unicode_literals
source_link = "https://github.com/frappe/frappe"
source_link = "https://github.com/frappe/frappe_io"
docs_base_url = "/docs"

7
frappe/desk/page/setup_wizard/setup_wizard.py
View file

@ -54,12 +54,9 @@ def setup_complete(args):
and clears cache. If wizard breaks, calls `setup_wizard_exception` hook"""
# Setup complete: do not throw an exception, let the user continue to desk
if (frappe.cache().hget("setup_wizard", "in_setup") or
cint(frappe.db.get_single_value('System Settings', 'setup_complete'))):
if cint(frappe.db.get_single_value('System Settings', 'setup_complete')):
return
frappe.cache().hset("setup_wizard", "in_setup", True)
args = parse_args(args)
stages = get_setup_stages(args)
@ -79,8 +76,6 @@ def setup_complete(args):
else:
run_setup_success(args)
return {'status': 'ok'}
finally:
frappe.cache().hdel("setup_wizard", "in_setup")
def update_global_settings(args):
if args.language and args.language != "English":

2
frappe/hooks.py
View file

@ -12,7 +12,7 @@ source_link = "https://github.com/frappe/frappe"
app_license = "MIT"
develop_version = '11.x.x-develop'
staging_version = '11.0.3-beta.13'
staging_version = '11.0.3-beta.14'
app_email = "info@frappe.io"

2
frappe/utils/help.py
View file

@ -40,7 +40,7 @@ def get_help_content(path):
def get_improve_page_html(app_name, target):
docs_config = frappe.get_module(app_name + ".config.docs")
source_link = docs_config.source_link
branch = getattr(docs_config, "branch", "develop")
branch = getattr(docs_config, "branch", "master")
html = '''<div class="page-container">
<div class="page-content">
<div class="edit-container text-center">