From 1b638d52eeb98b75fbb6443d2f5d4a56a7152bdb Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 16 Feb 2017 17:07:08 +0100
Subject: [PATCH 1/4] remove calendar nav, add extra space to footer

---
 views/bootstrap/class.Calendar.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/views/bootstrap/class.Calendar.php b/views/bootstrap/class.Calendar.php
index 55afd75c8..fda55e0fb 100644
--- a/views/bootstrap/class.Calendar.php
+++ b/views/bootstrap/class.Calendar.php
@@ -388,9 +388,9 @@ $(document).ready(function() {
 		$this->htmlStartPage(getMLText("calendar"));
 		$this->globalNavigation();
 		$this->contentStart();
-		$this->pageNavigation("", "calendar", array());
+//		$this->pageNavigation("", "calendar", array());
 ?>
-<div class="row-fluid">
+<div class="row-fluid" style="margin-bottom: 20px;">
 	<div id="calendar" class="span8" _style="display: inline-block; float: left;"></div>
 	<div id="docinfo" class="span4" _style="display: inline-block; float: right;">
 		<div class="ajax iteminfo" data-view="Calendar" data-action="iteminfo" ></div>

From 6f0d9e5d5d2fdda28b79f43135704fb0e1286455 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 18 Feb 2017 07:55:40 +0100
Subject: [PATCH 2/4] move folders/documents propperly checks for access rights
 (Closes #309)

---
 op/op.Ajax.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/op/op.Ajax.php b/op/op.Ajax.php
index eb3bfe378..7bb728f34 100644
--- a/op/op.Ajax.php
+++ b/op/op.Ajax.php
@@ -232,7 +232,7 @@ switch($command) {
 			} else {
 				$mfolder = $dms->getFolder($_REQUEST['folderid']);
 				if($mfolder) {
-					if ($mfolder->getAccessMode($user) >= M_READ) {
+					if ($mfolder->getAccessMode($user) >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mfolder->setParent($folder)) {
@@ -271,7 +271,7 @@ switch($command) {
 			} else {
 				$mdocument = $dms->getDocument($_REQUEST['docid']);
 				if($mdocument) {
-					if ($mdocument->getAccessMode($user) >= M_READ) {
+					if ($mdocument->getAccessMode($user) >= M_READWRITE) {
 						if($folder = $dms->getFolder($_REQUEST['targetfolderid'])) {
 							if($folder->getAccessMode($user) >= M_READWRITE) {
 								if($mdocument->setFolder($folder)) {

From d2afc51aad2abd5f00f90c68903c0cb2cda28d6e Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Sat, 18 Feb 2017 07:57:17 +0100
Subject: [PATCH 3/4] add item to 4.3.33

---
 CHANGELOG | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index c52664403..56bbc5720 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -4,6 +4,8 @@
 - add support for fine-uploader as a replacement for the old jumploader
 - when importing from filesystem, the imported folder can be deleted afterwards
 - new calendar
+- move folder/document properly checks for access right if done by drag and
+  drop (Closes #309)
 
 --------------------------------------------------------------------------------
                      Changes in version 4.3.32

From 272b2c53e2e3dac7a3f8c00e10f45069425d73d9 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Mon, 20 Feb 2017 17:20:59 +0100
Subject: [PATCH 4/4] new version 5.0.10

---
 CHANGELOG | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG b/CHANGELOG
index debab71d3..213d7a1cb 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,9 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.0.10
+--------------------------------------------------------------------------------
+- merged changes from 4.3.33
+- new javascript base calendar
+
 --------------------------------------------------------------------------------
                      Changes in version 5.0.9
 --------------------------------------------------------------------------------