summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Correctly indent uneditable email/display name fieldsJoas Schilling2016-02-261-2/+2
|
* [tx-robot] updated from transifexJenkins for ownCloud2016-02-2656-34/+210
|
* Merge pull request #22584 from owncloud/fix-app-load-order-fixes-22508Thomas Müller2016-02-252-4/+4
|\ | | | | Before installing new shipped apps we need to load authentication apps
| * Fix PHPDoc of OC_App::loadApps()Thomas Müller2016-02-231-1/+1
| |
| * Install new shipped apps after upgrading all existing appsThomas Müller2016-02-231-4/+4
| |
| * Before installing new shipped apps we need to load authentication apps - ↵Thomas Müller2016-02-231-1/+1
| | | | | | | | fixes #22508
* | Merge pull request #22653 from owncloud/integration-tests-for-dav-csrfThomas Müller2016-02-252-2/+127
|\ \ | | | | | | Add integration test for CSRF protection on DAV
| * | Fix typoLukas Reschke2016-02-251-1/+1
| | |
| * | Add integration test for CSRF protection on DAVLukas Reschke2016-02-252-2/+127
| | | | | | | | | | | | | | | | | | This adds the integration tests for the CSRF protection on the DAV backend introduced with 9.0. Fixes https://github.com/owncloud/core/issues/22598
* | | Merge pull request #22654 from owncloud/icon-fixesThomas Müller2016-02-253-0/+17
|\ \ \ | | | | | | | | add download icon for image detail view, ref gallery issue 51
| * | | add download icon for image detail view, ref gallery issue 51Jan-Christoph Borchardt2016-02-253-0/+17
| | | |
* | | | Merge pull request #22659 from owncloud/fix-formattingThomas Müller2016-02-252-54/+62
|\ \ \ \ | | | | | | | | | | Fix formatting of response
| * | | | Fix formatting of responseLukas Reschke2016-02-252-54/+62
| | |/ / | |/| | | | | | | | | | The elements are expected to be within a `service` array as per specification.
* | | | Merge pull request #22658 from owncloud/exclude-ocs-provider-from-rewrite-rulesThomas Müller2016-02-251-0/+1
|\ \ \ \ | |/ / / |/| | | Exclude ocs-provider from rewrite rule
| * | | Exclude ocs-provider from rewrite ruleLukas Reschke2016-02-251-0/+1
|/ / / | | | | | | | | | | | | Otherwise `localhost/ocs-provider/` cannot be accessed if mod_rewrite is install ed. Only affects master.
* | | Merge pull request #22644 from owncloud/external-share-managerThomas Müller2016-02-251-3/+4
|\ \ \ | | | | | | | | inject the correct external share manager into the storage
| * | | inject the correct external share manager into the storageRobin Appelman2016-02-251-3/+4
| | | |
* | | | Merge pull request #21854 from owncloud/fix-share-hook-group-addThomas Müller2016-02-251-0/+17
|\ \ \ \ | | | | | | | | | | Fix addUserToGroup hook of the share code
| * | | | Fix addUserToGroup hook of the share codeMorris Jobke2016-01-221-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * sets up the filesystem of the user that is added to a group to properly accept shares * fixes #18499
* | | | | Merge pull request #22628 from owncloud/fix-thrashbin-cronjobThomas Müller2016-02-251-0/+6
|\ \ \ \ \ | | | | | | | | | | | | Skip users with no trashbin
| * | | | | Skip users with no trashbinVictor Dubiniuk2016-02-241-0/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #22611 from owncloud/add-uid-on-hoverThomas Müller2016-02-252-3/+12
|\ \ \ \ \ | |_|_|/ / |/| | | | Add the uid on hover for sharing autocomplete
| * | | | Tweak tooltip style for recipientsVincent Petry2016-02-252-2/+10
| | | | |
| * | | | Add the uid on hover for sharing autocompleteJoas Schilling2016-02-241-1/+2
| | | | |
* | | | | Merge pull request #22636 from owncloud/fix-ssl-on-external-storagesThomas Müller2016-02-254-12/+45
|\ \ \ \ \ | | | | | | | | | | | | Fix HTTPS support on external storages
| * | | | | Properly cast typeLukas Reschke2016-02-243-11/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current logic is checking whether: 1. The returned value is a boolen 2. The returned value is a string and then matches for "true" Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP. This change casts the data to a boolean if it is defined as boolean. Fixes https://github.com/owncloud/core/issues/22605 Fixes https://github.com/owncloud/core/issues/22016
| * | | | | Add proxy support to external storageLukas Reschke2016-02-241-1/+5
| | |/ / / | |/| | | | | | | | | | | | | Otherwise debugging issues is a PITA
* | | | | Merge pull request #22604 from owncloud/fix-google-drive-encryptionThomas Müller2016-02-251-5/+11
|\ \ \ \ \ | | | | | | | | | | | | Copy into local file
| * | | | | More error handlingLukas Reschke2016-02-251-2/+6
| | | | | |
| * | | | | Copy into local fileLukas Reschke2016-02-251-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => :bomb: This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors. While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See https://github.com/owncloud/core/commit/d608c37c90c308d0518d854de908ec4be5f462dc for the breaking change. To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now. Fixes https://github.com/owncloud/core/issues/22590
* | | | | | Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefaultThomas Müller2016-02-254-3/+10
|\ \ \ \ \ \ | | | | | | | | | | | | | | Disable sharing by default for external storage mounts
| * | | | | | Disable sharing by default for external storage mountsVincent Petry2016-02-244-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is for newly created mount points. Migrated mount points will have sharing enabled as before.
* | | | | | | Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displaynameThomas Müller2016-02-251-2/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | take the first result of that array, if present. Fixes 2nd display na…
| * | | | | | | take the first result of that array, if present. Fixes 2nd display name to ↵Arthur Schiwon2016-02-241-2/+2
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | be 'Array', if cache is configured and enabled.
* | | | | | | Merge pull request #22579 from owncloud/fix_broken_unencrypted_sizeThomas Müller2016-02-252-4/+286
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Heal unencrypted file sizes at download time (second approach)
| * | | | | | | recalculate unencrypted size if we assume that the size stored in the db is ↵Bjoern Schiessle2016-02-232-4/+286
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not correct
* | | | | | | | Merge pull request #22639 from owncloud/dont-show-pcntl-warningMorris Jobke2016-02-251-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | | Don't show PCNTL warning if --no-warnings is passed
| * | | | | | | Don't show PCNTL warning if --no-warnings is passedMorris Jobke2016-02-251-1/+1
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | * fixes owncloud/updater#252
* | / / / / / [tx-robot] updated from transifexJenkins for ownCloud2016-02-25608-1034/+4140
| |/ / / / / |/| | | | |
* | | | | | Merge pull request #22593 from owncloud/swift-docker-fixThomas Müller2016-02-242-277/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Enable upstream entrypoint changes with Ceph Docker
| * | | | | | Enable upstream entrypoint changes with Ceph DockerRobin McCorkell2016-02-232-277/+1
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #22612 from owncloud/davclient-update-headersThomas Müller2016-02-241-1/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update davclient.js for headers fix
| * | | | | | Update davclient.js for headers fixVincent Petry2016-02-241-1/+2
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #22592 from owncloud/fix-response-headerThomas Müller2016-02-243-21/+73
|\ \ \ \ \ \ | | | | | | | | | | | | | | Add header for attachment disposition only once
| * | | | | | Drop unneeded use statementsMorris Jobke2016-02-231-4/+0
| | | | | | |
| * | | | | | Add header for attachment disposition only onceLukas Reschke2016-02-233-17/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains. This changeset adds the header only once and adds integration tests ensuring the correct header in future. https://github.com/owncloud/core/issues/22577
* | | | | | | Merge pull request #22573 from owncloud/issue-22568-allow-string-object-idsThomas Müller2016-02-244-44/+43
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Make sure we can store strings as per the interface
| * | | | | | | Make sure we can store strings as per the interfaceJoas Schilling2016-02-224-44/+43
| | | | | | | |
* | | | | | | | Merge pull request #22565 from owncloud/avoid-scanning-root-storageThomas Müller2016-02-241-0/+4
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Avoids scanning the root storage
| * | | | | | | | Avoids scanning the root storageMorris Jobke2016-02-221-0/+4
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This check will skip the background scan for the root storage because there is nothing in the root storage that isn't already in another (mostly user-) storage. Fixes #22501
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-24 02:25:03 +0000