summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2015-10-1064-188/+94
|
* Merge pull request #19585 from owncloud/enc_improve_introductionJörn Friedrich Dreyer2015-10-091-4/+4
|\ | | | | improved initial explanation/warning if the admin enabled encryptrion
| * improved explanation of server side encryptionBjoern Schiessle2015-10-061-4/+4
| |
* | Merge pull request #19670 from owncloud/objectstore_filesystem_testsJörn Friedrich Dreyer2015-10-091-3/+12
|\ \ | | | | | | adjust filesystem tests to objectstore
| * | adjust filesystem tests to objectstoreJörn Friedrich Dreyer2015-10-091-3/+12
| | |
* | | Merge pull request #19643 from owncloud/public-download-spinnerThomas Müller2015-10-091-1/+15
|\ \ \ | | | | | | | | Set download cookie on public download
| * | | Set download cookie on public downloadVincent Petry2015-10-081-1/+15
| | | |
* | | | Merge pull request #19654 from owncloud/db-locking-no-scan-transactionRobin Appelman2015-10-091-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 lockingRobin Appelman2015-10-081-2/+8
| |/ / /
* | | | Merge pull request #18586 from owncloud/ie8-uploadavatarThomas Müller2015-10-098-34/+111
|\ \ \ \ | | | | | | | | | | Fix uploading avatar and root certs in IE8
| * | | | Use injected requestVincent Petry2015-10-092-2/+2
| | | | |
| * | | | fix IE8 user agent detectionMorris Jobke2015-10-094-16/+3
| | | | |
| * | | | Fix uploading avatar and root certs in IE8Vincent Petry2015-10-098-34/+124
|/ / / /
* | / / [tx-robot] updated from transifexJenkins for ownCloud2015-10-0924-2/+66
| |/ / |/| |
* | | Merge pull request #19034 from owncloud/http-request-warningThomas Müller2015-10-082-1/+24
|\ \ \ | | | | | | | | Prevent warning decoding content
| * | | Unit test for preventing warning decoding contentRobin McCorkell2015-09-231-0/+21
| | | |
| * | | Merge branch 'master' into http-request-warningLukas Reschke2015-09-1510-0/+64
| |\ \ \
| * | | | Prevent warning decoding contentRobin McCorkell2015-09-141-1/+3
| | | | |
* | | | | Merge pull request #19651 from owncloud/recursive_mkdir_for_objectstoresThomas Müller2015-10-082-18/+22
|\ \ \ \ \ | | | | | | | | | | | | make mkdir recursive, add phpdoc to api
| * | | | | make mkdir recursive, add phpdoc to apiJörn Friedrich Dreyer2015-10-082-18/+22
| | | | | |
* | | | | | Merge pull request #19664 from owncloud/check-only-if-s2s-or-appstore-is-enabledThomas Müller2015-10-082-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 connectionLukas Reschke2015-10-082-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 syntaxLukas Reschke2015-10-081-2/+2
| | | | | | |
* | | | | | | Merge pull request #19655 from owncloud/integration-whitespace-fixesThomas Müller2015-10-081-15/+15
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | Fix whitespace issues in integration tests
| * | | | | | Fix whitespace issues in integration testsMorris Jobke2015-10-081-15/+15
|/ / / / / /
* | | | | | Merge pull request #19616 from owncloud/ocs_provisioning_api_checking_listsThomas Müller2015-10-082-1/+64
|\ \ \ \ \ \ | | | | | | | | | | | | | | Ocs provisioning api checking lists
| * | | | | | changing indentation, vertical elements and previous existance of users and ↵Sergio Bertolin2015-10-072-23/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | groups
| * | | | | | ordering arrays before comparingSergio Bertolin2015-10-071-2/+2
| | | | | | |
| * | | | | | checking users and groupsSergio Bertolin2015-10-072-10/+23
| | | | | | |
| * | | | | | lists getting readySergio Bertolin2015-10-062-0/+44
| | | | | | |
* | | | | | | Merge pull request #19650 from owncloud/disable-appstore-for-eeThomas Müller2015-10-081-1/+7
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | Disable app store for EE by default
| * | | | | | Disable app store for EE by defaultLukas Reschke2015-10-081-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_testsThomas Müller2015-10-089-23/+479
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Swift primary storage tests
| * | | | | | | test objectstore with ceph dockerJörn Friedrich Dreyer2015-10-069-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üller2015-10-081-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 locksJoas Schilling2015-10-081-1/+8
| | | | | | | | |
* | | | | | | | | Merge pull request #19546 from owncloud/fix-search-for-node-apiThomas Müller2015-10-082-1/+43
|\ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / |/| | | | | | | | Fix search operations for the Node API
| * | | | | | | | fix internal path when searching in storage rootRobin Appelman2015-10-061-2/+5
| | | | | | | | |
| * | | | | | | | Add unit test for searching in storage rootRobin Appelman2015-10-061-0/+39
| | | | | | | | |
| * | | | | | | | The minimum size for internalRootLength is 1Olivier Paroz2015-10-061-1/+1
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Merge pull request #19607 from owncloud/use-urlThomas Müller2015-10-083-6/+16
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Use `/` if installed in main folder
| * | | | | | | | Use `/` if installed in main folderLukas Reschke2015-10-063-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_permissionsThomas Müller2015-10-083-5/+90
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | [webdav] Check if source can be deleted before move
| * | | | | | | | | [WEBDAV] check if delete of source is allowed on moveRoeland Jago Douma2015-10-073-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-scrollThomas Müller2015-10-083-38/+42
|\ \ \ \ \ \ \ \ \ | |_|_|_|/ / / / / |/| | | | | | | | Fix scrollbars in public template
| * | | | | | | | move footer to bottom of public pageHendrik Leppelsack2015-10-071-0/+2
| | | | | | | | |
| * | | | | | | | fix footer in public galleryHendrik Leppelsack2015-10-071-2/+1
| | | | | | | | |
| * | | | | | | | fix public empty messageHendrik Leppelsack2015-10-062-3/+2
| | | | | | | | |
| * | | | | | | | fix scrollbars in public templateHendrik Leppelsack2015-10-063-33/+37
| | | | | | | | |
* | | | | | | | | Merge pull request #19640 from owncloud/fix-zip-downloads-32-bit-osThomas Müller2015-10-081-1/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Only use zip64 when we have 64 bit php