Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | exchange shared secret | Björn Schießle | 2015-11-19 | 12 | -119/+1052 |
| | |||||
* | added app "federation", allows you to connect ownClouds and exchange user lists | Björn Schießle | 2015-11-19 | 17 | -0/+1503 |
| | |||||
* | Merge pull request #20611 from owncloud/files-newmenuremovetextfile | Thomas Müller | 2015-11-19 | 2 | -34/+59 |
|\ | | | | | Remove "Text file" entry in the "+" menu | ||||
| * | Remove "Text file" entry in the "+" menu | Vincent Petry | 2015-11-19 | 2 | -34/+59 |
| | | | | | | | | | | | | | | The text editor app will register this instead. Also made "fileList" a non-private attribute to make it possible for plugins to access the attached file list object. | ||||
* | | Adding an existing sharee is idempotent | Thomas Müller | 2015-11-19 | 2 | -10/+30 |
| | | |||||
* | | Implement CSRF protection | Thomas Müller | 2015-11-19 | 3 | -1/+26 |
| | | |||||
* | | Addressbook sharing added based on a simplified approach which is based on ↵ | Thomas Müller | 2015-11-19 | 10 | -5/+605 |
|/ | | | | calendar sharing standard | ||||
* | Merge pull request #20537 from ↵ | Thomas Müller | 2015-11-19 | 3 | -15/+10 |
|\ | | | | | | | | | owncloud/add-internal-locking-to-new-webdav-endpoint Add internal locking plugin | ||||
| * | Add internal locking plugin - fixes #20502 | Thomas Müller | 2015-11-16 | 3 | -15/+10 |
| | | |||||
* | | Merge pull request #20594 from owncloud/use-proper-variable | Thomas Müller | 2015-11-19 | 1 | -1/+1 |
|\ \ | | | | | | | Use proper variable | ||||
| * | | Use proper variable | Lukas Reschke | 2015-11-18 | 1 | -1/+1 |
| | | | | | | | | | `$shares` is not defined. Introduced with https://github.com/owncloud/core/commit/c3e7d324c5e61eb087fb2ea5102d332f9f08db3d and thus also in stable8.2 | ||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-19 | 2 | -0/+4 |
|/ / | |||||
* | | Merge pull request #20584 from owncloud/fileinfo-owner-external-share | Robin Appelman | 2015-11-18 | 1 | -1/+6 |
|\ \ | | | | | | | Fix getOwner for external shares | ||||
| * | | Implement getOwner for external share storage | Robin Appelman | 2015-11-18 | 1 | -1/+6 |
| | | | |||||
* | | | Merge pull request #20371 from owncloud/add-caldav-2 | Thomas Müller | 2015-11-18 | 8 | -7/+1988 |
|\ \ \ | |/ / |/| | | Introducing CalDAV into core | ||||
| * | | Use uri as displayname | Thomas Müller | 2015-11-16 | 2 | -20/+13 |
| | | | |||||
| * | | components was not written to the database | Thomas Müller | 2015-11-16 | 2 | -0/+5 |
| | | | |||||
| * | | Add occ command to create a new calendar | Thomas Müller | 2015-11-16 | 2 | -0/+54 |
| | | | |||||
| * | | Add scheduling backend | Thomas Müller | 2015-11-16 | 2 | -4/+68 |
| | | | |||||
| * | | Fix Oracle | Thomas Müller | 2015-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | Introducing CalDAV into core | Thomas Müller | 2015-11-16 | 6 | -7/+1872 |
| | | | |||||
* | | | 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 |