summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * reset mailadress/displayname on blurmichag862015-12-111-3/+5
| |
* | Merge pull request #21192 from owncloud/preview-non-existing-8Lukas Reschke2015-12-141-7/+11
|\ \ | | | | | | [8.0] Handle non existing files in version previews
| * | Handle non existing files in version previewsRobin Appelman2015-12-141-7/+11
|/ /
* / Use XMLWriter to generate responseLukas Reschke2015-12-141-17/+26
|/ | | | Gets rid of manual XML generation.
* Merge pull request #20363 from owncloud/backport-20271-stable8Vincent Petry2015-12-041-20/+31
|\ | | | | [backport] [stable8] LDAP: attempt to connect to backup server again, if main server is no…
| * LDAP: attempt to connect to backup server again, if main server is not ↵Arthur Schiwon2015-11-061-20/+31
| | | | | | | | available. Fixes #18701
* | Merge pull request #20844 from owncloud/files-scan-user-path-80Thomas Müller2015-11-301-4/+5
|\ \ | | | | | | [8.0] Lock scanner to the given user
| * | Lock scanner to the given userRobin Appelman2015-11-301-4/+5
|/ /
* | Merge pull request #20808 from owncloud/backport-use-new-updater-url-stable8Vincent Petry2015-11-301-6/+6
|\ \ | | | | | | [stable8] Use new updater URL
| * | [stable8] Use new updater URLLukas Reschke2015-11-281-6/+6
|/ /
* | Merge pull request #20763 from owncloud/scan-eventsource-no-paths-8Vincent Petry2015-11-261-8/+0
|\ \ | | | | | | [8.0] Dont output paths in scan.php
| * | Dont output paths in scan.phpRobin Appelman2015-11-261-8/+0
|/ /
* | Merge pull request #19659 from owncloud/stable8-backport-19546Vincent Petry2015-11-252-1/+43
|\ \ | | | | | | Stable8 backport 19546
| * | fix internal path when searching in storage rootRobin Appelman2015-11-121-2/+5
| | | | | | | | | | | | (cherry picked from commit c2d76d2)
| * | Add unit test for searching in storage rootRobin Appelman2015-11-121-0/+39
| | | | | | | | | | | | (cherry picked from commit e28a2ff)
| * | The minimum size for internalRootLength is 1Olivier Paroz2015-11-121-1/+1
| | | | | | | | | | | | (cherry picked from commit 3173ed2)
* | | Merge pull request #20638 from owncloud/cache-escape-like-8Morris Jobke2015-11-204-1/+52
|\ \ \ | |/ / |/| | [8.0] Escape like parameter in cache operations
| * | escape like parameter in cache moveRobin Appelman2015-11-201-1/+2
| | |
| * | Add test for special character during moveRobin Appelman2015-11-201-0/+48
| | |
| * | define escape character for like statements on oracleRobin Appelman2015-11-201-0/+1
| | |
| * | define escape character for like statements on sqliteRobin Appelman2015-11-201-0/+1
|/ /
* | Merge pull request #20396 from owncloud/stable8-extstorage-gdrive-forceapprovalMorris Jobke2015-11-091-0/+1
|\ \ | |/ |/| [stable8] Force approval in GDrive oauth to get refresh_token
| * Force approval in GDrive oauth to get refresh_tokenVincent Petry2015-11-091-0/+1
|/ | | | | | | | Forcing the approval of app permissions makes sure that the GDrive API will always return a refresh_token. In the case of apps that were already authorized for the current user/domain, the API doesn't return the refresh_token which causes expiration issues.
* Merge pull request #20302 from owncloud/backport-20155-8.0Vincent Petry2015-11-051-3/+7
|\ | | | | [backport] [stable8] add port to host only, if an URL is used instead of a plain hostname
| * add port to host only, if an URL is used instead of a plain hostnameArthur Schiwon2015-11-041-3/+7
|/
* 8.0.9v8.0.9C Montero-Luque2015-10-301-2/+2
|
* 8.0.9 RC2v8.0.9RC2C Montero-Luque2015-10-281-2/+2
|
* Merge pull request #20063 from owncloud/stable8-add-warning-for-php-7Thomas Müller2015-10-261-0/+8
|\ | | | | [stable8] Stop processing if PHP 7 is used
| * Stop processing if PHP 7 is usedLukas Reschke2015-10-261-0/+8
|/ | | | PHP 7 is only compatible with ownCloud 8.2.0
* Do not print exception messageLukas Reschke2015-10-251-3/+3
|
* 8.0.9 RC1v8.0.9RC1C Montero-Luque2015-10-212-3/+3
|
* Merge pull request #19732 from owncloud/make-sure-sharing-extends-the-testcaseThomas Müller2015-10-131-1/+5
|\ | | | | Make sure all sharing tests extend the testcase
| * Make sure all sharing tests extend the testcaseJoas Schilling2015-10-131-1/+5
|/
* Merge pull request #19681 from owncloud/stable8-backport-19574Thomas Müller2015-10-121-0/+12
|\ | | | | Clear the shares after the test like storages and files
| * Clear the shares after the test like storages and filesMorris Jobke2015-10-091-0/+12
|/ | | | * adjusted to stable8.1 backport of #19574
* Merge pull request #18958 from owncloud/stable8-backport-17791Morris Jobke2015-10-091-0/+11
|\ | | | | [stable8] Add custom CSP for Win 10 compatibility
| * Add custom CSP for Win 10 compatibilityLukas Reschke2015-09-101-0/+11
| | | | | | | | | | | | | | | | | | | | The default content-security-policy of ownCloud forbids inline JavaScript for security reasons. IE starting on Windows 10 will however also obey the CSP which will break the event source fallback. As a workaround thus we set a custom policy which allows the execution of inline JavaScript. This fixes https://github.com/owncloud/core/issues/14286
* | Merge pull request #18857 from owncloud/memcached-fix-stable8Morris Jobke2015-10-092-0/+28
|\ \ | | | | | | [stable8] Fallback to complete Memcached flush if getAllKeys fails
| * | Fallback to complete Memcached flush if getAllKeys failsRobin McCorkell2015-09-062-0/+28
| | | | | | | | | | | | | | | | | | | | | Newer Memcached's do not support the underlying protocol commands that getAllKeys() is implemented with. We should fallback to clearing everything in that case, as causing (temporary) performance problems for other applications on the server is better than having stale cached data.
* | | Merge pull request #19476 from owncloud/thumbnail-temp-clean-8Thomas Müller2015-09-301-1/+5
|\ \ \ | | | | | | | | [8] Clean temp files used for thumbnail generation
| * | | Clean temp files used for thumbnail generationRobin Appelman2015-09-301-1/+5
|/ / /
* | | Merge pull request #19447 from owncloud/stable8-backport-19441Morris Jobke2015-09-293-0/+28
|\ \ \ | | | | | | | | [stable8][upgrade] switch to debug logging on upgrade
| * | | [upgrade] switch to debug logging on upgradeMorris Jobke2015-09-293-0/+28
|/ / / | | | | | | | | | | | | * resets afterwards * adds output about the previous log level
* | | Merge pull request #17953 from owncloud/backport-17464-stable8Morris Jobke2015-09-281-1/+7
|\ \ \ | | | | | | | | [stable8] backport of #17464: fix uncaught exception on not permitted file types when setting avata…
| * | | fix uncaught exception on not permitted file types when setting avatar, ↵Arthur Schiwon2015-07-291-1/+7
| | | | | | | | | | | | | | | | fixes #17232
* | | | Merge pull request #18704 from owncloud/stable8-dav-copy-fixMorris Jobke2015-09-281-0/+3
|\ \ \ \ | | | | | | | | | | [stable8] Check for file existence before doing a DAV copy
| * | | | Check for file existence before doing a DAV copyVincent Petry2015-08-311-0/+3
| | | | | | | | | | | | | | | | | | | | Partial backport of f39fcbc250c3817e0c62627b127cf31a70dca36a from 8.1
* | | | | 8.0.8v8.0.8C Montero-Luque2015-09-102-3/+3
| |_|_|/ |/| | |
* | | | Merge pull request #18843 from owncloud/app-upgrade-routenotfound-stable8Morris Jobke2015-09-071-1/+1
|\ \ \ \ | |_|_|/ |/| | | [stable8] Always add to $loadedApps
| * | | Always add to $loadedAppsRobin McCorkell2015-09-051-1/+1
|/ / /