Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #12546 from oparoz/patch-1 | Björn Schießle | 2015-06-22 | 1 | -21/+31 |
|\ | |||||
| * | Remove unneeded returns from private cropping methods | Olivier Paroz | 2015-06-19 | 1 | -16/+12 |
| * | 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 | 1 | -4/+25 |
| * | 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 | 1 | -2/+4 |
|\ \ | |||||
| * | | 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 | 1 | -1/+2 |
* | | | Merge pull request #17056 from owncloud/appframework-type-cast | Bernhard Posselt | 2015-06-22 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Allow multiple whitespace in type hints in AppFramework | Robin McCorkell | 2015-06-20 | 1 | -1/+1 |
* | | | | Merge pull request #17052 from owncloud/fix-phpdoc-groupmgm | Robin McCorkell | 2015-06-21 | 2 | -2/+2 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Use proper type | Lukas Reschke | 2015-06-19 | 2 | -2/+2 |
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-20 | 2 | -0/+6 |
|/ / / | |||||
* | | | Merge pull request #17041 from owncloud/ocp-since-checker | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
|\ \ \ | |||||
| * | | | Fix missing @since tags in OCP | Morris Jobke | 2015-06-19 | 9 | -1/+28 |
* | | | | Fix naming of param in private/server.php | Morris Jobke | 2015-06-19 | 1 | -5/+5 |
|/ / / | |||||
* | | | Merge pull request #16889 from owncloud/group-sorting-fixes | Joas Schilling | 2015-06-19 | 2 | -0/+27 |
|\ \ \ | |||||
| * | | | Do not return backends but add a method to check for one | Joas Schilling | 2015-06-16 | 2 | -5/+19 |
| * | | | Only sort by group name when LDAP is involved | Joas Schilling | 2015-06-16 | 2 | -0/+13 |
* | | | | Merge pull request #16963 from owncloud/fileinfo-lock | Vincent Petry | 2015-06-18 | 3 | -29/+57 |
|\ \ \ \ | |||||
| * | | | | 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 |
|\ \ \ \ \ | |||||
| * | | | | | 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 |
| |/ / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-18 | 2 | -0/+10 |
* | | | | | Fix return value for OCP PHPDoc | Morris Jobke | 2015-06-17 | 2 | -2/+2 |
|/ / / / | |||||
* | | | | Merge pull request #16988 from owncloud/fix-avatar-fail | Vincent Petry | 2015-06-17 | 1 | -0/+24 |
|\ \ \ \ | |||||
| * | | | | Fix PHPDoc annotations | Lukas Reschke | 2015-06-17 | 1 | -0/+24 |
* | | | | | Merge pull request #16985 from owncloud/fix-public-api-phpdoc | Thomas Müller | 2015-06-17 | 1 | -2/+2 |
|\ \ \ \ \ | |||||
| * | | | | | Fix OCP PHPDoc | Morris Jobke | 2015-06-17 | 1 | -2/+2 |
| |/ / / / | |||||
* | | | | | Merge pull request #16729 from owncloud/scanner-read-lock | Thomas Müller | 2015-06-17 | 3 | -13/+27 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | ensure normalized path form when changing locks | Robin Appelman | 2015-06-15 | 1 | -0/+1 |
| * | | | | properly unlock in case of failed fopen | Robin Appelman | 2015-06-15 | 1 | -2/+2 |
| * | | | | keep a read lock while scanning a file or folder | Robin Appelman | 2015-06-15 | 3 | -12/+25 |
* | | | | | Normalize path in View's lock methods | Vincent Petry | 2015-06-16 | 1 | -4/+5 |
* | | | | | Merge pull request #16892 from owncloud/lock-returnfullpath | Vincent Petry | 2015-06-16 | 2 | -13/+63 |
|\ \ \ \ \ | |||||
| * | | | | | Rethrow LockedException with full path | Vincent Petry | 2015-06-16 | 2 | -13/+63 |
* | | | | | | Merge pull request #16856 from owncloud/issue-15851-fetch-updates-after-page-... | Lukas Reschke | 2015-06-16 | 1 | -2/+4 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Load the update information asyncroniously to fix the page load speed | Joas Schilling | 2015-06-10 | 1 | -2/+4 |
* | | | | | | Merge pull request #16832 from owncloud/memcache-fail | Joas Schilling | 2015-06-16 | 2 | -2/+19 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Throw exception if memcache misconfigured or missing | Vincent Petry | 2015-06-12 | 2 | -2/+19 |
* | | | | | | | Merge pull request #16943 from owncloud/sabre-convertinvalidpath | Joas Schilling | 2015-06-16 | 1 | -1/+5 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Convert invalid path exception to sabre exception on MOVE | Vincent Petry | 2015-06-15 | 1 | -1/+5 |
| | |_|/ / / / | |/| | | | | | |||||
* | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-16 | 4 | -2/+150 |
* | | | | | | | Add `no-store` to AppFramework | Lukas Reschke | 2015-06-15 | 1 | -1/+1 |