diff options
| author | Georg Ehrke <dev@georgswebsite.de> | 2012-02-24 18:51:38 +0100 |
|---|---|---|
| committer | Georg Ehrke <dev@georgswebsite.de> | 2012-02-24 18:51:38 +0100 |
| commit | e082d473bb856bdaf48290199bf5d2f1fb4a435d (patch) | |
| tree | c7da3321716dc0ec38682f1881ae8d2bbae84308 | |
| parent | eae32e05c9feb742b51bd70c7f3fa2270191f719 (diff) | |
| parent | ca874a3ad776c9fd22c7bcbad81f493cfc551661 (diff) | |
| download | nextcloud-server-e082d473bb856bdaf48290199bf5d2f1fb4a435d.tar.gz nextcloud-server-e082d473bb856bdaf48290199bf5d2f1fb4a435d.zip | |
Merge branch 'master' into sabredav_1.6
| -rw-r--r-- | apps/calendar/templates/part.eventform.php | 7 | ||||
| -rw-r--r-- | apps/files_sharing/css/sharing.css | 3 | ||||
| -rw-r--r-- | apps/files_sharing/js/share.js | 2 | ||||
| -rw-r--r-- | db_structure.xml | 12 | ||||
| -rw-r--r-- | lib/util.php | 2 |
5 files changed, 17 insertions, 9 deletions
diff --git a/apps/calendar/templates/part.eventform.php b/apps/calendar/templates/part.eventform.php index 49214aca77c..8a8f420f846 100644 --- a/apps/calendar/templates/part.eventform.php +++ b/apps/calendar/templates/part.eventform.php @@ -17,6 +17,7 @@ ?> </select> </td> + <?php if(count($_['calendar_options']) > 1) { ?> <th width="75px"> <?php echo $l->t("Calendar");?>:</th> <td> <select style="width:140px;" name="calendar"> @@ -26,6 +27,12 @@ ?> </select> </td> + <?php } else { ?> + <th width="75px"> </th> + <td> + <input type="hidden" name="calendar" value="<?php echo $_['calendar_options'][0]['id'] ?>"> + </td> + <?php } ?> </tr> </table> <hr> diff --git a/apps/files_sharing/css/sharing.css b/apps/files_sharing/css/sharing.css index 0759af2c274..db59a3d340b 100644 --- a/apps/files_sharing/css/sharing.css +++ b/apps/files_sharing/css/sharing.css @@ -5,4 +5,5 @@ #shared_list { padding:0.5em; list-style-type: none; } #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; }
\ No newline at end of file +a.unshare:hover { opacity:1; } +#share_with { width: 16em; }
\ No newline at end of file diff --git a/apps/files_sharing/js/share.js b/apps/files_sharing/js/share.js index d01a07447a6..fc9e17c25c7 100644 --- a/apps/files_sharing/js/share.js +++ b/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>'; diff --git a/db_structure.xml b/db_structure.xml index 8e59a59c6e5..1d459b75fda 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -31,12 +31,12 @@ <field> <name>configvalue</name> - <type>text</type> - <default></default> + <type>clob</type> <notnull>true</notnull> - <length>255</length> </field> + + </declaration> </table> @@ -55,7 +55,7 @@ <notnull>true</notnull> <length>4</length> </field> - + <field> <name>path</name> <type>text</type> @@ -90,7 +90,7 @@ <notnull>true</notnull> <length>64</length> </field> - + <field> <name>size</name> <type>integer</type> @@ -522,7 +522,7 @@ </declaration> </table> - + <table> <name>*dbprefix*properties</name> diff --git a/lib/util.php b/lib/util.php index 1b1e29b6749..05caeca0e3e 100644 --- a/lib/util.php +++ b/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); } /** |