]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
8 years agoMerge pull request #20905 from owncloud/allow-framing-itself
Thomas Müller [Wed, 2 Dec 2015 20:55:12 +0000 (21:55 +0100)]
Merge pull request #20905 from owncloud/allow-framing-itself

Allow framing 'self'

8 years agoMerge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff
Thomas Müller [Wed, 2 Dec 2015 20:54:42 +0000 (21:54 +0100)]
Merge pull request #20901 from owncloud/get-rid-of-more-legacy-config-stuff

Replace old config code with usage of proper APIs

8 years agoAllow framing 'self'
Lukas Reschke [Wed, 2 Dec 2015 16:30:40 +0000 (17:30 +0100)]
Allow framing 'self'

This is required by the pdf viewer, since the files app on master uses the AppFramework it had applied the more strict defaults which made it not work on master.

8 years agoMerge pull request #20719 from owncloud/adding-system-addressbook-of-users
Thomas Müller [Wed, 2 Dec 2015 15:17:58 +0000 (16:17 +0100)]
Merge pull request #20719 from owncloud/adding-system-addressbook-of-users

Adding system addressbook for users of this instance - a occ command …

8 years agoReplace old config code with usage of proper APIs
Morris Jobke [Wed, 2 Dec 2015 14:56:59 +0000 (15:56 +0100)]
Replace old config code with usage of proper APIs

8 years agoMerge pull request #20896 from owncloud/reduce-oc_config-usage
Thomas Müller [Wed, 2 Dec 2015 14:44:25 +0000 (15:44 +0100)]
Merge pull request #20896 from owncloud/reduce-oc_config-usage

Reduce OC_Config usage in lib/

8 years agoReduce OC_Config usage in lib/
Morris Jobke [Wed, 2 Dec 2015 13:49:40 +0000 (14:49 +0100)]
Reduce OC_Config usage in lib/

* replaced by proper public interfaces

8 years agoMerge pull request #20895 from owncloud/reduce-legacy-footprint-apps-management
Thomas Müller [Wed, 2 Dec 2015 13:49:20 +0000 (14:49 +0100)]
Merge pull request #20895 from owncloud/reduce-legacy-footprint-apps-management

Remove OC_Config from app management template

8 years agoFix endless recursion
Thomas Müller [Wed, 2 Dec 2015 13:25:07 +0000 (14:25 +0100)]
Fix endless recursion

8 years agoRemove OC_Config from app management template
Morris Jobke [Wed, 2 Dec 2015 13:35:38 +0000 (14:35 +0100)]
Remove OC_Config from app management template

* add unit test for this case

8 years agoMerge pull request #20875 from owncloud/remove-changepropagator
Thomas Müller [Wed, 2 Dec 2015 12:03:31 +0000 (13:03 +0100)]
Merge pull request #20875 from owncloud/remove-changepropagator

remove old propagation logic

8 years agoMerge pull request #20891 from owncloud/check-for-cli
Morris Jobke [Wed, 2 Dec 2015 11:56:15 +0000 (12:56 +0100)]
Merge pull request #20891 from owncloud/check-for-cli

Execute only for web and not for CLI

8 years agoExecute only for web and not for CLI
Lukas Reschke [Wed, 2 Dec 2015 10:49:33 +0000 (11:49 +0100)]
Execute only for web and not for CLI

8 years agoMerge pull request #20889 from owncloud/fix-logout-for-bjoern
Lukas Reschke [Wed, 2 Dec 2015 10:41:00 +0000 (11:41 +0100)]
Merge pull request #20889 from owncloud/fix-logout-for-bjoern

Ensure trailing slash in URIs

8 years agoAdd a trailing slash to generated URLs
Lukas Reschke [Wed, 2 Dec 2015 10:27:07 +0000 (11:27 +0100)]
Add a trailing slash to generated URLs

8 years agoEnsure that ownCloud is always accessed with a trailing slash
Lukas Reschke [Wed, 2 Dec 2015 10:26:41 +0000 (11:26 +0100)]
Ensure that ownCloud is always accessed with a trailing slash

8 years agoFix update of avatar image
Thomas Müller [Wed, 2 Dec 2015 10:09:15 +0000 (11:09 +0100)]
Fix update of avatar image

