summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* allow passing a stream to StreamResponseRobin Appelman2016-11-163-5/+10
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Improve isMounted to handle primary storage object storeRobin Appelman2016-11-162-2/+7
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* add amazon s3 objectstore backendRobin Appelman2016-11-162-0/+154
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* split testing of objectstoragestorage and objectstore implementationsRobin Appelman2016-11-165-177/+409
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* split off s3 connection logicRobin Appelman2016-11-162-100/+132
| | | | Signed-off-by: Robin Appelman <robin@icewind.nl>
* Merge pull request #2148 from nextcloud/add_autoloader_before_enablingRoeland Jago Douma2016-11-161-0/+2
|\ | | | | Add autoloader before enabling apps
| * Add autoloader before enabling appsRoeland Jago Douma2016-11-151-0/+2
| | | | | | | | | | | | | | Else apps that require already autoloading in the installer (files_antivius) die hard! Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2092 from nextcloud/activity-filter-apiJoas Schilling2016-11-1632-1076/+2410
|\ \ | | | | | | Better API for activity filters, settings and providers + Rich Object support
| * | Update the since version to 11.0.0Joas Schilling2016-11-1618-136/+136
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix integration testsJoas Schilling2016-11-163-14/+9
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Make sure they are always arraysJoas Schilling2016-11-161-6/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Remove the old activity extensionJoas Schilling2016-11-163-720/+0
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add back the support for the short translationsJoas Schilling2016-11-161-4/+68
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix InfoParser empty testsJoas Schilling2016-11-161-1/+6
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Fix activity manager testsJoas Schilling2016-11-164-53/+56
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Don't even try to combine when the subject is differentJoas Schilling2016-11-161-0/+5
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow combining eventsJoas Schilling2016-11-162-0/+30
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Provider for the files appJoas Schilling2016-11-165-0/+226
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to register ProvidersJoas Schilling2016-11-166-6/+104
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Add ROS and icon support to the eventsJoas Schilling2016-11-163-24/+278
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Validate the input into Event alreadyJoas Schilling2016-11-162-91/+215
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Register the settings of the files app via info.xmlJoas Schilling2016-11-167-20/+499
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to register settings/types via info.xmlJoas Schilling2016-11-166-31/+338
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move the favorites filter to IFilterJoas Schilling2016-11-166-94/+167
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Move files filter to IFilterJoas Schilling2016-11-163-15/+104
| | | | | | | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
| * | Allow to register activity filters via info.xmlJoas Schilling2016-11-167-76/+378
|/ / | | | | | | Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2145 from nextcloud/docs_to_comMorris Jobke2016-11-161-1/+1
|\ \ | | | | | | docs are on nc.com
| * | docs are on nc.comRoeland Jago Douma2016-11-151-1/+1
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | Merge pull request #2144 from nextcloud/fix_1303Morris Jobke2016-11-152-33/+29
|\ \ \ | |_|/ |/| | Do not cache version info in the session
| * | Fix testsRoeland Jago Douma2016-11-152-16/+9
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Do not cache version info in the sessionsRoeland Jago Douma2016-11-151-29/+32
| |/ | | | | | | | | | | | | | | | | If the session is cleared and closed for whatever reason the loadVersion will write to the session anyways. This will lead to an exception. This should fix #1303 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | Merge pull request #2137 from nextcloud/make-sure-tests-run-on-phpunit-4-againRoeland Jago Douma2016-11-155-5/+115
|\ \ | | | | | | Add a magic wrapper to allow phpunit4 to run the code again
| * | Add a magic wrapper from hell to allow phpunit4 to run the code againJoas Schilling2016-11-155-5/+115
| |/ | | | | | | | | | | | | Remove this once phpunit 5 is the lowest supported version, by reverting: https://github.com/nextcloud/server/pull/2137 Signed-off-by: Joas Schilling <coding@schilljs.com>
* | Merge pull request #2139 from nextcloud/increase-version-to-ELFMorris Jobke2016-11-1560-133/+141
|\ \ | | | | | | Use 11.0 instead 9.2
| * | @since 9.2.0 to @since 11.0.0Roeland Jago Douma2016-11-1535-101/+101
| | | | | | | | | | | | Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
| * | Endpoint is now 11.0.0Lukas Reschke2016-11-151-1/+1
| | | | | | | | | | | | Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Adjust previous fallbacksLukas Reschke2016-11-153-10/+18
| | | | | | | | | | | | | | | | | | 11.0 is 11 and not 9.2 anymore Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
| * | Use 11.0 instead 9.2Lukas Reschke2016-11-1521-21/+21
| |/ | | | | | | | | | | As discussed we're changing the version from 9.2 to 11.0 to make some more sense. Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | Merge pull request #2132 from nextcloud/federated-cloud-idRoeland Jago Douma2016-11-151-1/+1
|\ \ | |/ |/| specify Federated Cloud ID syntax
| * specify Federated Cloud ID syntaxJan-Christoph Borchardt2016-11-151-1/+1
|/ | | | Signed-off-by: Jan-Christoph Borchardt <hey@jancborchardt.net>
* [tx-robot] updated from transifexNextcloud bot2016-11-156-22/+26
|
* Merge pull request #2125 from nextcloud/downstream-26546Morris Jobke2016-11-151-3/+3
|\ | | | | Transfer ownership now returns exit code on error
| * Transfer ownership now returns exit code on error (#26546)Vincent Petry2016-11-141-3/+3
| |
* | Merge pull request #2119 from nextcloud/downstream-26555Roeland Jago Douma2016-11-141-1/+5
|\ \ | | | | | | disabling dropping on dragging objects temporarily
| * | disabling dropping on dragging objects temporarilyMichael Jobst2016-11-141-1/+5
| |/ | | | | | | better solution
* | Merge pull request #2117 from ↵Roeland Jago Douma2016-11-141-0/+3
|\ \ | | | | | | | | | | | | nextcloud/master-add-bruteforce-check-to-person-endpoint Add bruteforce checker to Person.php
| * | Add bruteforce checker to Person.phpLukas Reschke2016-11-141-0/+3
| | | | | | | | | | | | | | | | | | Also check for attempts on this endpoint Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
* | | Merge pull request #2084 from nextcloud/files_drop_avatars_disabledMorris Jobke2016-11-141-1/+1
|\ \ \ | | | | | | | | Fixes files_drop when avatars are disabled
| * | | Fixes files_drop when avatars are disabledRoeland Jago Douma2016-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | Fixes: #2080 Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
* | | | Merge pull request #2115 from nextcloud/oc_26527Roeland Jago Douma2016-11-141-15/+21
|\ \ \ \ | | | | | | | | | | Skip broken shares when transferring ownership (#26527)