]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 23 Sep 2014 06:05:45 +0000 (02:05 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11227 from owncloud/fix-windows-path
Thomas Müller [Tue, 23 Sep 2014 05:38:23 +0000 (07:38 +0200)]
Merge pull request #11227 from owncloud/fix-windows-path

fixing directory seperators

10 years agoMerge pull request #11221 from owncloud/fix-autotest
Thomas Müller [Tue, 23 Sep 2014 05:04:26 +0000 (07:04 +0200)]
Merge pull request #11221 from owncloud/fix-autotest

Fix autotest.sh for whitespace in paths

10 years agoMerge pull request #11215 from owncloud/dav-throwwhendeletefailed
Morris Jobke [Mon, 22 Sep 2014 22:49:30 +0000 (00:49 +0200)]
Merge pull request #11215 from owncloud/dav-throwwhendeletefailed

WebDAV now throws 403 when deletion did not work

10 years agoMerge pull request #11211 from owncloud/previewProviderSwitch
Morris Jobke [Mon, 22 Sep 2014 22:45:59 +0000 (00:45 +0200)]
Merge pull request #11211 from owncloud/previewProviderSwitch

Add a configuration switch for enabled preview mimetypes

10 years agoignoring writedata test in windows.
Clark Tomlinson [Mon, 22 Sep 2014 18:13:30 +0000 (14:13 -0400)]
ignoring writedata test in windows.

10 years agofixing cache routes
Clark Tomlinson [Mon, 22 Sep 2014 17:38:46 +0000 (13:38 -0400)]
fixing cache routes

10 years agoMerge pull request #11228 from owncloud/drop-travis
Morris Jobke [Mon, 22 Sep 2014 15:27:54 +0000 (17:27 +0200)]
Merge pull request #11228 from owncloud/drop-travis

Revert "Travis support"

10 years agoRemove unneeded unit tests
Lukas Reschke [Mon, 22 Sep 2014 14:49:52 +0000 (16:49 +0200)]
Remove unneeded unit tests

10 years agoMerge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition
Vincent Petry [Mon, 22 Sep 2014 14:36:23 +0000 (16:36 +0200)]
Merge pull request #11186 from owncloud/trash-fixdoubledeleteracecondition

Added extra check to avoid deleting key folders

10 years agoRevert "Travis support"
Morris Jobke [Mon, 22 Sep 2014 14:34:50 +0000 (16:34 +0200)]
Revert "Travis support"

This reverts commit 472d896ce9aad4d526126a7aefa96127920585e6.

Conflicts:
.travis.yml

10 years agoMerge pull request #11167 from owncloud/env-movetomountreenableproxy
Morris Jobke [Mon, 22 Sep 2014 14:30:19 +0000 (16:30 +0200)]
Merge pull request #11167 from owncloud/env-movetomountreenableproxy

Reenable file proxy when renaming between mount points

10 years agoMerge pull request #11204 from owncloud/fix_oc_stream_seek
Morris Jobke [Mon, 22 Sep 2014 14:25:07 +0000 (16:25 +0200)]
Merge pull request #11204 from owncloud/fix_oc_stream_seek

Fix oc stream seek

10 years agoMerge pull request #11212 from owncloud/occ-catching-errors
Morris Jobke [Mon, 22 Sep 2014 14:23:27 +0000 (16:23 +0200)]
Merge pull request #11212 from owncloud/occ-catching-errors

Occ catching errors

10 years agofixing directory seperators
Clark Tomlinson [Mon, 22 Sep 2014 14:13:46 +0000 (10:13 -0400)]
fixing directory seperators

10 years agoAdd a configuration switch for enabled preview mimetypes
Lukas Reschke [Fri, 19 Sep 2014 11:35:21 +0000 (13:35 +0200)]
Add a configuration switch for enabled preview mimetypes

10 years agoMerge pull request #11210 from owncloud/issue/11209
Morris Jobke [Mon, 22 Sep 2014 12:04:20 +0000 (14:04 +0200)]
Merge pull request #11210 from owncloud/issue/11209

Also match routes without trailing slash for files app

10 years agoWebDAV now throws 403 when deletion did not work
Vincent Petry [Mon, 22 Sep 2014 10:19:34 +0000 (12:19 +0200)]
WebDAV now throws 403 when deletion did not work

Assume a permission issue whenever a file could not be deleted.

This is because some storages are not able to return permissions, so a
permission denied situation can only be triggered during direct
deletion.

10 years agoupdate 3rdparty submodule to its master commit
Morris Jobke [Mon, 22 Sep 2014 11:03:43 +0000 (13:03 +0200)]
update 3rdparty submodule to its master commit

10 years agoFix autotest.sh for whitespace in paths
Robin McCorkell [Mon, 22 Sep 2014 11:03:25 +0000 (12:03 +0100)]
Fix autotest.sh for whitespace in paths

10 years agoMerge pull request #9225 from voxsim/fix_displayNamesInGroup
blizzz [Mon, 22 Sep 2014 10:13:15 +0000 (12:13 +0200)]
Merge pull request #9225 from voxsim/fix_displayNamesInGroup

fix in displayNamesInGroup

10 years agono loner use deprecated class \OC_Config
Thomas Müller [Mon, 22 Sep 2014 10:04:48 +0000 (12:04 +0200)]
no loner use deprecated class \OC_Config

10 years agoremove bootstrapping - occ can by definition only be executed if ownCloud is installe...
Thomas Müller [Mon, 22 Sep 2014 10:00:22 +0000 (12:00 +0200)]
remove bootstrapping - occ can by definition only be executed if ownCloud is installed - base.php is required earlier already

10 years agoshow upgrade errors as error in the console and report back that the upgrade process...
Thomas Müller [Mon, 22 Sep 2014 09:59:13 +0000 (11:59 +0200)]
show upgrade errors as error in the console and report back that the upgrade process failed if it did

10 years agoin quota wrapper use === instead of ! for better readability and as in other wrappers
Jörn Friedrich Dreyer [Mon, 22 Sep 2014 09:35:42 +0000 (11:35 +0200)]
in quota wrapper use === instead of ! for better readability and as in other wrappers

10 years agoreturn boolean in Ciose::stream_seek
Jörn Friedrich Dreyer [Mon, 22 Sep 2014 09:33:55 +0000 (11:33 +0200)]
return boolean in Ciose::stream_seek

10 years agoAlso match routes without trailing slash
Joas Schilling [Mon, 22 Sep 2014 08:59:12 +0000 (10:59 +0200)]
Also match routes without trailing slash

Fix #11209

10 years agoreturn boolean in OC::stream_seek
Jörn Friedrich Dreyer [Sun, 21 Sep 2014 20:48:35 +0000 (22:48 +0200)]
return boolean in OC::stream_seek

10 years agoMerge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard
Thomas Müller [Mon, 22 Sep 2014 08:04:02 +0000 (10:04 +0200)]
Merge pull request #10939 from owncloud/add-port-to-trusted-domain-wizard

Append port to trusted domain in case it's not 80 or 443

10 years agoMerge pull request #10499 from owncloud/mkcol-headers-afterbind
Thomas Müller [Mon, 22 Sep 2014 08:02:03 +0000 (10:02 +0200)]
Merge pull request #10499 from owncloud/mkcol-headers-afterbind

Use afterBind to send fileId header for files and directories

10 years agofix button text l10n
Volkan Gezer [Sun, 21 Sep 2014 15:32:37 +0000 (17:32 +0200)]
fix button text l10n

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 22 Sep 2014 05:54:36 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11203 from owncloud/fix_broken_previews_on_public_page
Morris Jobke [Sun, 21 Sep 2014 21:07:17 +0000 (23:07 +0200)]
Merge pull request #11203 from owncloud/fix_broken_previews_on_public_page

files_sharing: add route for ajax/publicpreview

10 years agoMerge pull request #11199 from owncloud/delete_bogus_previews
Morris Jobke [Sun, 21 Sep 2014 20:48:21 +0000 (22:48 +0200)]
Merge pull request #11199 from owncloud/delete_bogus_previews

Delete bogus cached previews while updating

10 years agoadd seek and tell to streamwrapper test
Jörn Friedrich Dreyer [Sun, 21 Sep 2014 20:47:40 +0000 (22:47 +0200)]
add seek and tell to streamwrapper test

10 years agoMerge pull request #11200 from owncloud/preview_better_errorhandling
Morris Jobke [Sun, 21 Sep 2014 20:44:07 +0000 (22:44 +0200)]
Merge pull request #11200 from owncloud/preview_better_errorhandling

make sure preview prop is instanceof OC_Image before using it in showPreview

10 years agofiles_sharing: add route for ajax/publicpreview
Georg Ehrke [Sun, 21 Sep 2014 16:21:42 +0000 (18:21 +0200)]
files_sharing: add route for ajax/publicpreview

10 years agomake sure preview prop is instanceof OC_Image before using it in showPreview
Georg Ehrke [Sun, 21 Sep 2014 15:30:29 +0000 (17:30 +0200)]
make sure preview prop is instanceof OC_Image before using it in showPreview

10 years agodelete old previews
Georg Ehrke [Sun, 21 Sep 2014 15:16:21 +0000 (17:16 +0200)]
delete old previews

10 years agoMerge pull request #11196 from owncloud/sqlite-migration-smallint-master
Morris Jobke [Sun, 21 Sep 2014 09:13:58 +0000 (11:13 +0200)]
Merge pull request #11196 from owncloud/sqlite-migration-smallint-master

adding 'smallint unsigned' to type mapping for sqlite

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 21 Sep 2014 05:54:29 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoadding 'smallint unsigned' to type mapping for sqlite
Thomas Müller [Sat, 20 Sep 2014 18:06:44 +0000 (20:06 +0200)]
adding 'smallint unsigned' to type mapping for sqlite

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 20 Sep 2014 05:54:34 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor
Morris Jobke [Fri, 19 Sep 2014 19:39:30 +0000 (21:39 +0200)]
Merge pull request #11178 from owncloud/throw-error-on-preview-instead-in-the-contructor

Throw error in showPreview instead the constructor

10 years agoMerge pull request #11184 from owncloud/typo
Morris Jobke [Fri, 19 Sep 2014 19:39:03 +0000 (21:39 +0200)]
Merge pull request #11184 from owncloud/typo

fix typo. closes #11132

10 years agoAdded extra check to avoid deleting key folders
Vincent Petry [Fri, 19 Sep 2014 17:01:02 +0000 (19:01 +0200)]
Added extra check to avoid deleting key folders

Whenever a delete operation is called twice in a row, it could happen
that the first call already deleted the file.

The second call would return an empty $ownerPath because the file does
not exist. That empty $ownerPath would run the key deletion operation on
the wrong path.

This fix adds checks in many places to make sure we don't use $ownerPath
when it's empty or null.

10 years agofix typo
Volkan Gezer [Fri, 19 Sep 2014 16:22:09 +0000 (18:22 +0200)]
fix typo

10 years agoAdd myself as author
Vincent Petry [Fri, 19 Sep 2014 15:24:12 +0000 (17:24 +0200)]
Add myself as author

10 years agoMerge pull request #10968 from owncloud/admin-groupsselect2
Lukas Reschke [Fri, 19 Sep 2014 14:50:56 +0000 (16:50 +0200)]
Merge pull request #10968 from owncloud/admin-groupsselect2

Use select2 for the groups excluded from sharing in admin page

10 years agoMerge pull request #11104 from owncloud/enc_create_backup_on_recovery
Lukas Reschke [Fri, 19 Sep 2014 14:40:19 +0000 (16:40 +0200)]
Merge pull request #11104 from owncloud/enc_create_backup_on_recovery

[encryption] create backup from all keys before recovery

10 years agoMerge pull request #11171 from owncloud/fix-route
Lukas Reschke [Fri, 19 Sep 2014 14:04:29 +0000 (16:04 +0200)]
Merge pull request #11171 from owncloud/fix-route

Match more URL fragments

10 years agoMerge pull request #11158 from owncloud/fix_basic_auth
Lukas Reschke [Fri, 19 Sep 2014 11:39:13 +0000 (13:39 +0200)]
Merge pull request #11158 from owncloud/fix_basic_auth

Move BasicAuth check to isLoggedIn

10 years agoThrow error in showPreview instead the constructor
Lukas Reschke [Fri, 19 Sep 2014 11:26:41 +0000 (13:26 +0200)]
Throw error in showPreview instead the constructor

This function is also used in a way such as:

```
$preview = new \OC\Preview(\OC_User::getUser(), 'files');
$info = \OC\Files\Filesystem::getFileInfo($file);
if (!$always and !$preview->isAvailable($info)) {
\OC_Response::setStatus(404);
} else {
$preview->setFile($file);
$preview->setMaxX($maxX);
$preview->setMaxY($maxY);
$preview->setScalingUp($scalingUp);
$preview->setKeepAspect($keepAspect);
}
```

Which won't work anymore since `setFile` is used instead of passing the file in the constructor. Fixes a regression in master.

10 years agoMerge pull request #11142 from owncloud/fix-windows
Lukas Reschke [Fri, 19 Sep 2014 11:02:22 +0000 (13:02 +0200)]
Merge pull request #11142 from owncloud/fix-windows

Resolves cache tests failing if the directory length is longer than 64

10 years agoMerge pull request #11119 from owncloud/removeOldUpgradeRoutines
Vincent Petry [Fri, 19 Sep 2014 10:23:42 +0000 (12:23 +0200)]
Merge pull request #11119 from owncloud/removeOldUpgradeRoutines

Remove old upgrade routines

10 years agoMerge pull request #11163 from owncloud/check-for-updates-between-major-versions
Vincent Petry [Fri, 19 Sep 2014 10:20:22 +0000 (12:20 +0200)]
Merge pull request #11163 from owncloud/check-for-updates-between-major-versions

Prevent updates between multiple major versions

10 years agoMerge pull request #10958 from owncloud/db-ilike
Robin Appelman [Fri, 19 Sep 2014 10:07:56 +0000 (12:07 +0200)]
Merge pull request #10958 from owncloud/db-ilike

Introduce cross-db ILIKE

10 years agomake sure that we really catch the files folder only
Bjoern Schiessle [Wed, 17 Sep 2014 08:40:41 +0000 (10:40 +0200)]
make sure that we really catch the files folder only

10 years agocreate backup from all keys before recovery
Bjoern Schiessle [Tue, 16 Sep 2014 13:16:27 +0000 (15:16 +0200)]
create backup from all keys before recovery

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 19 Sep 2014 05:55:44 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMatch more URL fragments
Lukas Reschke [Thu, 18 Sep 2014 21:18:07 +0000 (23:18 +0200)]
Match more URL fragments

Fixes https://github.com/owncloud/core/pull/11009#issuecomment-56103341

10 years agoReenable file proxy when renaming between mount points
Vincent Petry [Thu, 18 Sep 2014 17:21:04 +0000 (19:21 +0200)]
Reenable file proxy when renaming between mount points

When moving a folder into another mount point, $renamedFiles is empty
because that goes over a different mechanism.

In such case, this fix makes sure that the file proxy is reenable to
avoid breaking the subsequent files that are being moved.

10 years agoMerge pull request #11141 from owncloud/update_encrytionlink
Morris Jobke [Thu, 18 Sep 2014 16:19:53 +0000 (18:19 +0200)]
Merge pull request #11141 from owncloud/update_encrytionlink

update encryption doc link

10 years agoupdate encryption doc link
Volkan Gezer [Wed, 17 Sep 2014 18:53:19 +0000 (20:53 +0200)]
update encryption doc link

I don't know how we missed to update this :/

update ldap doc link

10 years agoPrevent updates between multiple major versions
Lukas Reschke [Thu, 18 Sep 2014 15:45:30 +0000 (17:45 +0200)]
Prevent updates between multiple major versions

Ref https://github.com/owncloud/core/issues/11078

10 years ago1. remove sizeof($filteredUsers) > 0 as condition
voxsim [Thu, 18 Sep 2014 15:50:19 +0000 (17:50 +0200)]
1. remove sizeof($filteredUsers) > 0 as condition
2. use count instead of sizeof. Latter is an alias to first one, practically we stick to count everywhere. Having it consistent helps with readability.
3. move whitespace so we have $groupUsers[] = $filteredUser; instead of $groupUsers []= $filteredUser;

10 years agoMove BasicAuth check to "isLoggedIn()"
Lukas Reschke [Thu, 18 Sep 2014 14:02:18 +0000 (16:02 +0200)]
Move BasicAuth check to "isLoggedIn()"

Ensures that Basic Auth works properly for APIs and removes the need for some even uglier lines of code.

10 years agoMerge pull request #11151 from owncloud/removeOverflowingFunction
Lukas Reschke [Thu, 18 Sep 2014 13:42:36 +0000 (15:42 +0200)]
Merge pull request #11151 from owncloud/removeOverflowingFunction

Remove unused and overflowing function

10 years agoFix ILIKE without wildcards for oracle
Robin Appelman [Thu, 18 Sep 2014 13:09:57 +0000 (15:09 +0200)]
Fix ILIKE without wildcards for oracle

10 years agoMerge pull request #11130 from owncloud/moveBasicAuthCheck
Lukas Reschke [Thu, 18 Sep 2014 12:40:42 +0000 (14:40 +0200)]
Merge pull request #11130 from owncloud/moveBasicAuthCheck

Move basic auth check

10 years agoRemove unused and overflowing function
Lukas Reschke [Thu, 18 Sep 2014 08:21:28 +0000 (10:21 +0200)]
Remove unused and overflowing function

Resolves https://github.com/owncloud/core/issues/10991 failure 4

10 years agoMerge pull request #11143 from owncloud/improve-404
Morris Jobke [Thu, 18 Sep 2014 07:10:16 +0000 (09:10 +0200)]
Merge pull request #11143 from owncloud/improve-404

Make 404 page easier to understand

10 years agoMerge pull request #9541 from owncloud/force_loading_of_encryption_app
Morris Jobke [Thu, 18 Sep 2014 07:04:53 +0000 (09:04 +0200)]
Merge pull request #9541 from owncloud/force_loading_of_encryption_app

force loading of encryption app to show correct error

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 18 Sep 2014 05:54:39 +0000 (01:54 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #11136 from owncloud/fix_body_id
Morris Jobke [Wed, 17 Sep 2014 21:55:53 +0000 (23:55 +0200)]
Merge pull request #11136 from owncloud/fix_body_id

Error needs to push body-id for new guest layout

10 years agoMake 404 page easier to understand
Lukas Reschke [Wed, 17 Sep 2014 20:49:37 +0000 (22:49 +0200)]
Make 404 page easier to understand

Fixes https://github.com/owncloud/core/issues/11133

10 years agoResolves cache tests failing if the directory length is longer than 64
Clark Tomlinson [Wed, 17 Sep 2014 20:24:43 +0000 (16:24 -0400)]
Resolves cache tests failing if the directory length is longer than 64

10 years agoMerge pull request #11105 from owncloud/jsunit-legacyfileactionsfix
Lukas Reschke [Wed, 17 Sep 2014 16:10:49 +0000 (18:10 +0200)]
Merge pull request #11105 from owncloud/jsunit-legacyfileactionsfix

Tentative fix for legacy file actions unit test side effect

10 years agoError needs to push body-id for new guest layout
Remco Brenninkmeijer [Wed, 17 Sep 2014 16:02:18 +0000 (18:02 +0200)]
Error needs to push body-id for new guest layout

10 years agoforce loading of encryption app
Lukas Reschke [Wed, 17 Sep 2014 15:12:06 +0000 (17:12 +0200)]
force loading of encryption app

10 years agoMerge pull request #9554 from owncloud/fix_preview_orientation
Lukas Reschke [Wed, 17 Sep 2014 15:05:47 +0000 (17:05 +0200)]
Merge pull request #9554 from owncloud/fix_preview_orientation

fix orientation in image-backend, not in preview system itself

10 years agoUse ILIKE in cache search
Robin Appelman [Wed, 17 Sep 2014 14:12:54 +0000 (16:12 +0200)]
Use ILIKE in cache search

10 years agoMove basic auth check
Lukas Reschke [Wed, 17 Sep 2014 14:04:12 +0000 (16:04 +0200)]
Move basic auth check

At the previous point not all apps were initialized. Now the basic auth check happens together at the same location as all others.

Fixes https://github.com/owncloud/core/issues/11129

10 years agoMerge pull request #10622 from owncloud/recursive-delete-forbidden
Lukas Reschke [Wed, 17 Sep 2014 13:36:41 +0000 (15:36 +0200)]
Merge pull request #10622 from owncloud/recursive-delete-forbidden

Fix isDeletable

10 years agoImplement ILIKE for sqlite
Robin Appelman [Wed, 17 Sep 2014 11:47:55 +0000 (13:47 +0200)]
Implement ILIKE for sqlite

10 years agoMake sqlite LIKE case sensitive on default
Robin Appelman [Wed, 17 Sep 2014 11:47:33 +0000 (13:47 +0200)]
Make sqlite LIKE case sensitive on default

10 years agoMerge pull request #10932 from owncloud/issue/10926
Morris Jobke [Wed, 17 Sep 2014 11:05:26 +0000 (13:05 +0200)]
Merge pull request #10932 from owncloud/issue/10926

Add a method to get the absolute url for a route

10 years agoFix mapping of relative paths
Lukas Reschke [Wed, 17 Sep 2014 09:36:08 +0000 (11:36 +0200)]
Fix mapping of relative paths

10 years agoAlso check if the file itself is updatable
Robin Appelman [Mon, 25 Aug 2014 12:28:35 +0000 (14:28 +0200)]
Also check if the file itself is updatable

10 years agoCheck if a folder is deletable before we try to recursively delete it
Robin Appelman [Mon, 25 Aug 2014 12:06:48 +0000 (14:06 +0200)]
Check if a folder is deletable before we try to recursively delete it

10 years agoCheck if the parent is writable to check if a file is deletable
Robin Appelman [Mon, 25 Aug 2014 12:06:27 +0000 (14:06 +0200)]
Check if the parent is writable to check if a file is deletable

10 years agoMerge pull request #11092 from owncloud/conceal_sabredav_version
Lukas Reschke [Wed, 17 Sep 2014 08:35:50 +0000 (10:35 +0200)]
Merge pull request #11092 from owncloud/conceal_sabredav_version

Conceal or display SabreDAV version number.

10 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 17 Sep 2014 05:55:27 +0000 (01:55 -0400)]
[tx-robot] updated from transifex

10 years agoMerge pull request #10745 from owncloud/fix-10708-doctrine
Lukas Reschke [Tue, 16 Sep 2014 21:56:20 +0000 (23:56 +0200)]
Merge pull request #10745 from owncloud/fix-10708-doctrine

Use Doctrine Platform to generate SQL query for table truncation.

10 years agoMerge pull request #10902 from owncloud/fix-ellepsis
Lukas Reschke [Tue, 16 Sep 2014 19:09:47 +0000 (21:09 +0200)]
Merge pull request #10902 from owncloud/fix-ellepsis

Adding link to ellipsis and fixing styling

10 years agoadd test case for ILIKE with wildcard
Robin Appelman [Tue, 16 Sep 2014 19:03:03 +0000 (21:03 +0200)]
add test case for ILIKE with wildcard

10 years agoRemove old upgrade routines
Lukas Reschke [Tue, 16 Sep 2014 18:27:52 +0000 (20:27 +0200)]
Remove old upgrade routines

We do not support updates from 6 to 8 directly, therefore we can remove those upgrade routines.

10 years agoMerge pull request #11009 from owncloud/tobiasKaminsky-route
Lukas Reschke [Tue, 16 Sep 2014 17:31:51 +0000 (19:31 +0200)]
Merge pull request #11009 from owncloud/tobiasKaminsky-route

REST API for thumbnails

10 years agoMerge pull request #11102 from owncloud/visit1985-issue_108
Lukas Reschke [Tue, 16 Sep 2014 16:54:37 +0000 (18:54 +0200)]
Merge pull request #11102 from owncloud/visit1985-issue_108

mysql setup: if dbuser exists try a different one (owncloud/core#108)

10 years agoMerge pull request #10896 from owncloud/undo-nav-entry
Morris Jobke [Tue, 16 Sep 2014 16:28:39 +0000 (18:28 +0200)]
Merge pull request #10896 from owncloud/undo-nav-entry

Add delete undo styles