Merge branch 'master' into sabredav_1.6

apps/calendar/templates/part.eventform.php

@@ -17,6 +17,7 @@
 					?>
 				</select>
 			</td>
+			<?php if(count($_['calendar_options']) > 1) { ?>
 			<th width="75px">&nbsp;&nbsp;&nbsp;<?php echo $l->t("Calendar");?>:</th>
 			<td>
 				<select style="width:140px;" name="calendar">
@@ -26,6 +27,12 @@
 					?>
 				</select>
 			</td>
+			<?php } else { ?>
+			<th width="75px">&nbsp;</th>
+			<td>
+				<input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id'] ?>">
+			</td>
+			<?php } ?>
 		</tr>
 	</table>
 	<hr>

apps/files_sharing/css/sharing.css

@@ -6,3 +6,4 @@
 #public { border-top:1px solid #ddd; padding-top:0.5em; }
 a.unshare { float:right; display:inline; margin:0 .5em; padding:.3em .3em 0 .3em !important; opacity:.5; }
 a.unshare:hover { opacity:1; }
+#share_with { width: 16em; }

apps/files_sharing/js/share.js

@@ -174,7 +174,7 @@ $(document).ready(function() {
 function createDropdown(filename, files) {
 	var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
 	html += '<div id="private">';
-	html += '<select data-placeholder="User or Group" style="width:220px;" id="share_with" class="chzen-select">';
+	html += '<select data-placeholder="User or Group" id="share_with" class="chzen-select">';
 	html += '<option value=""></option>';
 	html += '</select>';
 	html += '<ul id="shared_list"></ul>';

db_structure.xml

@@ -31,12 +31,12 @@
 
    <field>
     <name>configvalue</name>
-    <type>text</type>
+    <type>clob</type>
-    <default></default>
     <notnull>true</notnull>
-    <length>255</length>
    </field>
 
+
+
   </declaration>
 
  </table>

lib/util.php

@@ -62,7 +62,7 @@ class OC_Util {
 	 * @return array
 	 */
 	public static function getVersion(){
-		return array(3,00,1);
+		return array(3,00,2);
 	}
 
 	/**