8 years agoMerge pull request #20884 from owncloud/fix_20713
Thomas Müller [Wed, 2 Dec 2015 09:56:59 +0000 (10:56 +0100)]
Merge pull request #20884 from owncloud/fix_20713

Respect disabled incoming federated shares

8 years agoMerge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewrite-is...
Thomas Müller [Wed, 2 Dec 2015 09:56:44 +0000 (10:56 +0100)]
Merge pull request #20879 from owncloud/check-if-rewrite-base-is-set-if-rewrite-is-active

Check if rewrite base is set if rewrite is active

8 years agofix indentation
Morris Jobke [Wed, 2 Dec 2015 09:51:52 +0000 (10:51 +0100)]
fix indentation

8 years agoMerge pull request #20867 from owncloud/add-quota-behat-test
Thomas Müller [Wed, 2 Dec 2015 09:13:15 +0000 (10:13 +0100)]
Merge pull request #20867 from owncloud/add-quota-behat-test

Add quota behat test

8 years agoMerge pull request #20865 from owncloud/post-delete-meta
Thomas Müller [Wed, 2 Dec 2015 09:12:54 +0000 (10:12 +0100)]
Merge pull request #20865 from owncloud/post-delete-meta

Add metadata to post delete hooks

8 years agoMerge pull request #20874 from owncloud/allow-di-mimetypedetector
Thomas Müller [Wed, 2 Dec 2015 09:12:35 +0000 (10:12 +0100)]
Merge pull request #20874 from owncloud/allow-di-mimetypedetector

Allow DI for OCP\Files\IMimeTypeDetector

8 years agoMerge pull request #20877 from owncloud/fix-empty-expirationDate
Thomas Müller [Wed, 2 Dec 2015 09:12:16 +0000 (10:12 +0100)]
Merge pull request #20877 from owncloud/fix-empty-expirationDate

Check the expiration date for null

8 years agoFix comments
Thomas Müller [Wed, 2 Dec 2015 08:20:58 +0000 (09:20 +0100)]
Fix comments

8 years agoFix getCloudId
Thomas Müller [Tue, 1 Dec 2015 13:50:13 +0000 (14:50 +0100)]
Fix getCloudId

8 years agoProposal: add enumeration function to IUserManager which simply calls a callbask...
Thomas Müller [Tue, 1 Dec 2015 11:48:23 +0000 (12:48 +0100)]
Proposal: add enumeration function to IUserManager which simply calls a callbask for each user in all backends

8 years agoAdding unit test for User::getCloudId()
Thomas Müller [Tue, 1 Dec 2015 10:22:09 +0000 (11:22 +0100)]
Adding unit test for User::getCloudId()

8 years agoSpecify the email type and set name properly
Thomas Müller [Mon, 30 Nov 2015 21:28:36 +0000 (22:28 +0100)]
Specify the email type and set name properly

8 years agoAdd converter to generate/update a vcard from a given user
Thomas Müller [Mon, 30 Nov 2015 15:59:41 +0000 (16:59 +0100)]
Add converter to generate/update a vcard from a given user

8 years agoAdd system principal to cal of each card
Thomas Müller [Mon, 30 Nov 2015 14:10:06 +0000 (15:10 +0100)]
Add system principal to cal of each card

8 years agoAdd the user's cloud id to the vCard
Thomas Müller [Mon, 30 Nov 2015 12:57:54 +0000 (13:57 +0100)]
Add the user's cloud id to the vCard

8 years agoAdd user's email address to vCard
Thomas Müller [Mon, 30 Nov 2015 12:41:42 +0000 (13:41 +0100)]
Add user's email address to vCard

8 years agoUpdate addressbook home configuration for CalDAVTester
Thomas Müller [Mon, 30 Nov 2015 09:41:34 +0000 (10:41 +0100)]
Update addressbook home configuration for CalDAVTester

8 years agouser and system addressbooks are now living in sub folders
Thomas Müller [Fri, 27 Nov 2015 12:14:55 +0000 (13:14 +0100)]
user and system addressbooks are now living in sub folders

8 years agoAdding a second principal backend which holds system principals - as of now only...
Thomas Müller [Thu, 26 Nov 2015 19:46:50 +0000 (20:46 +0100)]
Adding a second principal backend which holds system principals - as of now only one principals/system/system

