summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-2224-6/+84
|
* [tx-robot] updated from transifexJenkins for ownCloud2015-11-2120-8/+62
|
* Merge pull request #20641 from owncloud/files_external_missing_backendThomas Müller2015-11-201-11/+20
|\ | | | | dont die if the external storage backend doesn't exist
| * dont die if the external storage backend doesn't existRobin Appelman2015-11-201-11/+20
| |
* | Merge pull request #20614 from ↵Thomas Müller2015-11-208-44/+49
|\ \ | |/ |/| | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser
| * Adjust PHPDoc as suggestedThomas Müller2015-11-203-3/+3
| |
| * Fix failing unit test :skull:Thomas Müller2015-11-192-16/+2
| |
| * Use mocks when testing isSharingDisabledForUserThomas Müller2015-11-196-41/+60
| |
* | Merge pull request #14077 from owncloud/autotest-external-swiftThomas Müller2015-11-2010-74/+276
|\ \ | | | | | | [files_external] swift tests
| * | fix ip detection for swift-cephRobin Appelman2015-11-161-1/+1
| | |
| * | Skip Swift stat testRobin McCorkell2015-10-201-0/+4
| | |
| * | Don't attempt to run tests unless start file is successfulRobin McCorkell2015-10-202-41/+46
| | |
| * | Detect Docker initialization properlyRobin McCorkell2015-10-206-24/+96
| | | | | | | | | | | | | | | Use netcat to check when the port opens, rather than an arbitrary timeout. Hard limit of 60 seconds in case something breaks
| * | Make Swift test robust if container didn't existRobin McCorkell2015-10-201-9/+13
| | |
| * | Replace Swift Docker test with Ceph imageRobin McCorkell2015-10-202-22/+38
| | |
| * | [files_external] swift testsMorris Jobke2015-10-203-5/+106
| | |
* | | Merge pull request #20624 from owncloud/clean_3rparty_testsThomas Müller2015-11-201-0/+0
|\ \ \ | | | | | | | | Bump 3rdparty. No longer ship 3rdparty tests dirs
| * | | Bump 3rdparty. No longer ship tests dirsRoeland Jago Douma2015-11-201-0/+0
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2015-11-20122-134/+26
| | |
* | | 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.