]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
9 years agofix base.php for not installed systems
Morris Jobke [Fri, 28 Nov 2014 17:52:09 +0000 (18:52 +0100)]
fix base.php for not installed systems

9 years agomigrate \OC\AllConfig to \OCP\IConfig
Morris Jobke [Thu, 27 Nov 2014 17:19:14 +0000 (18:19 +0100)]
migrate \OC\AllConfig to \OCP\IConfig

9 years agointroduce deleteAllUserValues
Morris Jobke [Fri, 5 Dec 2014 15:34:54 +0000 (16:34 +0100)]
introduce deleteAllUserValues

9 years agointroduce proper interface for deleteAppValue
Morris Jobke [Tue, 25 Nov 2014 08:53:47 +0000 (09:53 +0100)]
introduce proper interface for deleteAppValue

9 years agouse old methods and redirect in deprecated methods
Morris Jobke [Thu, 27 Nov 2014 16:05:19 +0000 (17:05 +0100)]
use old methods and redirect in deprecated methods

9 years ago@deprecated messages for \OCP\Config and \OCP\AppConfig
Morris Jobke [Thu, 27 Nov 2014 16:03:17 +0000 (17:03 +0100)]
@deprecated messages for \OCP\Config and \OCP\AppConfig

9 years agoExtract interaction with config.php into SystemConfig
Morris Jobke [Thu, 27 Nov 2014 15:40:12 +0000 (16:40 +0100)]
Extract  interaction with config.php into SystemConfig

* introduce SystemConfig to avoid DI circle (used by database connection which is itself needed by AllConfig that itself contains the methods to access the config.php which then would need the database connection - did you get it? ;))
* use DI container and use that method in legacy code paths (for easier refactoring later)
* create and use getSystemConfig instead of query() in DI container

9 years agoMerge pull request #12618 from owncloud/initial-work-migrate-to-appframework
Lukas Reschke [Mon, 8 Dec 2014 20:37:41 +0000 (21:37 +0100)]
Merge pull request #12618 from owncloud/initial-work-migrate-to-appframework

Add REST route for managing groups and users

9 years agoMerge pull request #12704 from owncloud/fix-12647-2
Lukas Reschke [Mon, 8 Dec 2014 18:14:59 +0000 (19:14 +0100)]
Merge pull request #12704 from owncloud/fix-12647-2

preserve an asterisk at the start when escaping a search term

9 years agoadd doc
Arthur Schiwon [Mon, 8 Dec 2014 16:22:52 +0000 (17:22 +0100)]
add doc

9 years agopreserve an asterisk at the start when escaping a search term
Arthur Schiwon [Mon, 8 Dec 2014 16:12:13 +0000 (17:12 +0100)]
preserve an asterisk at the start when escaping a search term

9 years agoMerge pull request #12621 from owncloud/add-right-margin
Joas Schilling [Mon, 8 Dec 2014 16:14:19 +0000 (17:14 +0100)]
Merge pull request #12621 from owncloud/add-right-margin

Add right margin to codestyle file

9 years agoReact on other statuscodes than 200
Lukas Reschke [Mon, 8 Dec 2014 15:35:13 +0000 (16:35 +0100)]
React on other statuscodes than 200

9 years agoMerge pull request #12696 from owncloud/trashbin-selected-delete
Robin Appelman [Mon, 8 Dec 2014 15:30:53 +0000 (16:30 +0100)]
Merge pull request #12696 from owncloud/trashbin-selected-delete

Fix deleting selected files in the trashbin

9 years agoMerge branch 'initial-work-migrate-to-appframework' of https://github.com/owncloud...
Lukas Reschke [Mon, 8 Dec 2014 14:34:17 +0000 (15:34 +0100)]
Merge branch 'initial-work-migrate-to-appframework' of https://github.com/owncloud/core into initial-work-migrate-to-appframework

9 years agoAdd statuscodes
Lukas Reschke [Mon, 8 Dec 2014 14:32:59 +0000 (15:32 +0100)]
Add statuscodes

9 years agoFix url
Lukas Reschke [Mon, 8 Dec 2014 14:32:53 +0000 (15:32 +0100)]
Fix url

9 years agoFix deleting selected files in the trashbin
Robin Appelman [Mon, 8 Dec 2014 14:16:15 +0000 (15:16 +0100)]
Fix deleting selected files in the trashbin

9 years agofix updated URL schema in JS unit tests
Morris Jobke [Mon, 8 Dec 2014 14:05:03 +0000 (15:05 +0100)]
fix updated URL schema in JS unit tests

9 years agoMerge pull request #12452 from owncloud/server2server-ng-ocs
Morris Jobke [Mon, 8 Dec 2014 13:12:03 +0000 (14:12 +0100)]
Merge pull request #12452 from owncloud/server2server-ng-ocs

OCS API for server-to-server sharing

9 years agoMerge pull request #12691 from owncloud/i-shall-improve-my-grep-skills
Morris Jobke [Mon, 8 Dec 2014 11:52:54 +0000 (12:52 +0100)]
Merge pull request #12691 from owncloud/i-shall-improve-my-grep-skills

Remove unexisting `htAccessWorkinght`

9 years agoAdd REST route for user & group management
Lukas Reschke [Thu, 4 Dec 2014 13:15:55 +0000 (14:15 +0100)]
Add REST route for user & group management

First step of a somewhat testable user management. - I know, the JSON returns are in an ugly format but the JS expects it that way. So let's keep it that way until we have time to fix the JS in the future.

9 years agoMerge pull request #12394 from owncloud/files-fileactionsimprovements
Lukas Reschke [Mon, 8 Dec 2014 10:30:21 +0000 (11:30 +0100)]
Merge pull request #12394 from owncloud/files-fileactionsimprovements

Improve FileActions JS to allow for custom rendering

9 years agoRemove unexisting `htAccessWorkinght`
Lukas Reschke [Mon, 8 Dec 2014 10:25:32 +0000 (11:25 +0100)]
Remove unexisting `htAccessWorkinght`

Partially fixes https://github.com/owncloud/core/issues/12690 - remark to myself: improve grep skills.

9 years agoMerge pull request #12657 from owncloud/ajaxify-htaccess-check
Morris Jobke [Mon, 8 Dec 2014 09:37:06 +0000 (10:37 +0100)]
Merge pull request #12657 from owncloud/ajaxify-htaccess-check

Check for working .htaccess via AJAX

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Mon, 8 Dec 2014 06:54:57 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoRemove changes which were inadvertently pushed to master
Olivier Paroz [Mon, 8 Dec 2014 03:03:02 +0000 (04:03 +0100)]
Remove changes which were inadvertently pushed to master

9 years agoDump Arrays, Objects and Exceptions to the log
Olivier Paroz [Mon, 8 Dec 2014 02:53:07 +0000 (03:53 +0100)]
Dump Arrays, Objects and Exceptions to the log

This is a first draft. It has only been tested with the ownlcloud logger.
Some internal fields are JSON encoded several times which makes it harder to read.

Most of the normalizer is borrowed from Monolog
https://github.com/Seldaek/monolog/blob/master/src/Monolog/Formatter/NormalizerFormatter.php

9 years agoMerge pull request #12644 from owncloud/add-hack-for-config
Lukas Reschke [Sun, 7 Dec 2014 21:33:16 +0000 (22:33 +0100)]
Merge pull request #12644 from owncloud/add-hack-for-config

Create config if it does not exists

9 years agoMerge pull request #12668 from owncloud/keepspace
Thomas Müller [Sun, 7 Dec 2014 12:15:37 +0000 (13:15 +0100)]
Merge pull request #12668 from owncloud/keepspace

Keep spaces out of the string

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sun, 7 Dec 2014 06:54:32 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoKeep spaces out of the string
Volkan Gezer [Sun, 7 Dec 2014 00:57:34 +0000 (01:57 +0100)]
Keep spaces out of the string

Otherwise translators cannot notice them on Transifex.

9 years agoCheck for working .htaccess via AJAX
Lukas Reschke [Sat, 6 Dec 2014 14:34:53 +0000 (15:34 +0100)]
Check for working .htaccess via AJAX

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

9 years agoCreate config if it does not exists
Lukas Reschke [Fri, 5 Dec 2014 16:32:19 +0000 (17:32 +0100)]
Create config if it does not exists

