diff options
| -rw-r--r-- | apps/comments/css/comments.css | 4 | ||||
| -rw-r--r-- | apps/comments/js/filesplugin.js | 4 | ||||
| -rwxr-xr-x | apps/files_external/tests/env/stop-swift-ceph.sh | 2 | ||||
| -rw-r--r-- | core/css/apps.css | 2 | ||||
| -rw-r--r-- | core/css/inputs.css | 4 | ||||
| -rw-r--r-- | core/css/mobile.css | 4 | ||||
| -rw-r--r-- | db_structure.xml | 57 | ||||
| -rw-r--r-- | lib/public/comments/commentsevent.php | 2 | ||||
| -rw-r--r-- | version.php | 2 |
9 files changed, 59 insertions, 22 deletions
diff --git a/apps/comments/css/comments.css b/apps/comments/css/comments.css index 57a731184a0..a9b72252e88 100644 --- a/apps/comments/css/comments.css +++ b/apps/comments/css/comments.css @@ -128,6 +128,6 @@ box-shadow: 0 0 6px #f8b9b7; } -.app-files .action-comment>img { - margin-right: 5px; +.app-files .action-comment { + padding: 16px 14px; } diff --git a/apps/comments/js/filesplugin.js b/apps/comments/js/filesplugin.js index 084cfb41034..ec201d1d3f7 100644 --- a/apps/comments/js/filesplugin.js +++ b/apps/comments/js/filesplugin.js @@ -14,9 +14,8 @@ var TEMPLATE_COMMENTS_UNREAD = '<a class="action action-comment permanent" title="{{countMessage}}" href="#">' + '<img class="svg" src="{{iconUrl}}"/>' + - '{{count}}' + '</a>'; - + OCA.Comments = _.extend({}, OCA.Comments); if (!OCA.Comments) { /** @@ -122,4 +121,3 @@ })(); OC.Plugins.register('OCA.Files.FileList', OCA.Comments.FilesPlugin); - diff --git a/apps/files_external/tests/env/stop-swift-ceph.sh b/apps/files_external/tests/env/stop-swift-ceph.sh index edac1389a78..b1cbe94b482 100755 --- a/apps/files_external/tests/env/stop-swift-ceph.sh +++ b/apps/files_external/tests/env/stop-swift-ceph.sh @@ -25,6 +25,8 @@ fi; # stopping and removing docker containers for container in `cat $thisFolder/dockerContainerCeph.$EXECUTOR_NUMBER.swift`; do + docker logs $container + echo "Stopping and removing docker container $container" # kills running container and removes it docker rm -f $container diff --git a/core/css/apps.css b/core/css/apps.css index c4e2d11b6fc..de40c40dfc5 100644 --- a/core/css/apps.css +++ b/core/css/apps.css @@ -445,7 +445,7 @@ left: auto; bottom: 0; width: 27%; - min-width: 250px; + min-width: 300px; display: block; background: #fff; border-left: 1px solid #eee; diff --git a/core/css/inputs.css b/core/css/inputs.css index fe03af85f61..c61f14e4120 100644 --- a/core/css/inputs.css +++ b/core/css/inputs.css @@ -10,6 +10,7 @@ input[type="password"], input[type="search"], input[type="number"], input[type="email"], +input[type="tel"], input[type="url"], input[type="time"], input[type="date"], @@ -39,6 +40,7 @@ input[type="password"], input[type="search"], input[type="number"], input[type="email"], +input[type="tel"], input[type="url"], input[type="time"], textarea { @@ -52,6 +54,7 @@ input[type="password"], input[type="search"], input[type="number"], input[type="email"], +input[type="tel"], input[type="url"], input[type="time"] { -webkit-appearance:textfield; -moz-appearance:textfield; @@ -62,6 +65,7 @@ input[type="password"]:hover, input[type="password"]:focus, input[type="password input[type="number"]:hover, input[type="number"]:focus, input[type="number"]:active, input[type="search"]:hover, input[type="search"]:focus, input[type="search"]:active, input[type="email"]:hover, input[type="email"]:focus, input[type="email"]:active, +input[type="tel"]:hover, input[type="tel"]:focus, input[type="tel"]:active, input[type="url"]:hover, input[type="url"]:focus, input[type="url"]:active, input[type="time"]:hover, input[type="time"]:focus, input[type="time"]:active, textarea:hover, textarea:focus, textarea:active { diff --git a/core/css/mobile.css b/core/css/mobile.css index 131907eb09d..5bf0b1e58a7 100644 --- a/core/css/mobile.css +++ b/core/css/mobile.css @@ -73,10 +73,6 @@ z-index: 1000; } -#app-sidebar{ - width: 100% !important; -} - /* allow horizontal scrollbar in settings otherwise user management is not usable on mobile */ #body-settings #app-content { diff --git a/db_structure.xml b/db_structure.xml index b1242171127..99541a4f901 100644 --- a/db_structure.xml +++ b/db_structure.xml @@ -1541,8 +1541,7 @@ <notnull>true</notnull> <length>64</length> </field> -<!-- - TODO: finalize indexes when all queries are done + <index> <name>comments_parent_id_index</name> <unique>false</unique> @@ -1553,15 +1552,11 @@ </index> <index> - <name>comments_actor_index</name> + <name>comments_topmost_parent_id_idx</name> <unique>false</unique> <field> - <name>actor_type</name> - <sorting>ascending</sorting> - </field> - <field> - <name>actor_id</name> - <sorting>ascending</sorting> + <name>topmost_parent_id</name> + <sorting>descending</sorting> </field> </index> @@ -1581,7 +1576,19 @@ <sorting>descending</sorting> </field> </index> ---> + + <index> + <name>comments_actor_index</name> + <unique>false</unique> + <field> + <name>actor_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>actor_id</name> + <sorting>ascending</sorting> + </field> + </index> </declaration> @@ -1626,6 +1633,36 @@ <length>64</length> </field> + <index> + <name>comments_marker_object_index</name> + <unique>false</unique> + <field> + <name>object_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>object_id</name> + <sorting>ascending</sorting> + </field> + </index> + + <index> + <name>comments_marker_index</name> + <unique>true</unique> + <field> + <name>user_id</name> + <sorting>descending</sorting> + </field> + <field> + <name>object_type</name> + <sorting>ascending</sorting> + </field> + <field> + <name>object_id</name> + <sorting>ascending</sorting> + </field> + </index> + </declaration> </table> diff --git a/lib/public/comments/commentsevent.php b/lib/public/comments/commentsevent.php index 13110154479..3101c4e6c50 100644 --- a/lib/public/comments/commentsevent.php +++ b/lib/public/comments/commentsevent.php @@ -45,7 +45,7 @@ class CommentsEvent extends Event { * * @param string $event * @param IComment $comment - * @since 9.0.IComment + * @since 9.0.0 */ public function __construct($event, IComment $comment) { $this->event = $event; diff --git a/version.php b/version.php index 4ae94717c3d..d7b80142144 100644 --- a/version.php +++ b/version.php @@ -25,7 +25,7 @@ // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel // when updating major/minor version number. -$OC_Version = array(9, 0, 0, 13); +$OC_Version = array(9, 0, 0, 15); // The human readable string $OC_VersionString = '9.0.0 beta 2'; |