Merge branch 'master' into upload_images_2

.npmrc

@@ -0,0 +1 @@
+tag-version-prefix=""

CHANGELOG.md

@@ -4,14 +4,9 @@ All notable changes to easymde will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-## [Unreleased/Forked]
+## [Unreleased]
-- Merge 2.7.0 with https://github.com/Ionaru/easy-markdown-editor/pull/71 @jeroenvo
+### Added
-- replace MouseEvent(click) with .click() for IE compat
+- Upload images functionality. (Thanks to [@roipoussiere] and [@JeroenvO], [#71], [#101]
-- Fix status bar update when dragging but not dropping
-- Fix progressbar
-- Add option for CSRF token to include in AJAX call for imageupload
-- Fix status bar reset after upload error
-- Add server side error messages on image upload.
 
 ## [2.7.0] - 2019-07-13
 ### Added
@@ -117,6 +112,7 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 - Cursor not always showing in "text" mode over the edit field
 
 <!-- Linked issues -->
+[#99]: https://github.com/Ionaru/easy-markdown-editor/issues/99
 [#45]: https://github.com/Ionaru/easy-markdown-editor/issues/45
 [#44]: https://github.com/Ionaru/easy-markdown-editor/issues/44
 [#41]: https://github.com/Ionaru/easy-markdown-editor/issues/41
@@ -128,12 +124,20 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 [#9]: https://github.com/Ionaru/easy-markdown-editor/issues/9
 
 <!-- Linked PRs -->
+[#101]: https://github.com/Ionaru/easy-markdown-editor/pull/101
+[#93]: https://github.com/Ionaru/easy-markdown-editor/pull/93
+[#75]: https://github.com/Ionaru/easy-markdown-editor/pull/75
+[#71]: https://github.com/Ionaru/easy-markdown-editor/pull/71
 [#54]: https://github.com/Ionaru/easy-markdown-editor/pull/54
 [#31]: https://github.com/Ionaru/easy-markdown-editor/pull/31
 [#27]: https://github.com/Ionaru/easy-markdown-editor/pull/27
 [#19]: https://github.com/Ionaru/easy-markdown-editor/pull/19
 
 <!-- Linked users -->
+[@JeroenvO]: https://github.com/JeroenvO
+[@sn3p]: https://github.com/sn3p
+[@roryok]: https://github.com/roryok
+[@ysykzheng]: https://github.com/ysykzheng
 [@roipoussiere]: https://github.com/roipoussiere
 [@FranklinWhale]: https://github.com/FranklinWhale
 [@Furgas]: https://github.com/Furgas
@@ -145,7 +149,10 @@ Project forked from [SimpleMDE](https://github.com/sparksuite/simplemde-markdown
 [@sne11ius]: https://github.com/sne11ius
 
 <!-- Linked versions -->
-[Unreleased]: https://github.com/Ionaru/easy-markdown-editor/compare/2.5.1...HEAD
+[Unreleased]: https://github.com/Ionaru/easy-markdown-editor/compare/2.7.0...HEAD
+[2.7.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.6.1...2.7.0
+[2.6.1]: https://github.com/Ionaru/easy-markdown-editor/compare/2.6.0...2.6.1
+[2.6.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.5.1...2.6.0
 [2.5.1]: https://github.com/Ionaru/easy-markdown-editor/compare/2.5.0...2.5.1
 [2.5.0]: https://github.com/Ionaru/easy-markdown-editor/compare/2.4.2...2.5.0
 [2.4.2]: https://github.com/Ionaru/easy-markdown-editor/compare/2.4.1...2.4.2