Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-28 | 48 | -10/+142 |
* | Merge pull request #17214 from owncloud/fix-php-doc-user-interface | Lukas Reschke | 2015-06-27 | 6 | -50/+67 |
|\ | |||||
| * | Fix indentation | Lukas Reschke | 2015-06-27 | 1 | -15/+15 |
| * | Add missing annotations for parameters | Lukas Reschke | 2015-06-27 | 6 | -35/+52 |
* | | Merge pull request #17212 from owncloud/ocs-spec | Lukas Reschke | 2015-06-27 | 5 | -0/+298 |
|\ \ | |/ |/| | |||||
| * | Add endpoint with list of OCS providers | Lukas Reschke | 2015-06-27 | 5 | -0/+298 |
* | | Merge pull request #17163 from owncloud/update-licenses | Lukas Reschke | 2015-06-27 | 304 | -228/+631 |
|\ \ | |/ |/| | |||||
| * | add additional email address for Georg | Morris Jobke | 2015-06-25 | 1 | -0/+1 |
| * | update license headers and authors | Morris Jobke | 2015-06-25 | 302 | -227/+629 |
| * | [license script] sort names case insensitive | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
* | | Merge pull request #17206 from oparoz/bpg-media-type | Roeland Douma | 2015-06-27 | 1 | -0/+1 |
|\ \ | |||||
| * | | Adding BPG media type | Olivier Paroz | 2015-06-26 | 1 | -0/+1 |
* | | | Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-... | Lukas Reschke | 2015-06-27 | 2 | -0/+19 |
|\ \ \ | |||||
| * | | | add check if server returns a 500 and display error | Clark Tomlinson | 2015-06-26 | 2 | -0/+19 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-27 | 56 | -74/+72 |
* | | | Merge pull request #17202 from oparoz/repair-scan-signature | Joas Schilling | 2015-06-27 | 1 | -1/+1 |
|\ \ \ | |||||
| * | | | Signature of overriding method should match the parent | Olivier Paroz | 2015-06-26 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #17203 from owncloud/fix-share-autocomplete | Björn Schießle | 2015-06-26 | 1 | -0/+1 |
|\ \ \ | |||||
| * | | | fix z-index of share-autocomplete | Jan-Christoph Borchardt | 2015-06-26 | 1 | -0/+1 |
| |/ / | |||||
* | | | Merge pull request #17071 from owncloud/share-get-users-non-existing | Vincent Petry | 2015-06-26 | 1 | -2/+2 |
|\ \ \ | |/ / |/| | | |||||
| * | | fix getUsersSharingFile with locking | Robin Appelman | 2015-06-26 | 1 | -2/+2 |
* | | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-file | Thomas Müller | 2015-06-26 | 2 | -10/+24 |
|\ \ \ | |||||
| * | | | Correctly check if the real file exists, otherwise try the part file | Joas Schilling | 2015-06-26 | 2 | -10/+24 |
* | | | | Merge pull request #17008 from owncloud/fix-17006 | Björn Schießle | 2015-06-26 | 7 | -49/+152 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Use \OC\HintException and translate the hint | Joas Schilling | 2015-06-22 | 8 | -35/+46 |
| * | | | Merge spliteUserRemote with fixRemoteUrlInShareWith | Joas Schilling | 2015-06-22 | 3 | -74/+75 |
| * | | | make sure that we split username and server address at the first '@' from the... | Bjoern Schiessle | 2015-06-22 | 4 | -1/+92 |
* | | | | Merge pull request #17009 from owncloud/lock-downloadfile | Thomas Müller | 2015-06-26 | 1 | -6/+21 |
|\ \ \ \ | |||||
| * | | | | Enable x-sendfile only if we do not lock the file system | Thomas Müller | 2015-06-22 | 1 | -4/+8 |
| * | | | | Lock file before download | Vincent Petry | 2015-06-18 | 1 | -2/+13 |
* | | | | | Merge pull request #17082 from owncloud/shared-etag-propagate-file | Thomas Müller | 2015-06-26 | 4 | -12/+51 |
|\ \ \ \ \ | |||||
| * | | | | | add some docs | Robin Appelman | 2015-06-25 | 1 | -0/+2 |
| * | | | | | fix etag propagation for single file shares | Robin Appelman | 2015-06-24 | 3 | -12/+37 |
| * | | | | | add unit test for single file share etag propagation | Robin Appelman | 2015-06-24 | 1 | -0/+12 |
* | | | | | | Merge pull request #17190 from owncloud/lock-changelabel | Thomas Müller | 2015-06-26 | 2 | -5/+5 |
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | | |||||
| * | | | | | Rename experimental to transactional file locking | Vincent Petry | 2015-06-26 | 2 | -5/+5 |
* | | | | | | Merge pull request #17165 from owncloud/federated_cloud_sharing_search_addres... | Thomas Müller | 2015-06-26 | 2 | -3/+28 |
|\ \ \ \ \ \ | |||||
| * | | | | | | ne need to check twice if $row['share_with'] is set | Bjoern Schiessle | 2015-06-25 | 1 | -1/+1 |
| * | | | | | | show nice display name for remote shares if possible | Bjoern Schiessle | 2015-06-25 | 1 | -2/+11 |
| * | | | | | | search address book for federated cloud id | Bjoern Schiessle | 2015-06-25 | 1 | -0/+16 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #17185 from rullzer/fix_17178 | Morris Jobke | 2015-06-26 | 1 | -2/+9 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix for #17178 | Roeland Jago Douma | 2015-06-25 | 1 | -2/+9 |
| | |/ / / / | |/| | | | | |||||
* / | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-26 | 48 | -40/+18 |
|/ / / / / | |||||
* | | | | | Merge pull request #17162 from owncloud/LukasReschke-patch-1 | Thomas Müller | 2015-06-25 | 1 | -0/+12 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | |||||
| * | | | | Create .htaccess | Lukas Reschke | 2015-06-25 | 1 | -0/+12 |
|/ / / / | |||||
* | | | | Merge pull request #17152 from owncloud/LDAP/AD-Typo | Morris Jobke | 2015-06-25 | 1 | -1/+1 |
|\ \ \ \ | |||||
| * | | | | Dropped an S from the mouseover | Lukas Reschke | 2015-06-24 | 1 | -1/+1 |
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-06-25 | 64 | -34/+190 |
|/ / / / | |||||
* | | | | Merge pull request #17070 from owncloud/lock-movemountbug | Vincent Petry | 2015-06-24 | 3 | -23/+153 |
|\ \ \ \ | |||||
| * | | | | Rollback folder scan if an entry was locked | Vincent Petry | 2015-06-24 | 1 | -0/+5 |