summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-06-2848-10/+142
|
* Merge pull request #17214 from owncloud/fix-php-doc-user-interfaceLukas Reschke2015-06-276-50/+67
|\ | | | | Fix PHPDoc + Indentation
| * Fix indentationLukas Reschke2015-06-271-15/+15
| |
| * Add missing annotations for parametersLukas Reschke2015-06-276-35/+52
| |
* | Merge pull request #17212 from owncloud/ocs-specLukas Reschke2015-06-275-0/+298
|\ \ | |/ |/| Add endpoint with list of OCS providers
| * Add endpoint with list of OCS providersLukas Reschke2015-06-275-0/+298
| | | | | | | | | | | | | | | | This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services. In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-)) That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
* | Merge pull request #17163 from owncloud/update-licensesLukas Reschke2015-06-27304-228/+631
|\ \ | |/ |/| Update license headers
| * add additional email address for GeorgMorris Jobke2015-06-251-0/+1
| |
| * update license headers and authorsMorris Jobke2015-06-25302-227/+629
| |
| * [license script] sort names case insensitiveMorris Jobke2015-06-251-1/+1
| |
* | Merge pull request #17206 from oparoz/bpg-media-typeRoeland Douma2015-06-271-0/+1
|\ \ | | | | | | Adding BPG media type
| * | Adding BPG media typeOlivier Paroz2015-06-261-0/+1
| | |
* | | Merge pull request #17199 from ↵Lukas Reschke2015-06-272-0/+19
|\ \ \ | | | | | | | | | | | | | | | | owncloud/feature/show-error-when-shareservice-dies add check if server returns a 500 and display error
| * | | add check if server returns a 500 and display errorClark Tomlinson2015-06-262-0/+19
| |/ / | | | | | | | | | resolves https://github.com/owncloud/core/issues/17170
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2756-74/+72
| | |
* | | Merge pull request #17202 from oparoz/repair-scan-signatureJoas Schilling2015-06-271-1/+1
|\ \ \ | | | | | | | | Signature of overriding method should match the parent
| * | | Signature of overriding method should match the parentOlivier Paroz2015-06-261-1/+1
| |/ /
* | | Merge pull request #17203 from owncloud/fix-share-autocompleteBjörn Schießle2015-06-261-0/+1
|\ \ \ | | | | | | | | fix z-index of share-autocomplete
| * | | fix z-index of share-autocompleteJan-Christoph Borchardt2015-06-261-0/+1
| |/ /
* | | Merge pull request #17071 from owncloud/share-get-users-non-existingVincent Petry2015-06-261-2/+2
|\ \ \ | |/ / |/| | fix getUsersSharingFile with locking
| * | fix getUsersSharingFile with lockingRobin Appelman2015-06-261-2/+2
| | |
* | | Merge pull request #17191 from owncloud/issue-17188-group-share-part-fileThomas Müller2015-06-262-10/+24
|\ \ \ | | | | | | | | Correctly check if the real file exists, otherwise try the part file
| * | | Correctly check if the real file exists, otherwise try the part fileJoas Schilling2015-06-262-10/+24
| | | |
* | | | Merge pull request #17008 from owncloud/fix-17006Björn Schießle2015-06-267-49/+152
|\ \ \ \ | |_|/ / |/| | | Improve splitting of username and remote adress when username contains an `@`
| * | | Use \OC\HintException and translate the hintJoas Schilling2015-06-228-35/+46
| | | |
| * | | Merge spliteUserRemote with fixRemoteUrlInShareWithJoas Schilling2015-06-223-74/+75
| | | |
| * | | make sure that we split username and server address at the first '@' from ↵Bjoern Schiessle2015-06-224-1/+92
| | | | | | | | | | | | | | | | the right to allow usernames containing '@'
* | | | Merge pull request #17009 from owncloud/lock-downloadfileThomas Müller2015-06-261-6/+21
|\ \ \ \ | | | | | | | | | | Lock file during download
| * | | | Enable x-sendfile only if we do not lock the file systemThomas Müller2015-06-221-4/+8
| | | | |
| * | | | Lock file before downloadVincent Petry2015-06-181-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | | This will throw a LockedException if a concurrent request is currently touching that file.
* | | | | Merge pull request #17082 from owncloud/shared-etag-propagate-fileThomas Müller2015-06-264-12/+51
|\ \ \ \ \ | | | | | | | | | | | | Fix etag propagation for single file shares
| * | | | | add some docsRobin Appelman2015-06-251-0/+2
| | | | | |
| * | | | | fix etag propagation for single file sharesRobin Appelman2015-06-243-12/+37
| | | | | |
| * | | | | add unit test for single file share etag propagationRobin Appelman2015-06-241-0/+12
| | | | | |
* | | | | | Merge pull request #17190 from owncloud/lock-changelabelThomas Müller2015-06-262-5/+5
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Rename experimental to transactional file locking
| * | | | | Rename experimental to transactional file lockingVincent Petry2015-06-262-5/+5
| | | | | |
* | | | | | Merge pull request #17165 from ↵Thomas Müller2015-06-262-3/+28
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/federated_cloud_sharing_search_address_book Search address book for federated cloud id
| * | | | | | ne need to check twice if $row['share_with'] is setBjoern Schiessle2015-06-251-1/+1
| | | | | | |
| * | | | | | show nice display name for remote shares if possibleBjoern Schiessle2015-06-251-2/+11
| | | | | | |
| * | | | | | search address book for federated cloud idBjoern Schiessle2015-06-251-0/+16
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #17185 from rullzer/fix_17178Morris Jobke2015-06-261-2/+9
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix for #17178
| * | | | | | Fix for #17178Roeland Jago Douma2015-06-251-2/+9
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | If no array of arrays is submitted make sure we still keep $sharedUsers and $sharedGroups as arrays so the rest of the code keeps functioning as it should.
* / | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2648-40/+18
|/ / / / /
* | | | | Merge pull request #17162 from owncloud/LukasReschke-patch-1Thomas Müller2015-06-251-0/+12
|\ \ \ \ \ | |_|_|_|/ |/| | | | Create .htaccess
| * | | | Create .htaccessLukas Reschke2015-06-251-0/+12
|/ / / / | | | | | | | | Ref https://github.com/owncloud/core/pull/16724#discussion_r33236344 – shouldn't hurt also.
* | | | Merge pull request #17152 from owncloud/LDAP/AD-TypoMorris Jobke2015-06-251-1/+1
|\ \ \ \ | | | | | | | | | | Ldap/ad typo
| * | | | Dropped an S from the mouseoverLukas Reschke2015-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-06-2564-34/+190
|/ / / /
* | | | Merge pull request #17070 from owncloud/lock-movemountbugVincent Petry2015-06-243-23/+153
|\ \ \ \ | | | | | | | | | | Lock correct paths when moving mount
| * | | | Rollback folder scan if an entry was lockedVincent Petry2015-06-241-0/+5
| | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-22 02:06:30 +0000