summaryrefslogtreecommitdiffstats
path: root/lib/public
Commit message (Collapse)AuthorAgeFilesLines
* fix path creation for re-shares, issue #7662Bjoern Schiessle2014-03-111-2/+7
|
* Fix FileInfo->getType errorsRobin Appelman2014-03-071-1/+1
|
* fix path in sharing results if it is a file in the Shared folderBjoern Schiessle2014-02-251-1/+15
|
* Merge pull request #6714 from owncloud/files-newfileinvalidcharsfixLukas Reschke2014-02-202-0/+12
|\ | | | | Added extra checks for invalid file chars in newfile.php and newfolder.php
| * Added extra checks for invalid file chars in newfile.php and newfolder.phpVincent Petry2014-02-182-0/+12
| | | | | | | | | | | | | | - added PHP utility function to check for file name validity - fixes issue where a user can create a file called ".." from the files UI - added extra checks to make sure newfile.php and newfolder.php also check for invalid characters
* | Scrutinizer Auto-FixesScrutinizer Auto-Fixer2014-02-1910-11/+31
| | | | | | | | | | | | | | | | | | | | | | This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend
* | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-186-11/+137
|\| | | | | | | | | Conflicts: lib/private/migration/content.php
| * Merge pull request #7176 from owncloud/styleLukas Reschke2014-02-182-4/+4
| |\ | | | | | | Some style fixes
| | * $default of OC_Config::[gs]etValue can have more then string as typeBart Visscher2014-02-122-4/+4
| | |
| * | Merge pull request #7156 from owncloud/backgroundjob-publicThomas Müller2014-02-144-7/+133
| |\ \ | | | | | | | | Add the background job list to the public server container
| | * | Additional phpdocRobin Appelman2014-02-122-4/+27
| | | |
| | * | Remove internal methods from the public interfaceRobin Appelman2014-02-121-7/+1
| | | |
| | * | Merge branch 'master' into backgroundjob-publicRobin Appelman2014-02-121-0/+11
| | |\ \
| | * | | Add the background job list to the public server containerRobin Appelman2014-02-114-7/+116
| | | |/ | | |/|
* | | | Merge branch 'master' into scrutinizer_documentation_patchesThomas Müller2014-02-146-5/+253
|\| | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php
| * | | Merge pull request #6748 from owncloud/fileinfoicewind19912014-02-142-1/+139
| |\ \ \ | | | | | | | | | | Add a FileInfo class which holds all info of a file ...
| | * \ \ merge master into fileinfoRobin Appelman2014-01-293-7/+61
| | |\ \ \
| | * | | | Add isReadable, isUpdateable, isDeletable, isShareableRobin Appelman2014-01-241-0/+28
| | | | | |
| | * | | | Merge branch 'master' into fileinfoRobin Appelman2014-01-171-1/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php
| | * | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfoRobin Appelman2014-01-131-15/+5
| | | | | | |
| | * | | | | Extends phpdoc for \OCP\File\FileInfoRobin Appelman2014-01-131-4/+37
| | | | | | |
| | * | | | | Add a FileInfo class which holds all info of a file and return that from ↵Robin Appelman2014-01-132-1/+88
| | | | | | | | | | | | | | | | | | | | | | | | | | | | getFileInfo, getDirectoryContent and search
| * | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfigThomas Müller2014-02-132-0/+98
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Convert OC_Appconfig to object interface
| | * \ \ \ \ \ Merge branch 'master' into convert-oc_appconfigRobin Appelman2014-02-111-1/+1
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | |
| | * | | | | | use the 'new' server container for appconfigRobin Appelman2014-02-0760-1128/+2709
| | |\ \ \ \ \ \
| * | \ \ \ \ \ \ Merge pull request #6964 from owncloud/storagestatistics-reuseicewind19912014-02-121-3/+4
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Reuse the calculated free_space in buildFileStorageStatistics
| | * | | | | | | Merge branch 'master' into storagestatistics-reuseRobin Appelman2014-02-101-1/+1
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | merge master into storagestatistics-reuseRobin Appelman2014-02-053-2/+60
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | |
| | * | | | | | | Reuse the calculated free_space in buildFileStorageStatisticsRobin Appelman2014-01-271-3/+4
| | | | | | | | |
| * | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfileVincent Petry2014-02-111-0/+11
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | Added isLocal() method to storage, used for xsendfile
| | * | | | | | | Added isLocal() method to storage, used for xsendfileVincent Petry2014-02-061-0/+11
| | | |/ / / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added isLocal() method to Storage to find out whether the storage is local or not. This method is used for the x-sendfile logic to find out whether to add the headers.
| * / | | | | | replace 'size' with 'unencrypted_size' if encryption is enabledBjoern Schiessle2014-02-071-1/+1
| |/ / / / / /
* | | | | | | Fix more documentation failesJoas Schilling2014-02-086-47/+38
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Issue #7111
* | | | | | | remove duplicate param lines for OCP\User::getUsers()Jörn Friedrich Dreyer2014-02-071-2/+0
| | | | | | |
* | | | | | | polish documentation based on scrutinizer patchesJörn Friedrich Dreyer2014-02-0624-43/+83
|/ / / / / /
* | | | | | Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msgJan-Christoph Borchardt2014-02-041-0/+19
|\ \ \ \ \ \ | | | | | | | | | | | | | | Change misleading message when file size exceeds upload limit
| * \ \ \ \ \ Merge branch 'master' into pr-exceed_upload_limit_msgPellaeon Lin2014-01-307-24/+114
| |\ \ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php
| * | | | | | Separate PHP upload limit and free spacePellaeon Lin2013-12-081-0/+19
| | | | | | |
* | | | | | | Merge pull request #6647 from owncloud/memcache-publicicewind19912014-02-042-0/+35
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Add Memcache to the public api
| * | | | | | Fix some phpdoc errors and rename interfaceRobin Appelman2014-01-242-4/+6
| | | | | | |
| * | | | | | Merge branch 'master' into memcache-publicRobin Appelman2014-01-222-6/+59
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into memcache-publicRobin Appelman2014-01-091-0/+9
| |\ \ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | |
| * | | | | | | Use $server->getMemCacheFactory() in ldap connectionRobin Appelman2014-01-091-0/+9
| | | | | | | |
| * | | | | | | Also update the OCP\IServerContainerRobin Appelman2014-01-081-3/+3
| | | | | | | |
| * | | | | | | get the memorycache factory from OCP\Server instead of a cache instanceRobin Appelman2014-01-081-0/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | this allows apps to specify a prefix to use
| * | | | | | | Remove the static dependency on OC_Util from MemcacheRobin Appelman2014-01-061-0/+7
| | | | | | | |
* | | | | | | | Merge pull request #6907 from owncloud/webdav-logexceptionsThomas Müller2014-01-271-2/+6
|\ \ \ \ \ \ \ \ | |_|_|_|_|/ / / |/| | | | | | | Added exception logger plugin for sabre connector
| * | | | | | | Added exception logger plugin for sabre connectorVincent Petry2014-01-271-2/+6
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever an exception occurs in the sabre connector code or code called by it, it will be logged. This plugin approach is needed because Sabre already catches exceptions to return them to the client in the XML response, so they don't appear logged in the web server log. This will make it much easier to debug syncing issues.
* | | | | | | added function documentationJens-Christian Fischer2014-01-241-0/+4
| | | | | | |
* | | | | | | Add 'mail_from_address' configurationJens-Christian Fischer2014-01-241-0/+1
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In environments where there are rules for the email addresses, the "from address" that owncloud uses has to be configurable. This patch adds a new configuration variable 'mail_from_address'. If it is configured, owncloud will use this as the sender of *all* emails. (OwnCloud uses 'sharing-noreply' and 'password-noreply' by default). By using the 'mail_from_address' configuration, only this email address will be used.