summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Change small thumbnails to 32 pxMorris Jobke2015-09-309-15/+15
| | | | | * fixes #16913 * fixes issues in IE8 where the thumbnail is too big
* Merge pull request #19449 from ↵Jörn Friedrich Dreyer2015-09-301-8/+85
|\ | | | | | | | | owncloud/get-rid-of-ugly-previews-in-file-comparator Let's get rid of the ugly previews on the left side of the file comparator
| * Use Hermite resampling for comparator canvas previewsOlivier Paroz2015-09-291-8/+85
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2015-09-304-0/+8
|/
* Merge pull request #19355 from owncloud/cache_result_of_checkUpgradeThomas Müller2015-09-293-7/+12
|\ | | | | [jenkins] Cache result of check upgrade
| * cache result of \OCP\Util::needUpgrade()Individual IT Services2015-09-293-7/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() cache result of checkUpgrade() in self::$needUpgrade reduce calls of \OCP\Util::needUpgrade() where \OCP\Util::needUpgrade() is called we can call as well self::checkUpgrade and use the cached result In line 877 the call way unnecessary anyway because of the first part of the if statement move caching to \OCP\Util::needUpgrade renaming variable fixing testNeedUpgradeCore() fix typo in variable name deleting tabs
* | Merge pull request #19437 from owncloud/sabredav-2.1.7Thomas Müller2015-09-291-0/+0
|\ \ | | | | | | Update sabre/dav to 2.1.7
| * | Update sabre/dav to 2.1.7Thomas Müller2015-09-291-0/+0
| | |
* | | Merge pull request #19441 from owncloud/debug-log-mode-during-upgradeThomas Müller2015-09-293-0/+28
|\ \ \ | |_|/ |/| | [upgrade] switch to debug logging on upgrade
| * | [upgrade] switch to debug logging on upgradeMorris Jobke2015-09-293-0/+28
| |/ | | | | | | | | * resets afterwards * adds output about the previous log level
* | Merge pull request #19440 from owncloud/allow-blob-for-images-per-defaultThomas Müller2015-09-296-57/+58
|\ \ | | | | | | Add blob: scheme to default CSP policy
| * | Add blob: scheme to default CSP policyLukas Reschke2015-09-296-57/+58
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/19438
* | | Merge pull request #19365 from owncloud/files-detailsbar-interactionThomas Müller2015-09-293-37/+79
|\ \ \ | |/ / |/| | Fix sidebar interaction
| * | Fix sidebar interactionVincent Petry2015-09-283-37/+79
| | | | | | | | | | | | | | | | | | | | | | | | | | | - Clicking a file row or selecting it will open the sidebar. - When sidebar is open, its contents update with the last selection. - Dragging doesn't open the sidebar but does update its contents if it was open already. - Switching folders closes the sidebar. - Close sidebar when highlighted file got deleted/removed from list
* | | Merge pull request #18105 from owncloud/ocs-api-integration-testsThomas Müller2015-09-297-0/+229
|\ \ \ | |_|/ |/| | First integration tests for provisioning api
| * | Support different server ports - defined by EXECUTOR_NUMBERThomas Müller2015-09-293-8/+14
| | |
| * | added delete user testSergio Bertolin2015-09-291-0/+8
| | |
| * | Use ci profileThomas Müller2015-09-291-1/+1
| | |
| * | Use fixed port for nowThomas Müller2015-09-291-5/+6
| | |
| * | Test user creationThomas Müller2015-09-292-45/+110
| | |
| * | require autoload.phpThomas Müller2015-09-291-6/+1
| | |
| * | Adding phpunit for the assertionsThomas Müller2015-09-291-0/+1
| | |
| * | Adding missing filesThomas Müller2015-09-292-0/+94
| | |
| * | First integration tests for provisioning apiThomas Müller2015-09-295-0/+59
| | |
* | | Merge pull request #19424 from owncloud/use-jsqueezeThomas Müller2015-09-293-60/+3
|\ \ \ | |/ / |/| | Use jsqueeze
| * | Update 3rdparty submoduleThomas Müller2015-09-291-0/+0
| | |
| * | User upstream class SeparatorFilterThomas Müller2015-09-282-58/+1
| | |
| * | Suer JSqueezeFilter instead of JSMinFilterThomas Müller2015-09-281-2/+2
| | |
* | | Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabledThomas Müller2015-09-291-1/+2
|\ \ \ | | | | | | | | Allow ajax requests on public webdav interface
| * | | Allow ajax requests on public webdav interfaceVincent Petry2015-09-221-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever outgoing shares are disabled, still allow ajax requests to make it possible to use the Webdav interface in the public link page. Please note that disabling outgoing shares isn't strong anyway as someone could abuse the ajax endpoints to access files anyway. To properly disable remote sharing, public link sharing must be disabled too.
* | | | Merge pull request #19418 from owncloud/fix-parsehashqueryThomas Müller2015-09-291-3/+1
|\ \ \ \ | | | | | | | | | | Consider both hash params and query when parsing URL
| * | | | Consider both hash params and query when parsing URLVincent Petry2015-09-281-3/+1
| | |_|/ | |/| |
* | | | Merge pull request #19367 from owncloud/lock-transaction-no-logThomas Müller2015-09-291-4/+0
|\ \ \ \ | | | | | | | | | | remove warning when trying to get a lock while in transaction
| * | | | remove warning when trying to get a lock while in transactionRobin Appelman2015-09-251-4/+0
| | | | |
* | | | | Merge pull request #19411 from owncloud/files-sidebar-shareloadspinnerThomas Müller2015-09-292-5/+28
|\ \ \ \ \ | | | | | | | | | | | | Show loading spinner for first fetch of shares
| * | | | | Show loading spinner for first fetch of sharesVincent Petry2015-09-282-5/+28
| | |/ / / | |/| | | | | | | | | | | | | | | | | | Whenever the sidebar first loads shares, show a spinner instead of an empty content
* | | | | Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeuploadThomas Müller2015-09-292-22/+64
|\ \ \ \ \ | | | | | | | | | | | | Show conflict dialog before upload when possible
| * | | | | Show conflict dialog before upload when possibleVincent Petry2015-09-282-22/+64
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When uploading files, first check if the files exist in the current file list. For the ones that do, show a conflict dialog. For the rest, upload directly. If the upload operation detects a conflict on the server side, it will also continue populating the conflict dialog. From now on, server side conflict can only occur if someone concurrently uploaded a file into the same folder but the current user hasn't refreshed the list yet.
* | | | | Merge pull request #19409 from owncloud/files-sidebar-hiding-tabsThomas Müller2015-09-294-18/+136
|\ \ \ \ \ | | | | | | | | | | | | Hide sidebar tab headers conditionally
| * | | | | Hide sidebar tab headers conditionallyVincent Petry2015-09-284-18/+136
| |/ / / / | | | | | | | | | | | | | | | | | | | | Added canDisplay() in DetailsTabView that should return false if the tab header of this tab must be hidden
* | | | | Merge pull request #19426 from owncloud/fix-legacy-CSP-for-imagesThomas Müller2015-09-291-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Whitelist "data:" in legacy CSP headers
| * | | | | Fix CSP for images for legacy appsOlivier Paroz2015-09-281-1/+1
| | |_|_|/ | |/| | | | | | | | | | | | | Fixes #19425
* | | | | Merge pull request #19431 from phil-davis/r2Lukas Reschke2015-09-293-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Session closed exception wording
| * | | | | Session closed exception wordingPhil Davis2015-09-293-3/+3
|/ / / / / | | | | | | | | | | | | | | | and a small comment typo
* / / / / [tx-robot] updated from transifexJenkins for ownCloud2015-09-2918-4/+32
|/ / / /
* | | | Merge pull request #19408 from owncloud/fix-trashbin-checkboxRobin Appelman2015-09-281-1/+1
|\ \ \ \ | | | | | | | | | | Fix checkbox in trashbin
| * | | | fix checkbox in trashbinHendrik Leppelsack2015-09-281-1/+1
| | | | |
* | | | | Merge pull request #19413 from owncloud/share-nopermission-linkVincent Petry2015-09-282-30/+13
|\ \ \ \ \ | |_|/ / / |/| | | | Still show share link when recipient but no share permission
| * | | | Still show share link when recipient but no share permissionVincent Petry2015-09-282-30/+13
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | This makes it possible for the recipient to still trigger the sidebar and share tab to see information about the share. In the case where the file is not shared and no permissions exists, no action icon will be displayed.
* | | | Merge pull request #18548 from owncloud/repair-mimetype-limitversionThomas Müller2015-09-283-25/+54
|\ \ \ \ | | | | | | | | | | Repair mime types only when upgrading from OC 8.0
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-09 02:13:57 +0000