8 years agoAdd IUser::getAvatarImage() for easy access
Thomas Müller [Wed, 25 Nov 2015 20:44:36 +0000 (21:44 +0100)]
Add IUser::getAvatarImage() for easy access

8 years agoAdding system addressbook for users of this instance - a occ command is supplied...
Thomas Müller [Tue, 24 Nov 2015 22:53:27 +0000 (23:53 +0100)]
Adding system addressbook for users of this instance - a occ command is supplied for synchronizing

8 years ago[Sharing] Respect disabled incoming federated shares
Roeland Jago Douma [Wed, 2 Dec 2015 08:00:21 +0000 (09:00 +0100)]
[Sharing] Respect disabled incoming federated shares

Only fetch the incoming federated shares if incoming shares are actually
enabled.

Fixes #20713

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Wed, 2 Dec 2015 07:00:28 +0000 (02:00 -0500)]
[tx-robot] updated from transifex

8 years agoMerge pull request #20883 from owncloud/avatar_di
Roeland Douma [Wed, 2 Dec 2015 06:48:35 +0000 (07:48 +0100)]
Merge pull request #20883 from owncloud/avatar_di

DI in avatar code

8 years agoDI in avatar code
Roeland Jago Douma [Tue, 1 Dec 2015 21:08:42 +0000 (22:08 +0100)]
DI in avatar code

* DI in avatar code
* Use the node API
* More unit tests
* Unit tests no longer require DB

8 years agoSet RewriteBase to / if OC::WEBROOT is not set
Lukas Reschke [Tue, 1 Dec 2015 21:03:25 +0000 (22:03 +0100)]
Set RewriteBase to / if OC::WEBROOT is not set

8 years agoAppend PATH_INFO to ensure that file can be loaded on update
Lukas Reschke [Tue, 1 Dec 2015 19:08:07 +0000 (20:08 +0100)]
Append PATH_INFO to ensure that file can be loaded on update

8 years agoDisable MultiView + DirectorySlash
Lukas Reschke [Tue, 1 Dec 2015 18:55:16 +0000 (19:55 +0100)]
Disable MultiView + DirectorySlash

Required for routes that might otherwise collide with existing folders on the system

8 years agoSet "SetEnv" within base `.htaccess` file
Lukas Reschke [Tue, 1 Dec 2015 17:55:18 +0000 (18:55 +0100)]
Set "SetEnv" within base `.htaccess` file

mod_rewrite as used by the front controller may require a `RewriteBase` in case the installation is done using an alias. Since we cannot enforce a writable `.htaccess` file this will move the `front_controller_active` environment variable into the main .htaccess file. If administrators decide to have this one not writable they can still enable this feature by setting the `front_controller_active` environment variable within the Apache config.

8 years agoCheck the expiration date for null
Morris Jobke [Tue, 1 Dec 2015 16:43:05 +0000 (17:43 +0100)]
Check the expiration date for null

* null is always less than any value -> expirationDate gets null
  which is "no date set"
* ref https://github.com/owncloud/core/issues/20590#issuecomment-158393075

8 years agoMerge pull request #14081 from owncloud/use-pretty-urls
Lukas Reschke [Tue, 1 Dec 2015 16:17:48 +0000 (17:17 +0100)]
Merge pull request #14081 from owncloud/use-pretty-urls

Support pretty URLs

8 years agoremove old propagation logic
Robin Appelman [Tue, 1 Dec 2015 15:50:20 +0000 (16:50 +0100)]
remove old propagation logic

8 years agoAllow DI for OCP\Files\IMimeTypeDetector
Joas Schilling [Tue, 1 Dec 2015 15:49:20 +0000 (16:49 +0100)]
Allow DI for OCP\Files\IMimeTypeDetector

8 years agoSupport pretty URLs
Lukas Reschke [Wed, 11 Feb 2015 00:10:03 +0000 (01:10 +0100)]
Support pretty URLs

This changeset allows ownCloud to run with pretty URLs, they will be used if mod_rewrite and mod_env are available. This means basically that the `index.php` in the URL is not shown to the user anymore.

Also the not deprecated functions to generate URLs have been modified to support this behaviour, old functions such as `filePath` will still behave as before for compatibility reasons.

