Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Issue/10991 stable7 backport #12291

Merged
merged 14 commits into from
Nov 19, 2014
Merged

Conversation

nickvergessen
Copy link
Contributor

Stable7 backport of #12218

Together with #12288 it makes tests pass on windows 😎

Commit 39ae569 is missing, as the files do not exist in stable7

@MorrisJobke @PVince81 @schiesbn @th3fallen

nickvergessen and others added 14 commits November 19, 2014 10:06
And skip the UTF8 names on Windows as they are not supported
… folders

Conflicts:
	tests/lib/tempmanager.php
Conflicts:
	tests/lib/archive/tar.php
	tests/lib/files/storage/local.php
	tests/lib/files/view.php
Conflicts:
	apps/files_encryption/tests/crypt.php
	apps/files_encryption/tests/helper.php
	apps/files_encryption/tests/hooks.php
	apps/files_encryption/tests/keymanager.php
	apps/files_encryption/tests/proxy.php
	apps/files_encryption/tests/share.php
	apps/files_encryption/tests/stream.php
	apps/files_encryption/tests/trashbin.php
	apps/files_encryption/tests/webdav.php
Conflicts:
	tests/lib/cache/file.php
	tests/lib/cache/usercache.php
Conflicts:
	tests/lib/cache/file.php
	tests/lib/cache/usercache.php
@PVince81
Copy link
Contributor

👍 tests run locally on Linux

@nickvergessen nickvergessen added this to the 2014-sprint-08-current milestone Nov 19, 2014
@ghost
Copy link

ghost commented Nov 19, 2014

🚀 Test PASSed. 🚀
Refer to this link for build results (access rights to CI server needed):
https://ci.owncloud.org//job/pull-request-analyser-ng-simple/2833/
🚀 Test PASSed. 🚀

@schiessle
Copy link
Contributor

👍

nickvergessen added a commit that referenced this pull request Nov 19, 2014
@nickvergessen nickvergessen merged commit 6a6b645 into stable7 Nov 19, 2014
@nickvergessen nickvergessen deleted the issue/10991-stable7-backport branch November 19, 2014 15:19
@lock lock bot locked as resolved and limited conversation to collaborators Aug 15, 2019
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants