summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #14468 from owncloud/af-db-cleanupThomas Müller2015-02-2510-73/+262
|\ | | | | Clean up AppFramework database layer
| * remove IDb interface from core class usageBernhard Posselt2015-02-253-5/+5
| |
| * owncloud -> ownCloudThomas Müller2015-02-252-3/+3
| |
| * deprecate getters for deprecated classBernhard Posselt2015-02-252-2/+3
| |
| * fix tabs and spacesBernhard Posselt2015-02-251-119/+119
| |
| * fix mappertestutilityBernhard Posselt2015-02-251-116/+120
| |
| * use IDBConnection and close cursors after insert/update/deleteBernhard Posselt2015-02-253-53/+58
| |
| * migrate to IDBConnectionBernhard Posselt2015-02-253-12/+191
|/
* Merge pull request #14494 from owncloud/fix-oracle-masterLukas Reschke2015-02-251-41/+33
|\ | | | | using Doctrine\DBAL\Connection::executeUpdate()
| * using Doctrine\DBAL\Connection::executeUpdate()Thomas Müller2015-02-251-41/+33
| |
* | Merge pull request #14509 from owncloud/fix/14231Lukas Reschke2015-02-251-1/+7
|\ \ | | | | | | Show 404 page when accessing empty share URL
| * | 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 #14508 from owncloud/tagmanager-nouserVincent Petry2015-02-252-0/+15
|\ \ \ | | | | | | | | Return null when requesting tags for null user
| * | | Return null when requesting tags for null userVincent Petry2015-02-252-0/+15
| |/ / | | | | | | | | | | | | The TagManager->load() now returns null if the user is not authenticated instead of failing with an error.
* | | Merge pull request #14490 from owncloud/remove-unused-deprecated-codeClark Tomlinson2015-02-251-10/+0
|\ \ \ | | | | | | | | Remove unused and deprecated Code
| * | | Remove unused and deprecated CodeLukas Reschke2015-02-251-10/+0
| | |/ | |/| | | | | | | Function is not used anymore anywhere in the code base: https://github.com/search?q=user%3Aowncloud+secureRNGAvailable&type=Code&utf8=%E2%9C%93
* | | Merge pull request #14245 from cmeh/masterLukas Reschke2015-02-253-7/+7
|\ \ \ | |_|/ |/| | Message clean-up
| * | Typo: Missing "n"cmeh2015-02-241-1/+1
| | | | | | | | | A missing "n" was added in line 63.
| * | Cleaning-up messagescmeh2015-02-181-3/+3
| | | | | | | | | | | | | | | | | | **Changes:** * In line 103, the middle "c" of "owncloud" is capitalised to "ownCloud". * A space is inserted between value and unit in lines 177 and 187 ("4 GB" instead of "4GB").
| * | Update setupchecks.jscmeh2015-02-161-1/+1
| | | | | | | | | Changed *"won't work"* to "will not work" (as proposed by @DeepDiver1975).
| * | Message clean-upcmeh2015-02-161-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | *Changes:* * "… is not yet properly setup" in line 24 is changed to " … is not yet set up properly" (better word order and space in the middle of "set up", as it is a participle of the verb "to set up"). * "internet" is corrected to "Internet" with a capitalized "I" in lines 54 and 59. * Also in line 54: "3rd party" is changed to "third-party" to for a more coherent spelling across the different ownCloud components. * "… apps don´t work" is corrected to "… apps won't work" (with a proper (and hopefully correctly escaped) (apostrophe)[http://en.wikipedia.org/wiki/Apostrophe#Typographic_form] instead of the (acute accent)[http://en.wikipedia.org/wiki/Acute_accent]). * Still in line 54: The negation is corrected from "… might also not work" to "… might not work, either".
* | | 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
|/ / / / / / /