Examples:
http://localhost/owncloud/index.php/s/AIDyKbxiRZWAAjP => http://localhost/owncloud/s/AIDyKbxiRZWAAjP
http://localhost/owncloud/index.php/apps/files/ => http://localhost/owncloud/apps/files/

Due to the way our CSS and JS is structured the .htaccess uses some hacks for the final result but could be worse... And I was just annoyed by all that users crying for the removal of `index.php` ;-)

8 years agoMerge pull request #20285 from owncloud/add-integrity-checker
Thomas Müller [Tue, 1 Dec 2015 14:27:50 +0000 (15:27 +0100)]
Merge pull request #20285 from owncloud/add-integrity-checker

Add code integrity checker foundation

8 years agoMerge pull request #20710 from owncloud/files_external_config_command
Thomas Müller [Tue, 1 Dec 2015 14:27:32 +0000 (15:27 +0100)]
Merge pull request #20710 from owncloud/files_external_config_command

Add command to get and set config for external mounts

8 years agofix code style
Morris Jobke [Tue, 1 Dec 2015 12:37:32 +0000 (13:37 +0100)]
fix code style

8 years agoadd parameter to call single behat tests
Morris Jobke [Tue, 1 Dec 2015 12:37:23 +0000 (13:37 +0100)]
add parameter to call single behat tests

8 years agoadd behat tests for 0 quota upload failure
Morris Jobke [Tue, 1 Dec 2015 12:36:55 +0000 (13:36 +0100)]
add behat tests for 0 quota upload failure

8 years agoMerge pull request #20868 from owncloud/revert-20842-fix-date-time-column
Thomas Müller [Tue, 1 Dec 2015 13:30:44 +0000 (14:30 +0100)]
Merge pull request #20868 from owncloud/revert-20842-fix-date-time-column

Revert "Fix column width of mtime column"

8 years agoMerge pull request #20861 from owncloud/systemtags-better-exceptions-docs
Thomas Müller [Tue, 1 Dec 2015 13:23:00 +0000 (14:23 +0100)]
Merge pull request #20861 from owncloud/systemtags-better-exceptions-docs

Fix the docs of the exceptions and remove hardcoded language from the…

8 years agoreturn non 0 status code in case of missing mount
Robin Appelman [Tue, 1 Dec 2015 12:47:56 +0000 (13:47 +0100)]
return non 0 status code in case of missing mount

8 years agoAdd command to set mount options for external storages
Robin Appelman [Wed, 25 Nov 2015 15:25:45 +0000 (16:25 +0100)]
Add command to set mount options for external storages

8 years agoAdd command to get and set config for external mounts
Robin Appelman [Tue, 24 Nov 2015 14:53:02 +0000 (15:53 +0100)]
Add command to get and set config for external mounts

8 years agoRevert "Fix column width of mtime column"
Morris Jobke [Tue, 1 Dec 2015 12:45:30 +0000 (13:45 +0100)]
Revert "Fix column width of mtime column"

8 years agoAdd metadata to post delete hooks
Robin Appelman [Tue, 1 Dec 2015 12:22:58 +0000 (13:22 +0100)]
Add metadata to post delete hooks

8 years agoMerge pull request #20859 from owncloud/autotest-coverage
Thomas Müller [Tue, 1 Dec 2015 11:55:14 +0000 (12:55 +0100)]
Merge pull request #20859 from owncloud/autotest-coverage

Make autotest.sh able to output proper coverage again

8 years agoFix the docs of the exceptions and remove hardcoded language from the message
Joas Schilling [Tue, 1 Dec 2015 11:32:50 +0000 (12:32 +0100)]
Fix the docs of the exceptions and remove hardcoded language from the message

8 years agoMake autotest.sh able to output proper coverage again
Roeland Jago Douma [Tue, 1 Dec 2015 11:03:27 +0000 (12:03 +0100)]
Make autotest.sh able to output proper coverage again

The usage of single quotes make sure that a string is used verbatim in
bash. And no variables are subsituted.

8 years agoAdd code integrity check
Lukas Reschke [Tue, 3 Nov 2015 19:26:06 +0000 (20:26 +0100)]
Add code integrity check

This PR implements the base foundation of the code signing and integrity check. In this PR implemented is the signing and verification logic, as well as commands to sign single apps or the core repository.