The codepath that is executed when executing ownCloud via CLI is different than via browser. Specifically, the config is created by the user session already in `OC_Util::getInstanceId()` by a call to `setValue`. That said, this seems to be quite a bad side-effect, but for the sake of "not breaking whatever might break if we touch this" let's keep it that way for now.

When executing the autoconfig via `php -f index.php` the said session was not setup and thus no `config/config.php` file was created resulting in an installation error.

To reproduce this try to setup ownCloud via `php -f index.php` with and without that patch. (ensure to delete all existing configs before and don't access ownCloud with a browser in the meantime)

Fixes itself.

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Sat, 6 Dec 2014 06:54:56 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoMerge pull request #12636 from owncloud/fix-ie9-placeholder
Raghu Nayyar [Sat, 6 Dec 2014 06:24:31 +0000 (11:54 +0530)]
Merge pull request #12636 from owncloud/fix-ie9-placeholder

fix placeholder fake in IE8 & 9 that brokes group listing in user manage...

9 years agoMerge pull request #12646 from owncloud/remove-safe-magic-quotes
Robin Appelman [Fri, 5 Dec 2014 20:17:40 +0000 (21:17 +0100)]
Merge pull request #12646 from owncloud/remove-safe-magic-quotes

Remove checks for safe mode and magic quotes

9 years agoMerge pull request #12166 from helmutschneider/aws-2.7.5
Lukas Reschke [Fri, 5 Dec 2014 19:12:53 +0000 (20:12 +0100)]
Merge pull request #12166 from helmutschneider/aws-2.7.5

Upgrade AWS sdk to 2.7.5. Fixes #12023

9 years agoMerge pull request #11485 from brumsoel/master
Lukas Reschke [Fri, 5 Dec 2014 18:53:09 +0000 (19:53 +0100)]
Merge pull request #11485 from brumsoel/master

Fix timestamp comparator return value

9 years agoMerge pull request #12477 from rjaeckel/master
Lukas Reschke [Fri, 5 Dec 2014 18:51:19 +0000 (19:51 +0100)]
Merge pull request #12477 from rjaeckel/master

restrict access to public files only

9 years agoRemove checks for safe mode and magic quotes
Lukas Reschke [Fri, 5 Dec 2014 18:14:47 +0000 (19:14 +0100)]
Remove checks for safe mode and magic quotes

Both are removed from 5.4.0

Safe Mode: http://php.net/manual/en/features.safe-mode.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.

Magic Quotes: http://php.net/manual/en/security.magicquotes.php
> This feature has been DEPRECATED as of PHP 5.3.0 and REMOVED as of PHP 5.4.0.

9 years agoMerge pull request #12523 from owncloud/port-11747
Vincent Petry [Fri, 5 Dec 2014 17:04:06 +0000 (18:04 +0100)]
Merge pull request #12523 from owncloud/port-11747

Only store user credentials when SMB_OC storage is enabled

9 years agoMerge pull request #12561 from oparoz/vectoricon
Morris Jobke [Fri, 5 Dec 2014 13:51:03 +0000 (14:51 +0100)]
Merge pull request #12561 from oparoz/vectoricon

Improve the bitmap and vector mime icons

9 years agofix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes...
Morris Jobke [Fri, 5 Dec 2014 11:16:22 +0000 (12:16 +0100)]
fix placeholder fake in IE8 & 9 that brokes group listing in user management - fixes #12525

9 years agoMerge pull request #12583 from owncloud/trim-port
Morris Jobke [Fri, 5 Dec 2014 10:27:20 +0000 (11:27 +0100)]
Merge pull request #12583 from owncloud/trim-port

Trim port from domain

9 years agoMerge pull request #12622 from owncloud/disable-for-all
Joas Schilling [Fri, 5 Dec 2014 09:10:43 +0000 (10:10 +0100)]
Merge pull request #12622 from owncloud/disable-for-all

Disable when no sendmail is available

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Fri, 5 Dec 2014 06:55:52 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

9 years agoPNG and SVG have been compressed
Olivier Paroz [Fri, 5 Dec 2014 00:47:44 +0000 (01:47 +0100)]
PNG and SVG have been compressed

9 years agocache total user count
Arthur Schiwon [Wed, 19 Nov 2014 17:16:08 +0000 (18:16 +0100)]
cache total  user count

Conflicts:
apps/user_ldap/user_ldap.php

9 years agoForward port of #12493
Arthur Schiwon [Fri, 28 Nov 2014 11:08:33 +0000 (12:08 +0100)]
Forward port of #12493

add ldap-search command to occ

Conflicts:
apps/user_ldap/appinfo/register_command.php

LDAP search filter creation changes:

1. do not prepend * wildcard to search terms. Will result in faster search, but
you don't find "foobar"  when looking for "bar"
2. advanced behaviour when search string contains a space and multiple search
attributes are present. The search string is split into single words. The
resulting filter requires that each word at least appears once in any search
attribute. This is supposed to return better results in big LDAPs.

trim search string before passing it on

9 years agoMerge pull request #12619 from owncloud/use-also-original-hea
Morris Jobke [Thu, 4 Dec 2014 15:59:42 +0000 (16:59 +0100)]
Merge pull request #12619 from owncloud/use-also-original-hea

Merge headers

9 years agoMerge pull request #12616 from owncloud/node-fileinfo
Morris Jobke [Thu, 4 Dec 2014 15:34:30 +0000 (16:34 +0100)]
Merge pull request #12616 from owncloud/node-fileinfo

make \OC\Files\Node\Node implement the FileInfo interface

9 years agoMerge pull request #12607 from owncloud/this-is-an-awesome-day
Clark Tomlinson [Thu, 4 Dec 2014 15:33:04 +0000 (10:33 -0500)]
Merge pull request #12607 from owncloud/this-is-an-awesome-day

PHP 5.4 is now required for master

9 years agoDisable when no sendmail is available
Lukas Reschke [Thu, 4 Dec 2014 15:22:44 +0000 (16:22 +0100)]
Disable when no sendmail is available

9 years agoAdd right margin to codestyle file
Lukas Reschke [Thu, 4 Dec 2014 15:08:27 +0000 (16:08 +0100)]
Add right margin to codestyle file

Defaults to 120, we want 80 apparently

9 years agoMerge pull request #12596 from owncloud/remove-travis-traces
Morris Jobke [Thu, 4 Dec 2014 15:04:15 +0000 (16:04 +0100)]
Merge pull request #12596 from owncloud/remove-travis-traces

Remove last traces of travis integration

9 years agoFix unit test
Lukas Reschke [Thu, 4 Dec 2014 14:54:32 +0000 (15:54 +0100)]
Fix unit test

9 years agoMerge headers
Lukas Reschke [Thu, 4 Dec 2014 13:45:15 +0000 (14:45 +0100)]
Merge headers

Otherwise the headers from `JSONResponse` are gone and the Content-Type of the response would be `text/html` instead of `application/json; charset=utf-8`. This leads to broken scripts since we set the `nosniff` tag, furthermore this is very bad from a security PoV.

9 years agoMerge pull request #12609 from owncloud/remove-53-fixme
Thomas Müller [Thu, 4 Dec 2014 13:25:47 +0000 (14:25 +0100)]
Merge pull request #12609 from owncloud/remove-53-fixme

Remove workaround for 5.3

9 years agoMerge pull request #12533 from owncloud/app-dependencies-php-version
Thomas Müller [Thu, 4 Dec 2014 13:23:03 +0000 (14:23 +0100)]
Merge pull request #12533 from owncloud/app-dependencies-php-version

App dependencies php version

9 years agoMerge pull request #12610 from owncloud/remove_php_version_check
Björn Schießle [Thu, 4 Dec 2014 13:07:09 +0000 (14:07 +0100)]
Merge pull request #12610 from owncloud/remove_php_version_check

[encryption] remove check for PHP version

9 years agomake \OC\Files\Node\Node implement the FileInfo interface
Robin Appelman [Thu, 4 Dec 2014 12:27:08 +0000 (13:27 +0100)]
make \OC\Files\Node\Node implement the FileInfo interface

9 years agoOCS API for server-to-server sharing
Bjoern Schiessle [Mon, 24 Nov 2014 14:31:52 +0000 (15:31 +0100)]
OCS API for server-to-server sharing

9 years agoAdd test for IPv6 without port
Lukas Reschke [Thu, 4 Dec 2014 11:16:33 +0000 (12:16 +0100)]
Add test for IPv6 without port

9 years agoupdate error message
Bjoern Schiessle [Thu, 4 Dec 2014 11:01:11 +0000 (12:01 +0100)]
update error message

9 years agoMerge pull request #12522 from owncloud/bower-jstz
Morris Jobke [Thu, 4 Dec 2014 10:58:46 +0000 (11:58 +0100)]
Merge pull request #12522 from owncloud/bower-jstz

Bower jstz

9 years agono nested xml tags on dependencies
Thomas Müller [Tue, 2 Dec 2014 14:14:48 +0000 (15:14 +0100)]
no nested xml tags on dependencies

9 years agofix an issue where the types tag holds an empty string
Thomas Müller [Tue, 2 Dec 2014 14:06:51 +0000 (15:06 +0100)]
fix an issue where the types tag holds an empty string

9 years agoadding command dependency
Thomas Müller [Tue, 2 Dec 2014 11:10:04 +0000 (12:10 +0100)]
adding command dependency

9 years agoadjust dependency analyzer to use attributes properly
Thomas Müller [Tue, 2 Dec 2014 10:49:31 +0000 (11:49 +0100)]
adjust dependency analyzer to use attributes properly

9 years agoswitch to different parsing implementation to get xml attributes properly handled
Thomas Müller [Tue, 2 Dec 2014 10:03:25 +0000 (11:03 +0100)]
switch to different parsing implementation to get xml attributes properly handled

9 years agoadding supported databases
Thomas Müller [Mon, 1 Dec 2014 22:43:27 +0000 (23:43 +0100)]
adding supported databases

9 years agodisplay missing dependencies in the apps management page
Thomas Müller [Mon, 1 Dec 2014 22:07:16 +0000 (23:07 +0100)]
display missing dependencies in the apps management page

9 years agointroduce dependency analyzer to take care of app dependencies
Thomas Müller [Mon, 1 Dec 2014 20:47:22 +0000 (21:47 +0100)]
introduce dependency analyzer to take care of app dependencies
some more unit tests on xml info parser

9 years agoadding new dependency for php version in apps info.xml
Thomas Müller [Mon, 1 Dec 2014 16:35:28 +0000 (17:35 +0100)]
adding new dependency for php version in apps info.xml

9 years agoadding default key value pair for 'types'
Thomas Müller [Mon, 1 Dec 2014 16:35:01 +0000 (17:35 +0100)]
adding default key value pair for 'types'

9 years agotranslate labels properly
Thomas Müller [Mon, 1 Dec 2014 16:34:28 +0000 (17:34 +0100)]
translate labels properly

9 years agoOC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app
Bjoern Schiessle [Thu, 4 Dec 2014 10:17:44 +0000 (11:17 +0100)]
OC8 and later requires PHP >= 5.4, so we can remove the check from the encryption app

9 years agoRemove workaround for 5.3
Lukas Reschke [Thu, 4 Dec 2014 10:17:33 +0000 (11:17 +0100)]
Remove workaround for 5.3

Function is natively available with 5.4

9 years agoPHP < 5.4 is not supported anymore - see #12606
Morris Jobke [Thu, 4 Dec 2014 10:05:45 +0000 (11:05 +0100)]
PHP < 5.4 is not supported anymore - see #12606

9 years agoPHP 5.4 is now required for master
Lukas Reschke [Thu, 4 Dec 2014 09:45:28 +0000 (10:45 +0100)]
PHP 5.4 is now required for master

:beers:

9 years agoRemove last traces of travis integration
Morris Jobke [Thu, 4 Dec 2014 09:09:13 +0000 (10:09 +0100)]
Remove last traces of travis integration

9 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Thu, 4 Dec 2014 06:54:42 +0000 (01:54 -0500)]
[tx-robot] updated from transifex

