Fixed version conflict

frappe/public/css/sidebar.css

@@ -305,3 +305,6 @@ a.close:focus {
 .layout-side-section .module-sidebar-nav {
   margin-top: 15px;
 }
+.assignment-row {
+  margin-bottom: 5px;
+}

frappe/public/js/frappe/views/treeview.js

@@ -112,50 +112,54 @@ frappe.views.TreeView = Class.extend({
 	},
 	get_toolbar: function(){
 		var me = this;
-		if(this.opts.toolbar) {
-			return this.opts.toolbar;
-		} else {
-			return [
-				{toggle_btn: true},
-				{
-					label:__("Edit"),
-					condition: function(node) {
-						return !node.root && me.can_read;
-					},
-					click: function(node) {
-						frappe.set_route("Form", me.doctype, node.label);
-					}
+		
+		var toolbar = [
+			{toggle_btn: true},
+			{
+				label:__("Edit"),
+				condition: function(node) {
+					return !node.root && me.can_read;
+				},
+				click: function(node) {
+					frappe.set_route("Form", me.doctype, node.label);
+				}
+			},
+			{
+				label:__("Add Child"),
+				condition: function(node) { return me.can_create && node.expandable; },
+				click: function(node) {
+					me.new_node();
 				},
-				{
-					label:__("Add Child"),
-					condition: function(node) { return me.can_create && node.expandable; },
-					click: function(node) {
-						me.new_node();
-					},
-					btnClass: "hidden-xs"
+				btnClass: "hidden-xs"
+			},
+			{
+				label:__("Rename"),
+				condition: function(node) { return !node.root && me.can_write; },
+				click: function(node) {
+					frappe.model.rename_doc(me.doctype, node.label, function(new_name) {
+						node.$a.html(new_name);
+					});
 				},
-				{
-					label:__("Rename"),
-					condition: function(node) { return !node.root && me.can_write; },
-					click: function(node) {
-						frappe.model.rename_doc(me.doctype, node.label, function(new_name) {
-							node.$a.html(new_name);
-						});
-					},
-					btnClass: "hidden-xs"
+				btnClass: "hidden-xs"
+			},
+			{
+				label:__("Delete"),
+				condition: function(node) { return !node.root && me.can_delete; },
+				click: function(node) {
+					frappe.model.delete_doc(me.doctype, node.label, function() {
+						node.parent.remove();
+					});
 				},
-				{
-					label:__("Delete"),
-					condition: function(node) { return !node.root && me.can_delete; },
-					click: function(node) {
-						frappe.model.delete_doc(me.doctype, node.label, function() {
-							node.parent.remove();
-						});
-					},
-					btnClass: "hidden-xs"
-				}
-
-			]
+				btnClass: "hidden-xs"
+			}
+		]
+		
+		if(this.opts.toolbar && this.opts.extend_toolbar) {
+			return toolbar.concat(this.opts.toolbar)
+		} else if (this.opts.toolbar && !this.opts.extend_toolbar) {
+			return this.opts.toolbar
+		} else {
+			return toolbar
 		}
 	},
 	new_node: function() {

frappe/public/less/sidebar.less

@@ -7,14 +7,14 @@ html {
 
 body {
 	height: 100%;
-	 // The html and body elements cannot have any padding or margin. 
+	 // The html and body elements cannot have any padding or margin.
 	margin: 0px;
 	padding: 0px !important;
 }
 
 html,
 body {
-	overflow-x: hidden;  //Prevent scroll on narrow devices 
+	overflow-x: hidden;  //Prevent scroll on narrow devices
 }
 
 .hide-form-sidebar {
@@ -393,3 +393,7 @@ a.close {
 .layout-side-section .module-sidebar-nav {
 	margin-top: 15px;
 }
+
+.assignment-row {
+	margin-bottom: 5px;
+}

frappe/utils/scheduler.py

@@ -31,7 +31,7 @@ def start_scheduler():
 	'''Run enqueue_events_for_all_sites every 2 minutes (default).
 	Specify scheduler_interval in seconds in common_site_config.json'''
 
-	interval = frappe.get_conf().scheduler_interval or 120
+	interval = frappe.get_conf().scheduler_interval or 240
 	schedule.every(interval).seconds.do(enqueue_events_for_all_sites)
 
 	while True: