summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #11613 from owncloud/external-share-self-signed-stable7Lukas Reschke2014-10-161-0/+5
|\ \ \ \ | |_|_|/ |/| | | [stable7] Use certificate bundle from files_external for external shares
| * | | Use certificate bundle from files_external for external sharesRobin Appelman2014-10-161-0/+5
|/ / /
* | | 7.0.3 RC1v7.0.3RC1Frank Karlitschek2014-10-161-2/+2
| | |
* | | Add darwin to if blockLukas Reschke2014-10-151-1/+1
| | | | | | | | | | | | Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
* | | Merge pull request #11520 from owncloud/make-trash-objectstore-compatibleLukas Reschke2014-10-152-5/+23
|\ \ \ | | | | | | | | make trashbin compatible with objectstore
| * | | make trashbin compatible with objectstore, replace glob with search in ↵Jörn Friedrich Dreyer2014-10-102-5/+23
| | | | | | | | | | | | | | | | cache, make unknown free space work like unlimited free space
* | | | Use `rawurlencode` since this seems to be expected by cURLLukas Reschke2014-10-153-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405 Conflicts: tests/lib/largefilehelpergetfilesize.php
* | | | Merge pull request #11567 from owncloud/cache-updater-refactor-stable7Robin Appelman2014-10-158-466/+526
|\ \ \ \ | | | | | | | | | | [stable7] Refactor cache updater to work outside of the users home
| * | | | Remove explicit propagate callsRobin Appelman2014-10-142-19/+7
| | | | |
| * | | | remove unstable testRobin Appelman2014-10-141-1/+0
| | | | |
| * | | | Update cache before post hooksRobin Appelman2014-10-141-19/+20
| | | | |
| * | | | Fix warning in homecacheRobin Appelman2014-10-141-0/+3
| | | | |
| * | | | Fix unit testRobin Appelman2014-10-143-9/+6
| | | | |
| * | | | Improve unit tests for Cache\UpdaterRobin Appelman2014-10-142-281/+416
| | | | |
| * | | | Refactor Cache\Updater to work outside of the users homeRobin Appelman2014-10-144-174/+111
| | | | |
* | | | | Adding test helper to test private methodsClark Tomlinson2014-10-151-0/+28
| | | | |
* | | | | Allow specifying protocol in ext storage OC configVincent Petry2014-10-153-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allow specifying a protocol in the host field when mounting another ownCloud instance. Note that this was already possible with the WebDAV config but this bug made it inconsistent.
* | | | | Use body element when animating scroll in public pageVincent Petry2014-10-151-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the public page the scroll container is the window instead of a div. The $(window) object doesn't support animating the scroll property, so the $('body') element is used instead. Backport of 704ffaa6a37730f02a3359e8e8f0a0070f0e0d31 from master
* | | | | Merge pull request #11408 from owncloud/refactor-mailsettings-controllerThomas Müller2014-10-149-207/+532
|\ \ \ \ \ | |/ / / / |/| | | | Refactor MailSettings controller
| * | | | fixing typosThomas Müller2014-10-142-1/+2
| | | | |
| * | | | Refactor MailSettings controllerLukas Reschke2014-10-109-207/+531
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not store the password (fixes https://github.com/owncloud/core/issues/11385) - Refactor to AppFramework - Add unit tests
* | | | | Set overwritemailurl* configs on setupJoas Schilling2014-10-143-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly use overwritemailurl value when generating absolute urls in CLI Fix #11500 Rename the config to *cli Add overwrite.cli.url to the sample config Revert separator fix, fixes unit test Backport of 0407bc097895355b90bc722e8b58afb27a40d538 from master
* | | | | Close session when loading appsLukas Reschke2014-10-131-0/+1
| |_|_|/ |/| | | | | | | | | | | Otherwise the session is blocked while all remote apps are loaded. This can be very annoying especially when apps.owncloud.com is down or not reachable.
* | | | Retrieve storage numeric id earlier when still availableVincent Petry2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The numeric id is only available before the storage entry is deleted, so get it at that time. Backport of d485c0098d58454b8dbd25e574a363a500244942 from master
* | | | Revert "Set overwrite.cli.url configs on setup"Vincent Petry2014-10-133-15/+7
| | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 48a1e69f5e803d61edcd7d083fd8e794f5bf194d. This was backported too quickly.
* | | | improved unit testsBjoern Schiessle2014-10-131-4/+8
| | | |
* | | | always take unencrypted sizeBjoern Schiessle2014-10-131-2/+2
| | | |
* | | | Set overwrite.cli.url configs on setupJoas Schilling2014-10-133-7/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Correctly use overwrite.cli.url value when generating absolute urls in CLI Fix #11500 Backport and squash of the following from master, in order: - f0fcaff9b957f1e6c04f9bfd9b8e0eb84f78bbf8 - 923de0afd9a7e717a5e1d25747caf4840633db25 - a487ce76e86940c94801da6157bcf70ed4005c1f - bd3ebdbd135b30946fdf55b41b5e96497d0c3e4a
* | | | distinguish between file dependent shares and other sharesBjoern Schiessle2014-10-131-2/+3
| | | |
* | | | Fixed array detection on public downloadVincent Petry2014-10-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | When downloading a folder called "0001" PHP should fallback to parsing it as string and properly detect that it is not a JSON array. Backport of 6cbabdf217f55df3655143aa82b6e5e74650df05 from master
* | | | force loading of encryption appLukas Reschke2014-10-131-0/+3
| | | |
* | | | Log warning when no uid was found for userVincent Petry2014-10-101-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In some incomplete setups (like mine) it can happen that the uid attribute of users is missing. To be able to find out that something is wrong, a debug message is now logged when it has not been found. Backport of 59f9107dd9497d2eb9bd61f5eb8d893dd8fcb766 from master
* | | | make sure that we always delete oldest firstBjoern Schiessle2014-10-101-0/+3
| | | |
* | | | try to get path from filesystemBjoern Schiessle2014-10-101-0/+5
| | | |
* | | | fix performance issuesBjoern Schiessle2014-10-103-18/+208
| |/ / |/| |
* | | Prevent button click when enter key is pressed in LDAP wizardVincent Petry2014-10-103-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Pressing enter in the LDAP wizard will trigger a click on the first button. In the main page it would trigger the delete dialog, which is quite inconvenient. Added a type attribute to suppress this behavior. Backport of bb424802c8f6e8fd0e7fbe28e000400a5b0660f3 from master
* | | Merge pull request #11503 from owncloud/stable7-9753Lukas Reschke2014-10-102-1/+21
|\ \ \ | | | | | | | | Stable7 9753
| * | | Add beforeeach and aftereachLukas Reschke2014-10-091-4/+6
| | | |
| * | | Add unittest for filePathLukas Reschke2014-10-091-0/+18
| | | |
| * | | Remove special case for css in OC.filePathRobin Appelman2014-10-091-1/+1
| | | |
* | | | Urlencode file name before passing it to cURLTony Zelenoff2014-10-101-1/+2
| |/ / |/| | | | | | | | | | | | | | | | | | | | | | | Large file helper use cURL to determine file sizes. Thus filenames must be urlencoded in case special symbols like '#' can cause BadRequest errors. Signed-off-by: Tony Zelenoff <antonz@parallels.com> Backport of 2d03019c91ab8d07dfbfb1e54db86d0c4978ab9a from master
* | | Merge pull request #11505 from owncloud/stable7-ext-updateetagmountVincent Petry2014-10-107-1/+669
|\ \ \ | | | | | | | | Stable7 ext updateetagmount
| * | | Added PHP docs for etag propagatorVincent Petry2014-10-091-4/+17
| | | |
| * | | More phpdocRobin Appelman2014-10-091-0/+5
| | | |
| * | | Hookup the etag propagatorRobin Appelman2014-10-092-0/+17
| | | |
| * | | Add EtagPropagator to handle etag changes when external storages are changedRobin Appelman2014-10-092-0/+435
| | | |
| * | | Fix add/remove mountpoint hooksRobin Appelman2014-10-092-6/+8
| | | |
| * | | Expose getAppKeys trough \OCP\IConfigRobin Appelman2014-10-092-0/+32
| | | |
| * | | Added failing unit tests for mount config hooksVincent Petry2014-10-093-8/+147
| | | |
| * | | Added filesystem hooks for mount/unmount ext storageVincent Petry2014-10-091-1/+26
| | | |