9 years agoModified filesort test cases to test for large sizes & timestamps
brumsel [Wed, 3 Dec 2014 22:45:57 +0000 (23:45 +0100)]
Modified filesort test cases to test for large sizes & timestamps

9 years agoMerge remote-tracking branch 'upstream/master'
brumsel [Wed, 3 Dec 2014 22:04:49 +0000 (23:04 +0100)]
Merge remote-tracking branch 'upstream/master'

9 years agoAdd workaround for older instances
Lukas Reschke [Wed, 3 Dec 2014 20:13:27 +0000 (21:13 +0100)]
Add workaround for older instances

To be removed with oCAdd workaround for older instances

To be removed with oC99

9 years agoTrim port from domain
Lukas Reschke [Wed, 3 Dec 2014 18:54:48 +0000 (19:54 +0100)]
Trim port from domain

Depending on the used environment the port might be appended to the host header resulting in an inaccessible instance when initially setting up on a system with a different HTTP or HTTPS port. (for example test:500)

To test this setup ownCloud under a different port with and without this patch. (heads-up: localhost is always white-listed, so use a different domain)

9 years agoMerge pull request #12581 from owncloud/fix_typo
Thomas Müller [Wed, 3 Dec 2014 18:55:07 +0000 (19:55 +0100)]
Merge pull request #12581 from owncloud/fix_typo

fix typo in license header

9 years agofix typo
Bjoern Schiessle [Wed, 3 Dec 2014 18:46:32 +0000 (19:46 +0100)]
fix typo

9 years agoMerge pull request #12544 from owncloud/fix-windows-unittests
Thomas Müller [Wed, 3 Dec 2014 16:49:10 +0000 (17:49 +0100)]
Merge pull request #12544 from owncloud/fix-windows-unittests

Replace uniqid calls with $this->getUniqueID so tests pass again on windows

9 years agoMerge pull request #12579 from owncloud/drop-files-external-tests
Thomas Müller [Wed, 3 Dec 2014 16:44:56 +0000 (17:44 +0100)]
Merge pull request #12579 from owncloud/drop-files-external-tests

drop files_external tests from autotest - they will be executed with aut...

9 years agoMerge pull request #12542 from owncloud/update-autotestcmd
Joas Schilling [Wed, 3 Dec 2014 16:40:28 +0000 (17:40 +0100)]
Merge pull request #12542 from owncloud/update-autotestcmd

Update autotest.cmd

9 years agoMerge pull request #12492 from owncloud/deprecate-passwordsalt
Lukas Reschke [Wed, 3 Dec 2014 15:51:06 +0000 (16:51 +0100)]
Merge pull request #12492 from owncloud/deprecate-passwordsalt

