Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-10 | 64 | -188/+94 |
| | |||||
* | Merge pull request #19585 from owncloud/enc_improve_introduction | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -4/+4 |
|\ | | | | | improved initial explanation/warning if the admin enabled encryptrion | ||||
| * | improved explanation of server side encryption | Bjoern Schiessle | 2015-10-06 | 1 | -4/+4 |
| | | |||||
* | | Merge pull request #19670 from owncloud/objectstore_filesystem_tests | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -3/+12 |
|\ \ | | | | | | | adjust filesystem tests to objectstore | ||||
| * | | adjust filesystem tests to objectstore | Jörn Friedrich Dreyer | 2015-10-09 | 1 | -3/+12 |
| | | | |||||
* | | | Merge pull request #19643 from owncloud/public-download-spinner | Thomas Müller | 2015-10-09 | 1 | -1/+15 |
|\ \ \ | | | | | | | | | Set download cookie on public download | ||||
| * | | | Set download cookie on public download | Vincent Petry | 2015-10-08 | 1 | -1/+15 |
| | | | | |||||
* | | | | Merge pull request #19654 from owncloud/db-locking-no-scan-transaction | Robin Appelman | 2015-10-09 | 1 | -2/+8 |
|\ \ \ \ | | | | | | | | | | | Dont use a transaction in the scanner while using db based locking | ||||
| * | | | | Dont use a transaction in the scanner while using db based locking | Robin Appelman | 2015-10-08 | 1 | -2/+8 |
| |/ / / | |||||
* | | | | Merge pull request #18586 from owncloud/ie8-uploadavatar | Thomas Müller | 2015-10-09 | 8 | -34/+111 |
|\ \ \ \ | | | | | | | | | | | Fix uploading avatar and root certs in IE8 | ||||
| * | | | | Use injected request | Vincent Petry | 2015-10-09 | 2 | -2/+2 |
| | | | | | |||||
| * | | | | fix IE8 user agent detection | Morris Jobke | 2015-10-09 | 4 | -16/+3 |
| | | | | | |||||
| * | | | | Fix uploading avatar and root certs in IE8 | Vincent Petry | 2015-10-09 | 8 | -34/+124 |
|/ / / / | |||||
* | / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2015-10-09 | 24 | -2/+66 |
| |/ / |/| | | |||||
* | | | Merge pull request #19034 from owncloud/http-request-warning | Thomas Müller | 2015-10-08 | 2 | -1/+24 |
|\ \ \ | | | | | | | | | Prevent warning decoding content | ||||
| * | | | Unit test for preventing warning decoding content | Robin McCorkell | 2015-09-23 | 1 | -0/+21 |
| | | | | |||||
| * | | | Merge branch 'master' into http-request-warning | Lukas Reschke | 2015-09-15 | 10 | -0/+64 |
| |\ \ \ | |||||
| * | | | | Prevent warning decoding content | Robin McCorkell | 2015-09-14 | 1 | -1/+3 |
| | | | | | |||||
* | | | | | Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstores | Thomas Müller | 2015-10-08 | 2 | -18/+22 |
|\ \ \ \ \ | | | | | | | | | | | | | make mkdir recursive, add phpdoc to api | ||||
| * | | | | | make mkdir recursive, add phpdoc to api | Jörn Friedrich Dreyer | 2015-10-08 | 2 | -18/+22 |
| | | | | | | |||||
* | | | | | | Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabled | Thomas Müller | 2015-10-08 | 2 | -17/+127 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Don't perform checks for outdated TLS libs when no internet connection | ||||
| * | | | | | | Don't perform checks for outdated TLS libs when no internet connection | Lukas Reschke | 2015-10-08 | 2 | -15/+125 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change makes the check return a positive result when: - The instance has been configured to not use the internet AND/OR - S2S AND the appstore is disabled | ||||
| * | | | | | | Fix comment syntax | Lukas Reschke | 2015-10-08 | 1 | -2/+2 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19655 from owncloud/integration-whitespace-fixes | Thomas Müller | 2015-10-08 | 1 | -15/+15 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Fix whitespace issues in integration tests | ||||
| * | | | | | | Fix whitespace issues in integration tests | Morris Jobke | 2015-10-08 | 1 | -15/+15 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #19616 from owncloud/ocs_provisioning_api_checking_lists | Thomas Müller | 2015-10-08 | 2 | -1/+64 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Ocs provisioning api checking lists | ||||
| * | | | | | | changing indentation, vertical elements and previous existance of users and ↵ | Sergio Bertolin | 2015-10-07 | 2 | -23/+29 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | groups | ||||
| * | | | | | | ordering arrays before comparing | Sergio Bertolin | 2015-10-07 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | checking users and groups | Sergio Bertolin | 2015-10-07 | 2 | -10/+23 |
| | | | | | | | |||||
| * | | | | | | lists getting ready | Sergio Bertolin | 2015-10-06 | 2 | -0/+44 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #19650 from owncloud/disable-appstore-for-ee | Thomas Müller | 2015-10-08 | 1 | -1/+7 |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | Disable app store for EE by default | ||||
| * | | | | | | Disable app store for EE by default | Lukas Reschke | 2015-10-08 | 1 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This disables the app store for EE versions by default to address some problems caused by the wrong assumption that "Official" means supported by ownCloud Inc. Administrators can still enable the app store by setting `appstoreenabled` to true in the config file. | ||||
* | | | | | | | Merge pull request #19414 from owncloud/swift_primary_storage_tests | Thomas Müller | 2015-10-08 | 9 | -23/+479 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Swift primary storage tests | ||||
| * | | | | | | | test objectstore with ceph docker | Jörn Friedrich Dreyer | 2015-10-06 | 9 | -23/+479 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | use default config for swift primary storage test config allow testsuite to complete fix timeout, script cleanup, enable debug for now use btrfs loopback device, requires privileged container and absolute path throw exception when storage has problems debug by echo ... sleep more, more debug | ||||
* | | | | | | | | Merge pull request #19644 from ↵ | Thomas Müller | 2015-10-08 | 1 | -1/+8 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue-19617-catch-exception-when-cleaning-locks Catch "missing table" exception when cleaning up locks | ||||
| * | | | | | | | | Catch "missing table" exception when cleaning up locks | Joas Schilling | 2015-10-08 | 1 | -1/+8 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #19546 from owncloud/fix-search-for-node-api | Thomas Müller | 2015-10-08 | 2 | -1/+43 |
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | | Fix search operations for the Node API | ||||
| * | | | | | | | | fix internal path when searching in storage root | Robin Appelman | 2015-10-06 | 1 | -2/+5 |
| | | | | | | | | | |||||
| * | | | | | | | | Add unit test for searching in storage root | Robin Appelman | 2015-10-06 | 1 | -0/+39 |
| | | | | | | | | | |||||
| * | | | | | | | | The minimum size for internalRootLength is 1 | Olivier Paroz | 2015-10-06 | 1 | -1/+1 |
| | |/ / / / / / | |/| | | | | | | |||||
* | | | | | | | | Merge pull request #19607 from owncloud/use-url | Thomas Müller | 2015-10-08 | 3 | -6/+16 |
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | Use `/` if installed in main folder | ||||
| * | | | | | | | | Use `/` if installed in main folder | Lukas Reschke | 2015-10-06 | 3 | -6/+16 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Otherwise an empty string is used indicating the cookie is only valid for those resources. This can lead to eunexpected behaviour. Fixes https://github.com/owncloud/core/issues/19196 | ||||
* | | | | | | | | | Merge pull request #19609 from owncloud/check_dav_move_permissions | Thomas Müller | 2015-10-08 | 3 | -5/+90 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | [webdav] Check if source can be deleted before move | ||||
| * | | | | | | | | | [WEBDAV] check if delete of source is allowed on move | Roeland Jago Douma | 2015-10-07 | 3 | -5/+90 |
| | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5251 If we perform a move we need to make sure first that the source can be deleted. Else the dest might be cleared but the move will fail later. * Added unit tests Eventually we need more and better checking here. | ||||
* | | | | | | | | | Merge pull request #19611 from owncloud/fix-public-scroll | Thomas Müller | 2015-10-08 | 3 | -38/+42 |
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | | Fix scrollbars in public template | ||||
| * | | | | | | | | move footer to bottom of public page | Hendrik Leppelsack | 2015-10-07 | 1 | -0/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix footer in public gallery | Hendrik Leppelsack | 2015-10-07 | 1 | -2/+1 |
| | | | | | | | | | |||||
| * | | | | | | | | fix public empty message | Hendrik Leppelsack | 2015-10-06 | 2 | -3/+2 |
| | | | | | | | | | |||||
| * | | | | | | | | fix scrollbars in public template | Hendrik Leppelsack | 2015-10-06 | 3 | -33/+37 |
| | | | | | | | | | |||||
* | | | | | | | | | Merge pull request #19640 from owncloud/fix-zip-downloads-32-bit-os | Thomas Müller | 2015-10-08 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | Only use zip64 when we have 64 bit php |