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

SVG defintions always take the first one #937

Merged
merged 1 commit into from
Aug 18, 2016
Merged

SVG defintions always take the first one #937

merged 1 commit into from
Aug 18, 2016

Conversation

rullzer
Copy link
Member

@rullzer rullzer commented Aug 18, 2016

  • Move filter definition out

Fixes: #922

@MorrisJobke @nickvergessen please test

@rullzer rullzer added the 3. to review Waiting for reviews label Aug 18, 2016
@rullzer rullzer added this to the Nextcloud 11.0 milestone Aug 18, 2016
@mention-bot
Copy link

@rullzer, thanks for your PR! By analyzing the annotation information on this pull request, we identified @MorrisJobke, @DeepDiver1975 and @PVince81 to be potential reviewers

@nickvergessen
Copy link
Member

🌀All magic

👍

@nickvergessen
Copy link
Member

Tests fail

@nickvergessen nickvergessen added 2. developing Work in progress and removed 3. to review Waiting for reviews labels Aug 18, 2016
@MorrisJobke
Copy link
Member

MorrisJobke commented Aug 18, 2016

Tested and works in Firefox, Chrome, Edge and IE11. 👍

@MorrisJobke
Copy link
Member

Somehow the clone failed. I restarted it.

@LukasReschke
Copy link
Member

Conflicts :(

@MorrisJobke
Copy link
Member

Um what:

[info] Pulling image plugins/drone-git:latest
Drone Git Plugin built from 43dcd64
$ git init
Initialized empty Git repository in /drone/src/github.com/nextcloud/server/.git/
$ git remote add origin https://github.com/nextcloud/server.git
$ git fetch --no-tags origin +refs/pull/937/merge:
fatal: Couldn't find remote ref refs/pull/937/merge
[info] build failed (exit code 1)

Ah ... because of the conflicts.

@MorrisJobke
Copy link
Member

Let me try to resolve this.

* Move filter definition out
@MorrisJobke
Copy link
Member

Resolved. Still works 👍

@MorrisJobke MorrisJobke added 4. to release Ready to be released and/or waiting for tests to finish and removed 2. developing Work in progress labels Aug 18, 2016
@rullzer rullzer merged commit 7f96e4e into master Aug 18, 2016
@rullzer rullzer deleted the fix_app_search branch August 18, 2016 17:21
GitHubUser4234 pushed a commit to GitHubUser4234/server that referenced this pull request Aug 30, 2016
SVG defintions always take the first one
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
4. to release Ready to be released and/or waiting for tests to finish
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants