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

feat(client/App): add file drop feature #1124

Merged
merged 6 commits into from
Jan 23, 2019

Conversation

barmac
Copy link
Collaborator

@barmac barmac commented Jan 21, 2019

Closes #1085
Closes #571

Regarding #571, dropping a text to XML editor is still possible, whereas dropping a file will trigger file opening action.

@ghost ghost assigned barmac Jan 21, 2019
@ghost ghost added the needs review Review pending label Jan 21, 2019
@barmac barmac force-pushed the 1085-restore-file-drop-feature branch 3 times, most recently from c4a3d53 to 1907e87 Compare January 22, 2019 10:22
@barmac
Copy link
Collaborator Author

barmac commented Jan 22, 2019

Resolved conflict and rebased on HEAD.

@philippfromme
Copy link
Contributor

On Windows 10 when dropping a BPMN file onto the XML editor the file is opened but its also inserted into the XML editor:

foobar

@barmac
Copy link
Collaborator Author

barmac commented Jan 22, 2019

I'll fix this and let you know.

@barmac barmac force-pushed the 1085-restore-file-drop-feature branch from 1907e87 to 0a59954 Compare January 22, 2019 11:32
@barmac
Copy link
Collaborator Author

barmac commented Jan 22, 2019

@philippfromme please check now

@barmac barmac force-pushed the 1085-restore-file-drop-feature branch from b7d7083 to 7e1b22c Compare January 22, 2019 15:24
@barmac barmac force-pushed the 1085-restore-file-drop-feature branch from 7e1b22c to 422fc09 Compare January 23, 2019 13:42
@barmac
Copy link
Collaborator Author

barmac commented Jan 23, 2019

@philippfromme
I resolved the merge conflict so that it's ready for review again.

Copy link
Contributor

@philippfromme philippfromme left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🍰

@philippfromme philippfromme merged commit 44fb8e5 into master Jan 23, 2019
@ghost ghost removed the needs review Review pending label Jan 23, 2019
@delete-merged-branch delete-merged-branch bot deleted the 1085-restore-file-drop-feature branch January 23, 2019 16:00
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants