Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Implement getOwner for external share storage | Robin Appelman | 2015-11-18 | 1 | -1/+6 |
| | |||||
* | Add internal fileid to webdav response | Vincent Petry | 2015-11-18 | 3 | -3/+22 |
| | | | | | | | | Introduce a new property "oc:fileid" to return the internal file id. This is because the original "oc:id" property is a compound and it is not possible to extract the real id without knowing the instance id. The instance id is not available to external clients. | ||||
* | Merge pull request #20494 from owncloud/storage-forbidden-exception | Thomas Müller | 2015-11-18 | 8 | -5/+206 |
|\ | | | | | Allow storage wrappers to through a forbidden exception with retry information for clients | ||||
| * | Allow storage wrappers to through a forbidden exception with retry information | Joas Schilling | 2015-11-17 | 8 | -5/+206 |
| | | |||||
* | | Merge pull request #20546 from owncloud/provision_api_fix | Thomas Müller | 2015-11-18 | 2 | -10/+3 |
|\ \ | | | | | | | [provisioning api] Return empty list if group does not have subadmins | ||||
| * | | Return empty list if group does not have subadmins | Roeland Jago Douma | 2015-11-16 | 2 | -10/+3 |
| |/ | | | | | | | | | | | | | Instead of throwing an error just return an empty list. Since that is actually what it is. Fixes #19789 | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-18 | 4 | -0/+6 |
| | | |||||
* | | Merge pull request #20188 from owncloud/webdav-exposeshareowner | Thomas Müller | 2015-11-17 | 3 | -0/+68 |
|\ \ | | | | | | | Expose share owner id and display name via files webdav | ||||
| * | | Add "owner-id" and "owner-display-name" Webdav properties | Vincent Petry | 2015-11-16 | 3 | -0/+68 |
| | | | |||||
* | | | Move index.php from files to AppFramework | Lukas Reschke | 2015-11-16 | 5 | -164/+482 |
| |/ |/| | | | | | | | 1. Allows it to use the more secure CSP rules of the AppFramework. 2. Adds some unit tests. | ||||
* | | Merge pull request #20292 from owncloud/provisioning_api_group_unittest | Thomas Müller | 2015-11-16 | 3 | -137/+277 |
|\ \ | | | | | | | Moved grouptest over to pure unit tests | ||||
| * | | Moved grouptest over to pure unit tests | Roeland Jago Douma | 2015-11-16 | 3 | -137/+277 |
| | | | |||||
* | | | Merge pull request #20534 from owncloud/sftp-parse-host | Robin Appelman | 2015-11-16 | 2 | -14/+62 |
|\ \ \ | | | | | | | | | Fix parsing of sftp hosts when using ipv6 | ||||
| * | | | Fix parsing of sftp hosts when using ipv6 | Robin Appelman | 2015-11-16 | 2 | -14/+62 |
| |/ / | |||||
* | | | Merge pull request #20447 from owncloud/heading-styles | Thomas Müller | 2015-11-16 | 1 | -3/+1 |
|\ \ \ | | | | | | | | | standardize sizes for headings | ||||
| * | | | standardize sizes for headings | Jan-Christoph Borchardt | 2015-11-16 | 1 | -3/+1 |
| |/ / | |||||
* | | | Merge pull request #20356 from owncloud/share2.0_getShare | Thomas Müller | 2015-11-16 | 3 | -26/+347 |
|\ \ \ | | | | | | | | | [Share2.0] OCS Share API getShare uses new code | ||||
| * | | | [Share2.0] OCS Share API getShare uses new code | Roeland Jago Douma | 2015-11-16 | 3 | -26/+347 |
| |/ / | |||||
* | | | Merge pull request #18605 from owncloud/api-adduser-for-subadmins | Thomas Müller | 2015-11-16 | 3 | -8/+420 |
|\ \ \ | |/ / |/| | | enable api addUser for subadmins | ||||
| * | | Added unit test for new functionality | Roeland Jago Douma | 2015-11-12 | 2 | -7/+347 |
| | | | |||||
| * | | enable api addUser for subadmins | michag86 | 2015-11-12 | 3 | -8/+80 |
| | | | | | | | | | | | | * Fix existing unit tests | ||||
* | | | Merge pull request #20505 from owncloud/fakelocking-for-mac | Thomas Müller | 2015-11-16 | 7 | -5/+386 |
|\ \ \ | | | | | | | | | Add fake locker plugin for WebDAVFS | ||||
| * | | | Add fake locker plugin for WebDAVFS | Lukas Reschke | 2015-11-13 | 7 | -5/+386 |
| | |/ | |/| | | | | | | | WebDAVFS as used by Finder requires a Class 2 compatible WebDAV server. This change introduces a fake locking provider which will simply advertise Locking support when a request originates from WebDAVFS. It will also return successful LOCK and UNLOCK responses. | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-16 | 2 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-15 | 14 | -14/+32 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-14 | 20 | -0/+34 |
|/ / | |||||
* / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-13 | 196 | -452/+256 |
|/ | |||||
* | Merge pull request #20469 from seal20/seal20-fix-one-string-in-user_ldap | Thomas Müller | 2015-11-12 | 1 | -1/+1 |
|\ | | | | | changed 1.000 to 1,000 | ||||
| * | changed 1.000 to 1,000 | sylvain | 2015-11-12 | 1 | -1/+1 |
| | | | | | | The string "More than 1,000 directory entries available." would mean only 1 entry, in english it should be 1,000 . Found it while translating | ||||
* | | Merge pull request #20460 from owncloud/file-handling-wording | Thomas Müller | 2015-11-12 | 1 | -4/+2 |
|\ \ | | | | | | | fix layout and wording for file handling admin setting | ||||
| * | | fix layout and wording for file handling admin setting | Jan-Christoph Borchardt | 2015-11-11 | 1 | -4/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-12 | 2 | -0/+4 |
| |/ |/| | |||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-11 | 14 | -10/+108 |
| | | |||||
* | | Merge pull request #20124 from owncloud/postscriptum-20093 | C. Montero Luque | 2015-11-10 | 2 | -4/+4 |
|\ \ | |/ |/| | remove uselessly used parameter, read all user attributes also when l… | ||||
| * | remove uselessly used parameter, read all user attributes also when looking ↵ | Arthur Schiwon | 2015-11-06 | 2 | -4/+4 |
| | | | | | | | | up users in groups | ||||
* | | Merge pull request #20195 from owncloud/add-caldavtester | Thomas Müller | 2015-11-10 | 4 | -0/+1075 |
|\ \ | | | | | | | Add CalDAVTester to travis | ||||
| * | | Add CalDAVTester to travis | Thomas Müller | 2015-11-10 | 4 | -0/+1075 |
| | | | |||||
* | | | Merge pull request #20224 from owncloud/fileinfo-owner | Robin Appelman | 2015-11-10 | 1 | -0/+16 |
|\ \ \ | | | | | | | | | Add getOwner to FileInfo | ||||
| * | | | Add tests for FileInfo owner | Robin Appelman | 2015-11-10 | 1 | -0/+16 |
| |/ / | |||||
* | | | Merge pull request #20431 from owncloud/carddav-enforce-displayname | Thomas Müller | 2015-11-10 | 2 | -1/+8 |
|\ \ \ | | | | | | | | | When creating addressbooks, make sure the displayname is set | ||||
| * | | | When creating addressbooks, make sure the displayname is set | Arthur Schiwon | 2015-11-10 | 2 | -1/+8 |
| | | | | |||||
* | | | | Merge pull request #20422 from owncloud/fix-20421-master | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
|\ \ \ \ | |/ / / |/| | | | Ensure the user folder exists | ||||
| * | | | Ensure the user folder exists | Thomas Müller | 2015-11-10 | 1 | -0/+3 |
| |/ / | |||||
* | | | Merge pull request #20415 from owncloud/fix-addressbook-home-set | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
|\ \ \ | |/ / |/| | | Adding CardDAV plugin to provide addressbook-home-set property | ||||
| * | | Adding CardDAV plugin to provide addressbook-home-set property | Thomas Müller | 2015-11-10 | 1 | -0/+2 |
| | | | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-10 | 2 | -0/+2 |
|/ / | |||||
* | | Merge pull request #20333 from owncloud/fix-18956 | Thomas Müller | 2015-11-10 | 7 | -12/+26 |
|\ \ | | | | | | | [LDAP Wizard] make all the buttons beautiful | ||||
| * | | make all the buttons beautiful | Arthur Schiwon | 2015-11-05 | 7 | -12/+26 |
| | | | |||||
* | | | Register DAVACL plugin to provide current-user-principal | Thomas Müller | 2015-11-09 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #20360 from owncloud/extstorage-gdrive-forceapproval | Thomas Müller | 2015-11-09 | 1 | -0/+1 |
|\ \ \ | | | | | | | | | Force approval in GDrive oauth to get refresh_token |