Furthermore, there is a basic implementation to display problems with the code integrity on the update screen.

Code signing basically happens the following way:

- There is a ownCloud Root Certificate authority stored `resources/codesigning/root.crt` (in this PR I also ship the private key which we obviously need to change before a release :wink:). This certificate is not intended to be used for signing directly and only is used to sign new certificates.
- Using the `integrity:sign-core` and `integrity:sign-app` commands developers can sign either the core release or a single app. The core release needs to be signed with a certificate that has a CN of `core`,  apps need to be signed with a certificate that either has a CN of `core` (shipped apps!)  or the AppID.
- The command generates a signature.json file of the following format:
```json
{
    "hashes": {
        "/filename.php": "2401fed2eea6f2c1027c482a633e8e25cd46701f811e2d2c10dc213fd95fa60e350bccbbebdccc73a042b1a2799f673fbabadc783284cc288e4f1a1eacb74e3d",
        "/lib/base.php": "55548cc16b457cd74241990cc9d3b72b6335f2e5f45eee95171da024087d114fcbc2effc3d5818a6d5d55f2ae960ab39fd0414d0c542b72a3b9e08eb21206dd9"
    },
    "certificate": "-----BEGIN CERTIFICATE-----MIIBvTCCASagAwIBAgIUPvawyqJwCwYazcv7iz16TWxfeUMwDQYJKoZIhvcNAQEF\nBQAwIzEhMB8GA1UECgwYb3duQ2xvdWQgQ29kZSBTaWduaW5nIENBMB4XDTE1MTAx\nNDEzMTcxMFoXDTE2MTAxNDEzMTcxMFowEzERMA8GA1UEAwwIY29udGFjdHMwgZ8w\nDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANoQesGdCW0L2L+a2xITYipixkScrIpB\nkX5Snu3fs45MscDb61xByjBSlFgR4QI6McoCipPw4SUr28EaExVvgPSvqUjYLGps\nfiv0Cvgquzbx/X3mUcdk9LcFo1uWGtrTfkuXSKX41PnJGTr6RQWGIBd1V52q1qbC\nJKkfzyeMeuQfAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAvF/KIhRMQ3tYTmgHWsiM\nwDMgIDb7iaHF0fS+/Nvo4PzoTO/trev6tMyjLbJ7hgdCpz/1sNzE11Cibf6V6dsz\njCE9invP368Xv0bTRObRqeSNsGogGl5ceAvR0c9BG+NRIKHcly3At3gLkS2791bC\niG+UxI/MNcWV0uJg9S63LF8=\n-----END CERTIFICATE-----",
    "signature": "U29tZVNpZ25lZERhdGFFeGFtcGxl"
}
```
`hashes` is an array of all files in the folder with their corresponding SHA512 hashes (this is actually quite cheap to calculate), the `certificate` is the  certificate used for signing. It has to be issued by the ownCloud Root Authority and it's CN needs to be permitted to perform the required action. The `signature` is then a signature of the `hashes` which can be verified using the `certificate`.

Steps to do in other PRs, this is already a quite huge one:
- Add nag screen in case the code check fails to ensure that administrators are aware of this.
- Add code verification also to OCC upgrade and unify display code more.
- Add enforced code verification to apps shipped from the appstore with a level of "official"
- Add enfocrced code verification to apps shipped from the appstore that were already signed in a previous release
- Add some developer documentation on how devs can request their own certificate
- Check when installing ownCloud
- Add support for CRLs to allow revoking certificates

**Note:** The upgrade checks are only run when the instance has a defined release channel of `stable` (defined in `version.php`). If you want to test this, you need to change the channel thus and then generate the core signature:

```
➜  master git:(add-integrity-checker) ✗ ./occ integrity:sign-core --privateKey=resources/codesigning/core.key --certificate=resources/codesigning/core.crt
Successfully signed "core"
```

Then increase the version and you should see something like the following:

![2015-11-04_12-02-57](https://cloud.githubusercontent.com/assets/878997/10936336/6adb1d14-82ec-11e5-8f06-9a74801c9abf.png)

As you can see a failed code check will not prevent the further update. It will instead just be a notice to the admin. In a next step we will add some nag screen.

For packaging stable releases this requires the following additional steps as a last action before zipping:
1. Run `./occ integrity:sign-core` once
2. Run `./occ integrity:sign-app` _for each_ app. However, this can be simply automated using a simple foreach on the apps folder.

8 years agoMerge pull request #20855 from owncloud/output-log-integration-tests
Thomas Müller [Tue, 1 Dec 2015 09:21:25 +0000 (10:21 +0100)]
Merge pull request #20855 from owncloud/output-log-integration-tests

tail the server log and exit with the exit code of behat

8 years agoMerge pull request #20850 from owncloud/use-text-instead-of-html
Thomas Müller [Tue, 1 Dec 2015 09:18:29 +0000 (10:18 +0100)]
Merge pull request #20850 from owncloud/use-text-instead-of-html

Use .text instead of .html

8 years agoMerge pull request #20853 from owncloud/php-parser-1.4.1
Thomas Müller [Tue, 1 Dec 2015 09:17:17 +0000 (10:17 +0100)]
Merge pull request #20853 from owncloud/php-parser-1.4.1

[3rdparty] Bump php-parser

8 years agotail the server log and exit with the exit code of behat
Thomas Müller [Tue, 1 Dec 2015 08:24:40 +0000 (09:24 +0100)]
tail the server log and exit with the exit code of behat

8 years agoMerge pull request #20825 from owncloud/scrutinizer-patch-1
Thomas Müller [Tue, 1 Dec 2015 08:26:22 +0000 (09:26 +0100)]
Merge pull request #20825 from owncloud/scrutinizer-patch-1

Scrutinizer Auto-Fixes

8 years ago[3rdparty] Bump php-parser
Roeland Jago Douma [Tue, 1 Dec 2015 07:09:09 +0000 (08:09 +0100)]
[3rdparty] Bump php-parser

8 years agoMerge pull request #20851 from owncloud/tests-for-kill-rebuild-parser
Thomas Müller [Tue, 1 Dec 2015 08:07:32 +0000 (09:07 +0100)]
Merge pull request #20851 from owncloud/tests-for-kill-rebuild-parser

[3rdparty] Remove some unrequired files

8 years agoRemove some unrequired files
Lukas Reschke [Mon, 30 Nov 2015 23:46:51 +0000 (00:46 +0100)]
Remove some unrequired files

8 years ago[tx-robot] updated from transifex
Jenkins for ownCloud [Tue, 1 Dec 2015 06:55:07 +0000 (01:55 -0500)]
[tx-robot] updated from transifex

8 years agoUse .text instead of .html
Lukas Reschke [Mon, 30 Nov 2015 22:49:27 +0000 (23:49 +0100)]
Use .text instead of .html

Makes some static source code analyzers happier.

8 years agoMerge pull request #20828 from owncloud/sharing_integration_test_20645_morris
Thomas Müller [Mon, 30 Nov 2015 22:06:25 +0000 (23:06 +0100)]
Merge pull request #20828 from owncloud/sharing_integration_test_20645_morris

Sharing integration test 20645, added sabre dav and propfind check.

8 years agoAdjust patches
Thomas Müller [Mon, 30 Nov 2015 22:00:51 +0000 (23:00 +0100)]
Adjust patches

8 years agoScrutinizer Auto-Fixes
Scrutinizer Auto-Fixer [Mon, 30 Nov 2015 10:29:06 +0000 (10:29 +0000)]
Scrutinizer Auto-Fixes

This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com

8 years agoMerge pull request #20842 from owncloud/fix-date-time-column
Thomas Müller [Mon, 30 Nov 2015 21:47:36 +0000 (22:47 +0100)]
Merge pull request #20842 from owncloud/fix-date-time-column

Fix column width of mtime column

8 years agoMerge pull request #20784 from owncloud/jeremeamia_superclosure_2.1.0
Thomas Müller [Mon, 30 Nov 2015 21:45:29 +0000 (22:45 +0100)]
Merge pull request #20784 from owncloud/jeremeamia_superclosure_2.1.0

[3rdparty] bump jeremeamia/superclosure to 2.1.0

8 years agoMerge pull request #20829 from owncloud/dav-define-phpunit
Thomas Müller [Mon, 30 Nov 2015 21:45:01 +0000 (22:45 +0100)]
Merge pull request #20829 from owncloud/dav-define-phpunit

Fix already defined warning from dav test bootstrap

8 years agoMerge pull request #20845 from owncloud/allow-di-in-apps
Thomas Müller [Mon, 30 Nov 2015 21:43:30 +0000 (22:43 +0100)]
Merge pull request #20845 from owncloud/allow-di-in-apps

Allow DI the system tag stuff without Application class

8 years agoMerge pull request #20487 from owncloud/activity-oracle-sql-error-for-favorites
Thomas Müller [Mon, 30 Nov 2015 21:43:06 +0000 (22:43 +0100)]
Merge pull request #20487 from owncloud/activity-oracle-sql-error-for-favorites

Activity oracle sql error for favorites

8 years agoMerge pull request #20832 from owncloud/update-js-dependencies
Thomas Müller [Mon, 30 Nov 2015 21:42:23 +0000 (22:42 +0100)]
Merge pull request #20832 from owncloud/update-js-dependencies

Update some JS dependencies

8 years agoMerge pull request #20843 from owncloud/fix-share-with-input
Thomas Müller [Mon, 30 Nov 2015 16:38:27 +0000 (17:38 +0100)]
Merge pull request #20843 from owncloud/fix-share-with-input

Fix the width of the share with input

8 years agoMerge pull request #20841 from owncloud/generate-response-using-xml-writer
Thomas Müller [Mon, 30 Nov 2015 16:32:32 +0000 (17:32 +0100)]
Merge pull request #20841 from owncloud/generate-response-using-xml-writer

Use XMLWriter to generate response

8 years agoInject the database connection
Joas Schilling [Mon, 30 Nov 2015 08:42:11 +0000 (09:42 +0100)]
Inject the database connection

8 years agoOnly require the interface
Joas Schilling [Wed, 18 Nov 2015 09:34:52 +0000 (10:34 +0100)]
Only require the interface

8 years agoAdd a unit test that executes the query
Joas Schilling [Wed, 18 Nov 2015 09:32:29 +0000 (10:32 +0100)]
Add a unit test that executes the query

8 years agoCorrectly escape the paths so we only display favorites instead of wildcards
Joas Schilling [Fri, 13 Nov 2015 09:33:33 +0000 (10:33 +0100)]
Correctly escape the paths so we only display favorites instead of wildcards

8 years agoOracle can not return statements but only values
Joas Schilling [Fri, 13 Nov 2015 09:32:45 +0000 (10:32 +0100)]
Oracle can not return statements but only values
So evaluate the condition directly and return 1 or 0

8 years agoAllow DI the system tag stuff without Application class
Joas Schilling [Mon, 30 Nov 2015 16:08:29 +0000 (17:08 +0100)]
Allow DI the system tag stuff without Application class

8 years agoMerge pull request #20837 from owncloud/fix-mountoptions-dropdown
Thomas Müller [Mon, 30 Nov 2015 15:53:26 +0000 (16:53 +0100)]
Merge pull request #20837 from owncloud/fix-mountoptions-dropdown

Fix ext storage mount options dropdown

8 years agoFix the width of the share with input
Morris Jobke [Mon, 30 Nov 2015 15:46:51 +0000 (16:46 +0100)]
Fix the width of the share with input

* the ID of this has changed to #shareWith-viewNUMBER and shouldn't
  be used in CSS
* now uses the proper classes

8 years agoFix column width of mtime column
Morris Jobke [Mon, 30 Nov 2015 15:29:15 +0000 (16:29 +0100)]
Fix column width of mtime column

* in some translations (e.g. german) the header of this column otherwise
  got truncated
  "Zeitpunkt der Freigabe" vs "Zeitpunkt der Freig"

8 years agoChange from with of
Sergio Bertolin [Mon, 30 Nov 2015 14:49:35 +0000 (14:49 +0000)]
Change from with of

8 years agoUse XMLWriter to generate response
Lukas Reschke [Mon, 30 Nov 2015 14:40:10 +0000 (15:40 +0100)]
Use XMLWriter to generate response

Gets rid of manual XML generation.

8 years agoMerge pull request #20650 from owncloud/systemtags-core
Thomas Müller [Mon, 30 Nov 2015 14:38:43 +0000 (15:38 +0100)]
Merge pull request #20650 from owncloud/systemtags-core

Implement systemtag managers and mapper