Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #7879 from owncloud/sharing_cleanup_public_api | Vincent Petry | 2014-03-28 | 1 | -1695/+49 |
|\ | | | | | sharing api cleanup, first step | ||||
| * | remove prepFileTarget() seems that it is no longer in use | Bjoern Schiessle | 2014-03-25 | 1 | -9/+0 |
| | | |||||
| * | add a "helper" and a "hooks" class. Move constants needed by multiple classes | Bjoern Schiessle | 2014-03-25 | 1 | -49/+1 |
| | | | | | | | | to a "constants" class | ||||
| * | added private share api | Bjoern Schiessle | 2014-03-25 | 1 | -1647/+58 |
| | | |||||
* | | Merge pull request #7864 from owncloud/routing-performance | Thomas Müller | 2014-03-25 | 1 | -3/+1 |
|\ \ | |/ |/| | Routing performance | ||||
| * | Only load routes from the apps we need | Robin Appelman | 2014-03-24 | 1 | -1/+1 |
| | | |||||
| * | Load the routes when matching or generating a route instead of when creating ↵ | Robin Appelman | 2014-03-24 | 1 | -2/+0 |
| | | | | | | | | the router | ||||
* | | use \OC_Mail::validateAddress() to validate the email address - fixes #7862 | Thomas Müller | 2014-03-24 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords | Lukas Reschke | 2014-03-20 | 1 | -0/+9 |
|\ | | | | | Obfuscate passwords in ext storage config | ||||
| * | Added IV for ext storage password encryption | Vincent Petry | 2014-03-19 | 1 | -0/+9 |
| | | |||||
* | | Merge pull request #7818 from owncloud/logException_undefined_variable | Morris Jobke | 2014-03-20 | 1 | -5/+2 |
|\ \ | | | | | | | Fix 'Undefined variable: message' in OCP\Util::logException | ||||
| * | | Fix 'Undefined variable: message' in OCP\Util::logException | Thomas Tanghus | 2014-03-20 | 1 | -5/+2 |
| |/ | |||||
* | | Merge branch 'master' into close-session-faster-master | Thomas Müller | 2014-03-17 | 5 | -3/+166 |
|\| | |||||
| * | Merge pull request #7649 from owncloud/routing-public | Thomas Müller | 2014-03-17 | 4 | -1/+157 |
| |\ | | | | | | | Move routing classes to an interface and expose it in the public api | ||||
| | * | update copyright header | Robin Appelman | 2014-03-10 | 1 | -1/+1 |
| | | | |||||
| | * | Move the router classes to a namespace and expose it with a public interface | Robin Appelman | 2014-03-10 | 4 | -1/+157 |
| | | | |||||
| * | | finally fix the paths for the OCS Share API | Bjoern Schiessle | 2014-03-13 | 1 | -2/+4 |
| | | | |||||
| * | | fix path creation for re-shares, issue #7662 | Bjoern Schiessle | 2014-03-11 | 1 | -2/+7 |
| |/ | |||||
* / | adding an explicit close method to class session - write operations (set and ↵ | Thomas Müller | 2014-03-10 | 1 | -0/+5 |
|/ | | | | remove) being called after close() will throw an exception | ||||
* | Fix FileInfo->getType errors | Robin Appelman | 2014-03-07 | 1 | -1/+1 |
| | |||||
* | fix path in sharing results if it is a file in the Shared folder | Bjoern Schiessle | 2014-02-25 | 1 | -1/+15 |
| | |||||
* | Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix | Lukas Reschke | 2014-02-20 | 2 | -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.php | Vincent Petry | 2014-02-18 | 2 | -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-Fixes | Scrutinizer Auto-Fixer | 2014-02-19 | 10 | -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_patches | Thomas Müller | 2014-02-18 | 6 | -11/+137 |
|\| | | | | | | | | | Conflicts: lib/private/migration/content.php | ||||
| * | Merge pull request #7176 from owncloud/style | Lukas Reschke | 2014-02-18 | 2 | -4/+4 |
| |\ | | | | | | | Some style fixes | ||||
| | * | $default of OC_Config::[gs]etValue can have more then string as type | Bart Visscher | 2014-02-12 | 2 | -4/+4 |
| | | | |||||
| * | | Merge pull request #7156 from owncloud/backgroundjob-public | Thomas Müller | 2014-02-14 | 4 | -7/+133 |
| |\ \ | | | | | | | | | Add the background job list to the public server container | ||||
| | * | | Additional phpdoc | Robin Appelman | 2014-02-12 | 2 | -4/+27 |
| | | | | |||||
| | * | | Remove internal methods from the public interface | Robin Appelman | 2014-02-12 | 1 | -7/+1 |
| | | | | |||||
| | * | | Merge branch 'master' into backgroundjob-public | Robin Appelman | 2014-02-12 | 1 | -0/+11 |
| | |\ \ | |||||
| | * | | | Add the background job list to the public server container | Robin Appelman | 2014-02-11 | 4 | -7/+116 |
| | | |/ | | |/| | |||||
* | | | | Merge branch 'master' into scrutinizer_documentation_patches | Thomas Müller | 2014-02-14 | 6 | -5/+253 |
|\| | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/appconfig.php | ||||
| * | | | Merge pull request #6748 from owncloud/fileinfo | icewind1991 | 2014-02-14 | 2 | -1/+139 |
| |\ \ \ | | | | | | | | | | | Add a FileInfo class which holds all info of a file ... | ||||
| | * \ \ | merge master into fileinfo | Robin Appelman | 2014-01-29 | 3 | -7/+61 |
| | |\ \ \ | |||||
| | * | | | | Add isReadable, isUpdateable, isDeletable, isShareable | Robin Appelman | 2014-01-24 | 1 | -0/+28 |
| | | | | | | |||||
| | * | | | | Merge branch 'master' into fileinfo | Robin Appelman | 2014-01-17 | 1 | -1/+9 |
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/files/cache/cache.php | ||||
| | * | | | | | remove ArrayAccess, JsonSerializable from the public part of FileInfo | Robin Appelman | 2014-01-13 | 1 | -15/+5 |
| | | | | | | | |||||
| | * | | | | | Extends phpdoc for \OCP\File\FileInfo | Robin Appelman | 2014-01-13 | 1 | -4/+37 |
| | | | | | | | |||||
| | * | | | | | Add a FileInfo class which holds all info of a file and return that from ↵ | Robin Appelman | 2014-01-13 | 2 | -1/+88 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | getFileInfo, getDirectoryContent and search | ||||
| * | | | | | | Merge pull request #4624 from owncloud/convert-oc_appconfig | Thomas Müller | 2014-02-13 | 2 | -0/+98 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Convert OC_Appconfig to object interface | ||||
| | * \ \ \ \ \ | Merge branch 'master' into convert-oc_appconfig | Robin Appelman | 2014-02-11 | 1 | -1/+1 |
| | |\ \ \ \ \ \ | | | | |_|_|/ / | | | |/| | | | | |||||
| | * | | | | | | use the 'new' server container for appconfig | Robin Appelman | 2014-02-07 | 60 | -1128/+2709 |
| | |\ \ \ \ \ \ | |||||
| * | \ \ \ \ \ \ | Merge pull request #6964 from owncloud/storagestatistics-reuse | icewind1991 | 2014-02-12 | 1 | -3/+4 |
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | ||||
| | * | | | | | | | Merge branch 'master' into storagestatistics-reuse | Robin Appelman | 2014-02-10 | 1 | -1/+1 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | * | | | | | | | merge master into storagestatistics-reuse | Robin Appelman | 2014-02-05 | 3 | -2/+60 |
| | |\ \ \ \ \ \ \ | | | | |_|/ / / / | | | |/| | | | | | |||||
| | * | | | | | | | Reuse the calculated free_space in buildFileStorageStatistics | Robin Appelman | 2014-01-27 | 1 | -3/+4 |
| | | | | | | | | | |||||
| * | | | | | | | | Merge pull request #7075 from owncloud/quota-storagexsendfile | Vincent Petry | 2014-02-11 | 1 | -0/+11 |
| |\ \ \ \ \ \ \ \ | | |_|_|/ / / / / | |/| | | | | | | | Added isLocal() method to storage, used for xsendfile | ||||
| | * | | | | | | | Added isLocal() method to storage, used for xsendfile | Vincent Petry | 2014-02-06 | 1 | -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 enabled | Bjoern Schiessle | 2014-02-07 | 1 | -1/+1 |
| |/ / / / / / |