| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge pull request #19605 from owncloud/add-get-http-protocol | Thomas Müller | 2015-10-06 | 2 | -0/+29 |
|\ |
|
| * | Add \OCP\IRequest::getHttpProtocol | Lukas Reschke | 2015-10-06 | 2 | -0/+29 |
* | | OC_Log not longer exists | Thomas Müller | 2015-10-06 | 1 | -1/+1 |
|/ |
|
* | Merge pull request #19407 from owncloud/lock-zip-content | Thomas Müller | 2015-10-06 | 2 | -84/+135 |
|\ |
|
| * | Refactor single file download into it's own method | Thomas Müller | 2015-10-05 | 1 | -76/+71 |
| * | Recursively lock folder contents | Thomas Müller | 2015-10-05 | 1 | -6/+27 |
| * | release locks in case of exception | Thomas Müller | 2015-10-05 | 1 | -0/+2 |
| * | log the exception during zip creation | Thomas Müller | 2015-10-05 | 1 | -13/+26 |
| * | Lock files which are zipped | Thomas Müller | 2015-10-05 | 1 | -6/+26 |
| * | Clean PHPDoc | Thomas Müller | 2015-10-05 | 1 | -6/+6 |
* | | Merge pull request #19597 from owncloud/update-license-headers | Thomas Müller | 2015-10-06 | 127 | -82/+167 |
|\ \ |
|
| * | | deduplicate @xenopathic | Morris Jobke | 2015-10-06 | 21 | -21/+13 |
| * | | update licence headers via script | Morris Jobke | 2015-10-05 | 125 | -79/+172 |
| |/ |
|
* | | Merge pull request #19577 from owncloud/share-donotreturnentrieswhenusernotin... | Thomas Müller | 2015-10-06 | 1 | -0/+6 |
|\ \ |
|
| * | | Remove invalid share items from result when missing group membership | Vincent Petry | 2015-10-05 | 1 | -0/+6 |
| |/ |
|
* | | Merge pull request #19530 from owncloud/issue-13213-sharing-conflict-when-sha... | Thomas Müller | 2015-10-06 | 1 | -1/+3 |
|\ \ |
|
| * | | Make sure all variables are defined | Joas Schilling | 2015-10-05 | 1 | -0/+2 |
| * | | Make sure the share we found is for the same item | Joas Schilling | 2015-10-05 | 1 | -1/+1 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-06 | 4 | -4/+8 |
* | | | use a normal rename when moving from the same storage in the encryption wrapper | Robin Appelman | 2015-10-05 | 1 | -0/+3 |
| |/
|/| |
|
* | | add some output to explain the pre-conditions for decrypt-all | Bjoern Schiessle | 2015-10-05 | 1 | -0/+3 |
|/ |
|
* | Merge pull request #19416 from owncloud/node-hook-connector | Thomas Müller | 2015-10-05 | 2 | -1/+156 |
|\ |
|
| * | pass view hooks trough to the node hooks | Robin Appelman | 2015-09-28 | 1 | -1/+5 |
| * | Add hook connector to connect view and node hooks | Robin Appelman | 2015-09-28 | 1 | -0/+151 |
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-04 | 2 | -20/+278 |
* | | Merge pull request #19545 from owncloud/fix-16908 | Thomas Müller | 2015-10-03 | 2 | -0/+3 |
|\ \ |
|
| * | | Add remark that $run is not supported anymore | Lukas Reschke | 2015-10-02 | 2 | -0/+3 |
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-03 | 4 | -4/+42 |
|/ / |
|
* | | Merge pull request #19272 from owncloud/mimetypes-enhanced | Thomas Müller | 2015-10-02 | 2 | -1/+53 |
|\ \ |
|
| * | | Added mimetype repair step | Roeland Jago Douma | 2015-10-02 | 1 | -0/+52 |
| * | | Allow recursive mimetype aliases | Robin McCorkell | 2015-10-02 | 1 | -1/+1 |
* | | | Merge pull request #19525 from owncloud/share-preventmovemountpointintoshared... | Robin Appelman | 2015-10-02 | 1 | -8/+29 |
|\ \ \
| |/ /
|/| | |
|
| * | | Prevent moving mount point into already shared folder (outgoing) | Vincent Petry | 2015-10-02 | 1 | -8/+29 |
* | | | Merge pull request #19533 from owncloud/free-space-inf | Robin Appelman | 2015-10-02 | 1 | -1/+1 |
|\ \ \ |
|
| * | | | Work around INF=0 on some shared hosts | Robin Appelman | 2015-10-02 | 1 | -1/+1 |
* | | | | [l10n] remove unused static methods | Morris Jobke | 2015-10-02 | 1 | -36/+3 |
|/ / / |
|
* | | | Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude | Thomas Müller | 2015-10-02 | 1 | -1/+6 |
|\ \ \ |
|
| * | | | save excluded groups in json format - fixes #10983 | Thomas Müller | 2015-10-01 | 1 | -1/+6 |
* | | | | Allow identifying whether the current item is the filtered one | Joas Schilling | 2015-10-02 | 2 | -0/+37 |
| |/ /
|/| | |
|
* | | | Merge pull request #19505 from owncloud/returnfloatforquota | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -2/+2 |
|\ \ \ |
|
| * | | | always return float, update doc | Jörn Friedrich Dreyer | 2015-10-01 | 1 | -2/+2 |
* | | | | Merge pull request #19480 from owncloud/fix-l10n | Jörn Friedrich Dreyer | 2015-10-02 | 1 | -14/+5 |
|\ \ \ \ |
|
| * | | | | Fix l10n on master | Morris Jobke | 2015-09-30 | 1 | -14/+5 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-02 | 2 | -0/+2 |
* | | | | | Merge pull request #19463 from owncloud/fix_18132 | Thomas Müller | 2015-10-01 | 1 | -2/+24 |
|\ \ \ \ \ |
|
| * | | | | | versions should always use the keys of the original file, no need to create n... | Bjoern Schiessle | 2015-10-01 | 1 | -2/+24 |
* | | | | | | Add tests | Robin Appelman | 2015-10-01 | 1 | -1/+1 |
* | | | | | | stricter check if thumbnail is cached | Robin Appelman | 2015-10-01 | 1 | -7/+4 |
* | | | | | | to much copy paste | Robin Appelman | 2015-10-01 | 1 | -5/+3 |
* | | | | | | use cache data we already have to check if a thumbnail of specific size is ca... | Robin Appelman | 2015-10-01 | 1 | -1/+24 |