summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* fixing OCI and othersThomas Müller2015-11-195-20/+9
|
* make sure that both server don't try to exchange the shared secret in parallelBjörn Schießle2015-11-193-32/+79
|
* add option to auto add servers to the list of trusted servers once a ↵Björn Schießle2015-11-199-8/+67
| | | | federated share was created and accepted successfully
* add status to server listBjörn Schießle2015-11-194-5/+19
|
* change 'cronstatus' to 'status' so that it can be used in other apps tooBjörn Schießle2015-11-192-5/+5
|
* add federation to shipped.jsonBjörn Schießle2015-11-191-1/+2
|
* exchange shared secretBjörn Schießle2015-11-1912-119/+1052
|
* added app "federation", allows you to connect ownClouds and exchange user listsBjörn Schießle2015-11-1919-1/+1505
|
* Merge pull request #20034 from owncloud/icewind_streams_0.3.0Thomas Müller2015-11-192-0/+9
|\ | | | | Bump 3rdparty for icewind/streams-0.3.0
| * Follow the interface againRoeland Jago Douma2015-11-191-0/+9
| |
| * Bump 3rdparty for icewind/streams-0.3.0Roeland Jago Douma2015-11-191-0/+0
| |
* | Merge pull request #20615 from owncloud/systemtag-fix-method-nameThomas Müller2015-11-191-1/+1
|\ \ | | | | | | Adjust the method name to reflect it's behaviour
| * | Adjust the method name to reflect it's behaviourJoas Schilling2015-11-191-1/+1
| | |
* | | Merge pull request #20611 from owncloud/files-newmenuremovetextfileThomas Müller2015-11-192-34/+59
|\ \ \ | | | | | | | | Remove "Text file" entry in the "+" menu
| * | | Remove "Text file" entry in the "+" menuVincent Petry2015-11-192-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.
* | | Merge pull request #20355 from owncloud/add-carddav-sharingThomas Müller2015-11-1912-7/+652
|\ \ \ | | | | | | | | Add carddav sharing
| * | | Adding an existing sharee is idempotentThomas Müller2015-11-192-10/+30
| | | |
| * | | Implement CSRF protectionThomas Müller2015-11-193-1/+26
| | | |
| * | | Addressbook sharing added based on a simplified approach which is based on ↵Thomas Müller2015-11-1910-5/+605
| |/ / | | | | | | | | | calendar sharing standard
* | | Merge pull request #20603 from owncloud/joblist--more-robustThomas Müller2015-11-191-12/+24
|\ \ \ | |_|/ |/| | Make the JobList test more robust by sorting the result of getAll bef…
| * | Make the JobList test more robust by sorting the result of getAll before ↵Joas Schilling2015-11-191-12/+24
| | | | | | | | | | | | comparison
* | | Merge pull request #20563 from owncloud/systemtags-interfaceThomas Müller2015-11-195-0/+352
|\ \ \ | |_|/ |/| | Core interfaces for system tags and its manager
| * | Core interfaces for system tags and its managerVincent Petry2015-11-195-0/+352
| | |
* | | Merge pull request #20570 from owncloud/integration-fix-docsThomas Müller2015-11-191-34/+42
|\ \ \ | | | | | | | | Integration fix docs
| * | | Delete when it is a directory...Joas Schilling2015-11-181-1/+1
| | | |
| * | | Fix doc blocksJoas Schilling2015-11-181-34/+42
| | |/ | |/|
* | | Merge pull request #20537 from ↵Thomas Müller2015-11-193-15/+10
|\ \ \ | | | | | | | | | | | | | | | | owncloud/add-internal-locking-to-new-webdav-endpoint Add internal locking plugin
| * | | Add internal locking plugin - fixes #20502Thomas Müller2015-11-163-15/+10
| | | |
* | | | Merge pull request #20533 from owncloud/log-levelThomas Müller2015-11-191-9/+10
|\ \ \ \ | | | | | | | | | | clarify log level setting design, fix #20514
| * | | | clarify log level setting design, fix #20514Jan-Christoph Borchardt2015-11-181-9/+10
| | |/ / | |/| |
* | | | Merge pull request #20594 from owncloud/use-proper-variableThomas Müller2015-11-191-1/+1
|\ \ \ \ | | | | | | | | | | Use proper variable
| * | | | Use proper variableLukas Reschke2015-11-181-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 transifexJenkins for ownCloud2015-11-1910-4/+34
|/ / / /
* | | | Merge pull request #20584 from owncloud/fileinfo-owner-external-shareRobin Appelman2015-11-182-6/+26
|\ \ \ \ | | | | | | | | | | Fix getOwner for external shares
| * | | | Handle non existing users as owner in the viewRobin Appelman2015-11-181-5/+20
| | | | |
| * | | | Implement getOwner for external share storageRobin Appelman2015-11-181-1/+6
| | | | |
* | | | | Merge pull request #20585 from owncloud/fix-htaccess-davThomas Müller2015-11-181-2/+2
|\ \ \ \ \ | | | | | | | | | | | | Update .well-known redirects to the new dav endpoint
| * | | | | Update .well-known redirects to the new dav endpointThomas Müller2015-11-181-2/+2
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 68321efd29184fbc1bef409ec41f9b38501116ef.
* | | | | Revert "Update .well-known redirects to the new dav endpoint"Thomas Müller2015-11-181-2/+2
| | | | | | | | | | | | | | | | | | | | This reverts commit d831c255ea726b8e8aaa0b3c1a8186808b82f73e.
* | | | | Update .well-known redirects to the new dav endpointThomas Müller2015-11-181-2/+2
| | | | |
* | | | | Merge pull request #20371 from owncloud/add-caldav-2Thomas Müller2015-11-188-7/+1988
|\ \ \ \ \ | |/ / / / |/| | | | Introducing CalDAV into core
| * | | | Use uri as displaynameThomas Müller2015-11-162-20/+13
| | | | |
| * | | | components was not written to the databaseThomas Müller2015-11-162-0/+5
| | | | |
| * | | | Add occ command to create a new calendarThomas Müller2015-11-162-0/+54
| | | | |
| * | | | Add scheduling backendThomas Müller2015-11-162-4/+68
| | | | |
| * | | | Fix OracleThomas Müller2015-11-161-1/+1
| | | | |
| * | | | Introducing CalDAV into coreThomas Müller2015-11-166-7/+1872
| | | | |
* | | | | Merge pull request #20567 from owncloud/dav-internalfileidpropThomas Müller2015-11-183-3/+22
|\ \ \ \ \ | | | | | | | | | | | | Add internal fileid to webdav response
| * | | | | Add internal fileid to webdav responseVincent Petry2015-11-183-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 #20438 from owncloud/memcache-key-length-fixThomas Müller2015-11-181-8/+30
|\ \ \ \ \ | |/ / / / |/| | | | Handle errors on memcached level
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-03 23:58:12 +0000