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

Fix import error #495

Merged
merged 2 commits into from
Sep 2, 2016
Merged

Fix import error #495

merged 2 commits into from
Sep 2, 2016

Conversation

DeepDiver1975
Copy link
Member

@DeepDiver1975 DeepDiver1975 commented Aug 23, 2016

once owncloud/core#25905 is merged import of an invalid vcard as described in #488 is not possible.
A temporary notification is show to the user.

In addition this pr fixes import of the same file multiple times - fixes #391
And also cleans up with the styling

@DeepDiver1975 DeepDiver1975 added this to the 1.4 milestone Aug 23, 2016
@mention-bot
Copy link

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

@codecov-io
Copy link

codecov-io commented Aug 23, 2016

Current coverage is 12.24% (diff: 0.00%)

Merging #495 into master will increase coverage by 0.08%

@@             master       #495   diff @@
==========================================
  Files            47         47          
  Lines           831        825     -6   
  Methods           0          0          
  Messages          0          0          
  Branches          0          0          
==========================================
  Hits            101        101          
+ Misses          730        724     -6   
  Partials          0          0          

Sunburst

Powered by Codecov. Last update f169717...4dfe407

@skjnldsv
Copy link
Contributor

skjnldsv commented Sep 1, 2016

Nice! 👍

@irgendwie
Copy link
Contributor

If #480 gets merged, the changes to the *.css may not be needed anymore. 👎
The rest looks good for me! 👍

@skjnldsv
Copy link
Contributor

skjnldsv commented Sep 1, 2016

Nice catch! Well, merge this one, then override with your pr?

@DeepDiver1975
Copy link
Member Author

rebased

@irgendwie
Copy link
Contributor

LGTM 👍

@DeepDiver1975 DeepDiver1975 merged commit 428ebb8 into master Sep 2, 2016
@DeepDiver1975 DeepDiver1975 deleted the fix-import-error branch September 2, 2016 10:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Import button is only working once
5 participants