summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Show 404 page when accessing empty share URLLukas Reschke2015-02-251-1/+7
| | | | | | | | Testplan: - [ ] Without: Accessing `public.php?service=files&t=` throws an exception - [ ] With: No exception thrown and 404 page displayed. Fixes https://github.com/owncloud/core/issues/14231
* Merge pull request #14500 from owncloud/fileglobalgc-cleanupThomas Müller2015-02-253-28/+119
|\ | | | | Cleanup garbage collection for global file cache
| * Cleanup garbage collection for global file cacheRobin Appelman2015-02-253-28/+119
| |
* | Merge pull request #10735 from owncloud/use_remote_addrRobin McCorkell2015-02-252-5/+2
|\ \ | |/ |/| Use getRemoteAddress which supports reverse proxies
| * Use getRemoteAddress which supports reverse proxiesLukas Reschke2015-02-242-5/+2
| | | | | | | | | | | | Breaking change for 8.1 wiki (Security > Administrators): The log format for failed logins has changed and uses now the remote address and is considering reverse proxies for such scenarios when configured correctly.
* | Merge pull request #14462 from owncloud/add-some-php-docsThomas Müller2015-02-251-2/+70
|\ \ | | | | | | Add some PHPDocs
| * | Add some PHPDocsLukas Reschke2015-02-241-2/+70
| | | | | | | | | | | | My IDE was crying...
* | | Merge pull request #14460 from owncloud/revive/12971Thomas Müller2015-02-251-3/+15
|\ \ \ | | | | | | | | Add support for sftp custom port
| * | | Fix code style as per reviewLukas Reschke2015-02-241-2/+2
| | | |
| * | | Add support for sftp custom portSA2015-02-241-3/+15
| |/ /
* | | Merge pull request #14458 from owncloud/revive/11157Thomas Müller2015-02-252-3/+30
|\ \ \ | | | | | | | | Get the real protocol behind several proxies
| * | | Use [0] instead of current as HHVM might have problems with thatLukas Reschke2015-02-241-1/+1
| | | |
| * | | Get the real protocol behind several proxiesLukas Reschke2015-02-242-3/+30
| |/ / | | | | | | | | | | | | | | | X-Forwarded-Proto contains a list of protocols if ownCloud is behind multiple reverse proxies. This is a revival of https://github.com/owncloud/core/pull/11157 using the new IRequest public API.
* | | Merge pull request #14475 from owncloud/fix-ext-owncloudRobin McCorkell2015-02-252-2/+10
|\ \ \ | | | | | | | | Fix bugs in ownCloud external storage
| * | | Fix bugs in ownCloud external storageRobin McCorkell2015-02-252-2/+10
| | | |
* | | | Merge pull request #13741 from owncloud/autotest_improvementsThomas Müller2015-02-254-24/+32
|\ \ \ \ | | | | | | | | | | Better config cleanup in autotest.sh
| * | | | Better cleanup in autotest.shRobin McCorkell2015-01-284-24/+32
| | | | | | | | | | | | | | | | | | | | Configs correctly cleaned, even if phpunit fails or autotest interrupted
* | | | | Merge pull request #14151 from owncloud/update-sabre2.1Thomas Müller2015-02-2540-1780/+1556
|\ \ \ \ \ | | | | | | | | | | | | Sabre Update to 2.1
| * | | | | Remove locks plugin.Thomas Müller2015-02-253-175/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reasoning: - a WebDAV server is not required to implement locking support - WebDAV Locking is know to break the sync algorithm - the current lock implementation is known to be broken (locks are not moved if a file is moved, locks on shared files don't work)
| * | | | | Show a empty response for GET on non-files instead of the Browser PluginLukas Reschke2015-02-232-1/+45
| | | | | |
| * | | | | Removed broken webdav testsVincent Petry2015-02-231-272/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The encryption webdav tests are too broad and do not qualify as unit test. Also, since the sabre upgrade they are not fixable. The matching functionality is already tested in other classes on a smaller scale.
| * | | | | Sabre Update to 2.1Vincent Petry2015-02-2339-1355/+1534
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - VObject fixes for Sabre\VObject 3.3 - Remove VObject property workarounds - Added prefetching for tags in sabre tags plugin - Moved oc_properties logic to separate PropertyStorage backend (WIP) - Fixed Sabre connector namespaces - Improved files plugin to handle props on-demand - Moved allowed props from server class to files plugin - Fixed tags caching for files that are known to have no tags (less queries) - Added/fixed unit tests for Sabre FilesPlugin, TagsPlugin - Replace OC\Connector\Sabre\Request with direct call to httpRequest->setUrl() - Fix exception detection in DAV client when using Sabre\DAV\Client - Added setETag() on Node instead of using the static FileSystem - Also preload tags/props when depth is infinity
* | | | | | Merge pull request #14213 from ↵Vincent Petry2015-02-253-12/+115
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | AW-UC/naturalsort_defaultcollator-patch-file-sorting Update naturalsort_defaultcollator.php. Fixes #13982
| * | | | | | Add PHPunit test for DefaultCollatorAW-UC2015-02-241-9/+95
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This extends Test_NaturalSort to include a basic test for \OC\NaturalSort_DefaultCollator()
| * | | | | | Fix sorting for files that only differ in case.AW-UC2015-02-241-5/+8
| | | | | | |
| * | | | | | Add constructor to inject collatorAW-UC2015-02-201-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Adding the possibility for instantiating \OC\NaturalSort with an injected collator. This makes the use of a specific collator enforcable.
| * | | | | | provide case-insensitive natural sortingAW-UC2015-02-181-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes OC's naturalsort_defaultcollator case-insensitive
* | | | | | | Merge pull request #14471 from owncloud/always-load-authentication-appsThomas Müller2015-02-241-3/+4
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Always load authentication apps
| * | | | | | | Always load authentication appsLukas Reschke2015-02-241-3/+4
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The current code path may trigger situations where the LDAP application is not yet loaded and thus problems with the authentication appeared. In previous versions of ownCloud the authentication mechanism manually loaded these apps which is why this affects ownCloud 8 and master only for my knowledge. (certainly not 6, maybe 7) Backport to 8 might be something to consider. Fixes https://github.com/owncloud/core/issues/14469
* / | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-02-25222-320/+176
|/ / / / / /
* | | | | | Merge pull request #14068 from owncloud/autotest-external-sftpThomas Müller2015-02-243-4/+105
|\ \ \ \ \ \ | | | | | | | | | | | | | | [files_external] sftp tests
| * | | | | | [files_external] sftp testsMorris Jobke2015-02-103-4/+105
| | | | | | |
* | | | | | | Merge pull request #13740 from owncloud/fix-12190-2Lukas Reschke2015-02-245-26/+85
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Include primary groups in user and login filter when restricting group access and also fix user counting in primary groups
| * | | | | | | and escape the search termArthur Schiwon2015-01-293-1/+5
| | | | | | | |
| * | | | | | | :lipstick:Arthur Schiwon2015-01-281-4/+4
| | | | | | | |
| * | | | | | | fix counting of users in primary groupArthur Schiwon2015-01-282-24/+69
| | | | | | | |
| * | | | | | | inlcude AD primary group in user filter, if a group is selected. fixes #12190Arthur Schiwon2015-01-281-2/+12
| | |_|_|/ / / | |/| | | | |
* | | | | | | Merge pull request #14400 from owncloud/fix-cron-deadlockLukas Reschke2015-02-242-46/+41
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Use flock instead of just checking if there is a file to prevent deadloc...
| * | | | | | | use flock instead of just checking if there is a file to prevent deadlocks ↵Bernhard Posselt2015-02-242-46/+41
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | when the process crashed or the unlink wasnt done move cron.lock into top directory to prevent external storage issues use tmp directory lock file use new config interface incorporate #13770 add dots
* | | | | | | Merge pull request #14195 from ↵Lukas Reschke2015-02-244-107/+151
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/activity-manager-performance-improvements Activity manager performance improvements
| * | | | | | | Fix test with the invalid filter check being addedJoas Schilling2015-02-131-43/+45
| | | | | | | |
| * | | | | | | Order methods to by grouped by their taskJoas Schilling2015-02-133-74/+74
| | | | | | | |
| * | | | | | | Check whether filter is valid, before doing stuff for itJoas Schilling2015-02-131-1/+12
| | | | | | | |
| * | | | | | | Cache some values from the extensionsJoas Schilling2015-02-131-0/+31
| | | | | | | |
* | | | | | | | Merge pull request #14282 from owncloud/disable-non-shipped-apps-masterThomas Müller2015-02-247-85/+115
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 3rd-party apps are disabled on upgrade
| * | | | | | | | print app upgrade information to console as wellThomas Müller2015-02-241-0/+6
| | | | | | | | |
| * | | | | | | | 3rd-party apps are only disabled in case core is upgradedThomas Müller2015-02-241-0/+14
| | | | | | | | |
| * | | | | | | | shipped and 3rd-party apps of type authentication and session will remain ↵Thomas Müller2015-02-241-3/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | enabled during update
| * | | | | | | | 3rd-party apps are disabled on upgrade - refs #14026Thomas Müller2015-02-247-85/+87
| | | | | | | | |
* | | | | | | | | Merge pull request #14461 from owncloud/fix-code-that-never-workedThomas Müller2015-02-241-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Fix code that never worked