diff --git a/frappe/__version__.py b/frappe/__version__.py index c37c2738ca..e5436f3a26 100644 --- a/frappe/__version__.py +++ b/frappe/__version__.py @@ -1,2 +1,2 @@ from __future__ import unicode_literals -__version__ = "5.0.33" +__version__ = "5.0.34" diff --git a/frappe/boot.py b/frappe/boot.py index f1877c35c1..5531d844cd 100644 --- a/frappe/boot.py +++ b/frappe/boot.py @@ -70,6 +70,7 @@ def get_bootinfo(): bootinfo.error_report_email = frappe.get_hooks("error_report_email") bootinfo.default_background_image = get_url("/assets/frappe/images/ui/into-the-dawn.jpg") + bootinfo.calendars = sorted(frappe.get_hooks("calendars")) return bootinfo diff --git a/frappe/hooks.py b/frappe/hooks.py index 4af90fef30..a3a207f39e 100644 --- a/frappe/hooks.py +++ b/frappe/hooks.py @@ -4,7 +4,7 @@ app_title = "Frappe Framework" app_publisher = "Frappe Technologies Pvt. Ltd." app_description = "Full Stack Web Application Framework in Python" app_icon = "octicon octicon-circuit-board" -app_version = "5.0.33" +app_version = "5.0.34" app_color = "orange" app_email = "support@frappe.io" @@ -59,6 +59,8 @@ website_generators = ["Web Page", "Blog Post", "Blog Category", "Web Form"] email_append_to = ["Event", "ToDo", "Communication"] +calendars = ["Event"] + # login on_session_creation = [ diff --git a/frappe/public/js/frappe/ui/page.html b/frappe/public/js/frappe/ui/page.html index f5f549fcf1..188d79290c 100644 --- a/frappe/public/js/frappe/ui/page.html +++ b/frappe/public/js/frappe/ui/page.html @@ -2,37 +2,39 @@