Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #16940 from owncloud/ext-s3-touchmtimefix | Thomas Müller | 2015-06-22 | 1 | -8/+13 |
|\ | | | | | Properly set mtime on S3 for touch operation | ||||
| * | Properly set mtime on S3 for touch operation | Vincent Petry | 2015-06-15 | 1 | -8/+13 |
| | | | | | | | | | | | | | | | | | | The code was missing the "MetadataDirective". Once added, some other parts of the code failed because the format of mtime was wrong. So this PR uses the RFC format that the S3 library already uses. Additionally, the code path where mtime is null was missing. Now defaulting to the current time. | ||||
* | | Merge pull request #17068 from owncloud/fix_16878 | VicDeo | 2015-06-22 | 2 | -0/+6 |
|\ \ | | | | | | | fix search for results only from subfolder | ||||
| * | | remove whitespace on bottom when no search results, fix laylout, fix #16878 | Jan-Christoph Borchardt | 2015-06-22 | 2 | -2/+6 |
| | | | |||||
| * | | add filter-empty class if no search result in current folder | Bjoern Schiessle | 2015-06-22 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #12546 from oparoz/patch-1 | Björn Schießle | 2015-06-22 | 2 | -21/+51 |
|\ \ \ | | | | | | | | | Send the mime icon if we can't generate a preview | ||||
| * | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-19 | 2 | -20/+15 |
| | | | | |||||
| * | | | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-18 | 1 | -16/+6 |
| | | | | |||||
| * | | | Move media type icon preview creation to its own method | Olivier Paroz | 2015-06-18 | 2 | -4/+46 |
| | | | | |||||
| * | | | Send the mime icon if we can't generate a preview | Olivier Paroz | 2015-06-18 | 1 | -1/+4 |
| | | | | |||||
* | | | | Merge pull request #16657 from owncloud/view-emit-path | Thomas Müller | 2015-06-22 | 2 | -2/+33 |
|\ \ \ \ | | | | | | | | | | | emit hooks from a view as long as the path is inside the default root | ||||
| * | | | | fix check if hooks should be emited in runHooks | Robin Appelman | 2015-06-15 | 1 | -1/+2 |
| | | | | | |||||
| * | | | | emit hooks from a view as long as the path is inside the default root | Robin Appelman | 2015-06-02 | 2 | -1/+31 |
| | | | | | |||||
* | | | | | Merge pull request #17056 from owncloud/appframework-type-cast | Bernhard Posselt | 2015-06-22 | 2 | -1/+15 |
|\ \ \ \ \ | | | | | | | | | | | | | Allow multiple whitespace in type hints in AppFramework | ||||
| * | | | | | AppFramework annotation whitespace unit test | Robin McCorkell | 2015-06-21 | 1 | -0/+14 |
| | | | | | | |||||
| * | | | | | Allow multiple whitespace in type hints in AppFramework | Robin McCorkell | 2015-06-20 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Type hints such as `@param bool $doSomething` will now correctly get parsed, allowing for alignment of docblock parameters if the app developer so wishes. | ||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-22 | 4 | -4/+20 |
| | | | | | | |||||
* | | | | | | Merge pull request #17025 from owncloud/sftp-rmdir-emptydir | Robin McCorkell | 2015-06-21 | 2 | -1/+12 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Workaround for empty dir deletion for SFTP | ||||
| * | | | | | | Workaround for empty dir deletion for SFTP | Vincent Petry | 2015-06-18 | 2 | -1/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Explicitly clear the stat cache after deleting an empty folder to make sure it is properly detected as deleted in subsequent requests. This works around a problem with phpseclib where the folder is properly deleted remotely but the stat cache was not updated. | ||||
* | | | | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm | Robin McCorkell | 2015-06-21 | 2 | -2/+2 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Use proper type | ||||
| * | | | | | | | Use proper type | Lukas Reschke | 2015-06-19 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is a string | ||||
* | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-21 | 16 | -8/+96 |
| |_|/ / / / / |/| | | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 28 | -28/+172 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #17041 from owncloud/ocp-since-checker | Morris Jobke | 2015-06-19 | 11 | -1/+146 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add tool to check OCP for missing @since tag | ||||
| * | | | | | | move the OCPSinceChecker.php to build/ | Morris Jobke | 2015-06-19 | 2 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | Fix missing @since tags in OCP | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
| | | | | | | | |||||
| * | | | | | | Add tool to check OCP for missing @since tag | Morris Jobke | 2015-06-19 | 2 | -0/+118 |
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * gets executed in autotest.sh and fails if some PHPDoc is missing * doesn't check classes/methods that are marked as @deprecated * iterates over all .php files in lib/public | ||||
* | | | | | | Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload | Thomas Müller | 2015-06-19 | 1 | -0/+4 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [master] Verify if path exists | ||||
| * | | | | | | Verify if path exists | Lukas Reschke | 2015-06-18 | 1 | -0/+4 |
| | |/ / / / | |/| | | | | | | | | | | | | | | | | We need to check if the path exists and throw an error instead of handling this situation ungraciously. | ||||
* | | | | | | Merge pull request #17040 from owncloud/fix-param-naming | Thomas Müller | 2015-06-19 | 1 | -5/+5 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix naming of param in private/server.php | ||||
| * | | | | | | Fix naming of param in private/server.php | Morris Jobke | 2015-06-19 | 1 | -5/+5 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #17026 from owncloud/update-config.sample.php | Thomas Müller | 2015-06-19 | 1 | -1/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | [config.sample.php] set correct default value for skeletondirectory | ||||
| * | | | | | [config.sample.php] set correct default value for skeletondirectory | Morris Jobke | 2015-06-19 | 1 | -1/+1 |
| |/ / / / | |||||
* | | | | | Merge pull request #16889 from owncloud/group-sorting-fixes | Joas Schilling | 2015-06-19 | 7 | -11/+183 |
|\ \ \ \ \ | | | | | | | | | | | | | Only sort by group name when LDAP is involved | ||||
| * | | | | | Do not return backends but add a method to check for one | Joas Schilling | 2015-06-16 | 3 | -11/+23 |
| | | | | | | |||||
| * | | | | | Only sort by group name when LDAP is involved | Joas Schilling | 2015-06-16 | 7 | -11/+157 |
| | | | | | | |||||
| * | | | | | Always keep "Everyone" and "admin" at the top of the list | Joas Schilling | 2015-06-16 | 1 | -0/+14 |
| | | | | | | |||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-19 | 36 | -70/+36 |
| | | | | | | |||||
* | | | | | | Merge pull request #16963 from owncloud/fileinfo-lock | Vincent Petry | 2015-06-18 | 3 | -29/+57 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Acquire read lock when getting file or directory info | ||||
| * | | | | | | remove unneeded normalize | Robin Appelman | 2015-06-18 | 1 | -2/+0 |
| | | | | | | | |||||
| * | | | | | | unlock the file if the file doesnt exists | Robin Appelman | 2015-06-18 | 1 | -0/+2 |
| | | | | | | | |||||
| * | | | | | | use old cache data when locked | Robin Appelman | 2015-06-17 | 1 | -28/+49 |
| | | | | | | | |||||
| * | | | | | | handle locked exceptions when getting file/directory info in sabre | Robin Appelman | 2015-06-17 | 2 | -1/+8 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #17017 from owncloud/cache-update-write-lock | Vincent Petry | 2015-06-18 | 4 | -34/+47 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | update the file cache within the write lock | ||||
| * | | | | | | dont update the cache on rename fail | Robin Appelman | 2015-06-18 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | update noopscanner | Robin Appelman | 2015-06-18 | 1 | -3/+3 |
| | | | | | | | |||||
| * | | | | | | extends phpdoc | Robin Appelman | 2015-06-18 | 1 | -3/+4 |
| | | | | | | | |||||
| * | | | | | | update the file cache within the write lock | Robin Appelman | 2015-06-18 | 3 | -31/+43 |
| |/ / / / / | |||||
* | | | | | | Merge pull request #16692 from owncloud/add_social_media_buttons | Björn Schießle | 2015-06-18 | 11 | -6/+650 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Add social media buttons | ||||
| * | | | | | | add id to url | Bjoern Schiessle | 2015-06-18 | 2 | -7/+7 |
| | | | | | | |