Officially deprecate passwordsalt

9 years agodrop files_external tests from autotest - they will be executed with autotest-externa...
Morris Jobke [Wed, 3 Dec 2014 15:38:25 +0000 (16:38 +0100)]
drop files_external tests from autotest - they will be executed with autotest-external.sh which is coming

9 years agoMerge pull request #12382 from owncloud/enc_reorganize_folders2
Morris Jobke [Wed, 3 Dec 2014 15:08:40 +0000 (16:08 +0100)]
Merge pull request #12382 from owncloud/enc_reorganize_folders2

[encryption] reorganize folder structure (second try to make Jenkins happy)

9 years agoMerge pull request #12552 from szlwzl/master
Thomas Müller [Wed, 3 Dec 2014 15:02:35 +0000 (16:02 +0100)]
Merge pull request #12552 from szlwzl/master

adding @ sign between email address and domain name to make syntax clearer

9 years agoOfficially deprecated passwordsalt
Lukas Reschke [Fri, 28 Nov 2014 12:51:57 +0000 (13:51 +0100)]
Officially deprecated passwordsalt

Hopefully this prevents people from using it in the future.

9 years agoMerge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood
Lukas Reschke [Wed, 3 Dec 2014 13:51:03 +0000 (14:51 +0100)]
Merge pull request #12572 from owncloud/issue/12571-disabled-preview-logflood

Stop flooding the log, when previews are disabled

9 years agoMerge pull request #12553 from owncloud/default-iosid
Thomas Müller [Wed, 3 Dec 2014 13:05:27 +0000 (14:05 +0100)]
Merge pull request #12553 from owncloud/default-iosid

add missing public interface for iOS client app id

9 years agoMerge pull request #12556 from owncloud/add-route-for-versions
Thomas Müller [Wed, 3 Dec 2014 13:01:58 +0000 (14:01 +0100)]
Merge pull request #12556 from owncloud/add-route-for-versions

Add route for download of versions