diff --git a/frappe/__init__.py b/frappe/__init__.py index f75057b335..c76d1a2999 100644 --- a/frappe/__init__.py +++ b/frappe/__init__.py @@ -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() diff --git a/frappe/config/docs.py b/frappe/config/docs.py index 4d3178e3fd..eafaeeb19e 100644 --- a/frappe/config/docs.py +++ b/frappe/config/docs.py @@ -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" diff --git a/frappe/desk/page/setup_wizard/setup_wizard.py b/frappe/desk/page/setup_wizard/setup_wizard.py index b7014c74b1..ed6b0eacb7 100755 --- a/frappe/desk/page/setup_wizard/setup_wizard.py +++ b/frappe/desk/page/setup_wizard/setup_wizard.py @@ -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": diff --git a/frappe/hooks.py b/frappe/hooks.py index 7756882d30..13c3fd7232 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -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" diff --git a/frappe/utils/help.py b/frappe/utils/help.py index 3a5bc5b308..76fbb3c64d 100644 --- a/frappe/utils/help.py +++ b/frappe/utils/help.py @@ -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 = '''