Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-22 | 24 | -6/+84 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-21 | 20 | -8/+62 |
| | |||||
* | Merge pull request #20641 from owncloud/files_external_missing_backend | Thomas Müller | 2015-11-20 | 1 | -11/+20 |
|\ | | | | | dont die if the external storage backend doesn't exist | ||||
| * | dont die if the external storage backend doesn't exist | Robin Appelman | 2015-11-20 | 1 | -11/+20 |
| | | |||||
* | | Merge pull request #20614 from ↵ | Thomas Müller | 2015-11-20 | 8 | -44/+49 |
|\ \ | |/ |/| | | | | | owncloud/use-mocks-when-testing-isSharingDisabledForUser Use mocks when testing isSharingDisabledForUser | ||||
| * | Adjust PHPDoc as suggested | Thomas Müller | 2015-11-20 | 3 | -3/+3 |
| | | |||||
| * | Fix failing unit test :skull: | Thomas Müller | 2015-11-19 | 2 | -16/+2 |
| | | |||||
| * | Use mocks when testing isSharingDisabledForUser | Thomas Müller | 2015-11-19 | 6 | -41/+60 |
| | | |||||
* | | Merge pull request #14077 from owncloud/autotest-external-swift | Thomas Müller | 2015-11-20 | 10 | -74/+276 |
|\ \ | | | | | | | [files_external] swift tests | ||||
| * | | fix ip detection for swift-ceph | Robin Appelman | 2015-11-16 | 1 | -1/+1 |
| | | | |||||
| * | | Skip Swift stat test | Robin McCorkell | 2015-10-20 | 1 | -0/+4 |
| | | | |||||
| * | | Don't attempt to run tests unless start file is successful | Robin McCorkell | 2015-10-20 | 2 | -41/+46 |
| | | | |||||
| * | | Detect Docker initialization properly | Robin McCorkell | 2015-10-20 | 6 | -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 exist | Robin McCorkell | 2015-10-20 | 1 | -9/+13 |
| | | | |||||
| * | | Replace Swift Docker test with Ceph image | Robin McCorkell | 2015-10-20 | 2 | -22/+38 |
| | | | |||||
| * | | [files_external] swift tests | Morris Jobke | 2015-10-20 | 3 | -5/+106 |
| | | | |||||
* | | | Merge pull request #20624 from owncloud/clean_3rparty_tests | Thomas Müller | 2015-11-20 | 1 | -0/+0 |
|\ \ \ | | | | | | | | | Bump 3rdparty. No longer ship 3rdparty tests dirs | ||||
| * | | | Bump 3rdparty. No longer ship tests dirs | Roeland Jago Douma | 2015-11-20 | 1 | -0/+0 |
|/ / / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-11-20 | 122 | -134/+26 |
| | | | |||||
* | | | Merge pull request #20034 from owncloud/icewind_streams_0.3.0 | Thomas Müller | 2015-11-19 | 2 | -0/+9 |
|\ \ \ | | | | | | | | | Bump 3rdparty for icewind/streams-0.3.0 | ||||
| * | | | Follow the interface again | Roeland Jago Douma | 2015-11-19 | 1 | -0/+9 |
| | | | | |||||
| * | | | Bump 3rdparty for icewind/streams-0.3.0 | Roeland Jago Douma | 2015-11-19 | 1 | -0/+0 |
| | |/ | |/| | |||||
* | | | Merge pull request #20615 from owncloud/systemtag-fix-method-name | Thomas Müller | 2015-11-19 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | Adjust the method name to reflect it's behaviour | ||||
| * | | | Adjust the method name to reflect it's behaviour | Joas Schilling | 2015-11-19 | 1 | -1/+1 |
| | | | | |||||
* | | | | 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. | ||||
* | | | | Merge pull request #20355 from owncloud/add-carddav-sharing | Thomas Müller | 2015-11-19 | 12 | -7/+652 |
|\ \ \ \ | | | | | | | | | | | Add carddav sharing | ||||
| * | | | | 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 #20603 from owncloud/joblist--more-robust | Thomas Müller | 2015-11-19 | 1 | -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 Schilling | 2015-11-19 | 1 | -12/+24 |
| | | | | | | | | | | | | | | | | comparison | ||||
* | | | | Merge pull request #20563 from owncloud/systemtags-interface | Thomas Müller | 2015-11-19 | 5 | -0/+352 |
|\ \ \ \ | |_|/ / |/| | | | Core interfaces for system tags and its manager | ||||
| * | | | Core interfaces for system tags and its manager | Vincent Petry | 2015-11-19 | 5 | -0/+352 |
| | | | | |||||
* | | | | Merge pull request #20570 from owncloud/integration-fix-docs | Thomas Müller | 2015-11-19 | 1 | -34/+42 |
|\ \ \ \ | | | | | | | | | | | Integration fix docs | ||||
| * | | | | Delete when it is a directory... | Joas Schilling | 2015-11-18 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Fix doc blocks | Joas Schilling | 2015-11-18 | 1 | -34/+42 |
| | |/ / | |/| | | |||||
* | | | | 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 #20533 from owncloud/log-level | Thomas Müller | 2015-11-19 | 1 | -9/+10 |
|\ \ \ \ \ | | | | | | | | | | | | | clarify log level setting design, fix #20514 | ||||
| * | | | | | clarify log level setting design, fix #20514 | Jan-Christoph Borchardt | 2015-11-18 | 1 | -9/+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 | 10 | -4/+34 |
|/ / / / / | |||||
* | | | | | Merge pull request #20584 from owncloud/fileinfo-owner-external-share | Robin Appelman | 2015-11-18 | 2 | -6/+26 |
|\ \ \ \ \ | | | | | | | | | | | | | Fix getOwner for external shares | ||||
| * | | | | | Handle non existing users as owner in the view | Robin Appelman | 2015-11-18 | 1 | -5/+20 |
| | | | | | | |||||
| * | | | | | Implement getOwner for external share storage | Robin Appelman | 2015-11-18 | 1 | -1/+6 |
| | | | | | | |||||
* | | | | | | Merge pull request #20585 from owncloud/fix-htaccess-dav | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update .well-known redirects to the new dav endpoint | ||||
| * | | | | | | Update .well-known redirects to the new dav endpoint | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
|/ / / / / / | | | | | | | | | | | | | | | | | | | This reverts commit 68321efd29184fbc1bef409ec41f9b38501116ef. | ||||
* | | | | | | Revert "Update .well-known redirects to the new dav endpoint" | Thomas Müller | 2015-11-18 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit d831c255ea726b8e8aaa0b3c1a8186808b82f73e. |