Skip to content

Image Support(continuation of #40)#215

Merged
bherila merged 40 commits intosstur:masterfrom
ZeroCho:master
Jul 16, 2017
Merged

Image Support(continuation of #40)#215
bherila merged 40 commits intosstur:masterfrom
ZeroCho:master

Conversation

@ZeroCho
Copy link
Copy Markdown
Contributor

@ZeroCho ZeroCho commented Jul 15, 2017

gregziegan and others added 30 commits May 3, 2016 09:56
merge master to image-support
# Conflicts:
#	README.md
#	package.json
#	src/RichTextEditor.js
#	src/lib/EditorToolbar.js
@ZeroCho
Copy link
Copy Markdown
Contributor Author

ZeroCho commented Jul 15, 2017

@bherila Fix all issues

@bherila bherila merged commit 147c2f3 into sstur:master Jul 16, 2017
sstur pushed a commit that referenced this pull request Jul 26, 2017
* should work when the micro-dependencies update

* oh ya there was a toolbar button

* make things work except resizer

* use ENTITY_TYPE.IMAGE

* fix some lint and flow errors

* modify image style (#42)

* ImageSpan: add autobind

* remove resizing logic

* remove selected class and use built-in selection

* ImageSpan should have overflow hidden to prevent selection background from overflowing

* fix warning about font size

* demo

* readme

* ssr test

* Update webpack.config.js

* 0.5.1

* 0.5.2 ssr test

* react-rte-image 0.6.0

* No tilde && ImageButton as an option

* for CI and eslint

* 0.9.1 readme update for toolbar configuration

* 0.11.1 restore dist folder

* Revert README.md

* Remove dist and lib folder

* Remove dist and lib folder(again)

* Revert package.json

* Fix for flow
sstur pushed a commit that referenced this pull request Jul 27, 2017
* should work when the micro-dependencies update

* oh ya there was a toolbar button

* make things work except resizer

* use ENTITY_TYPE.IMAGE

* fix some lint and flow errors

* modify image style (#42)

* ImageSpan: add autobind

* remove resizing logic

* remove selected class and use built-in selection

* ImageSpan should have overflow hidden to prevent selection background from overflowing

* fix warning about font size

* demo

* readme

* ssr test

* Update webpack.config.js

* 0.5.1

* 0.5.2 ssr test

* react-rte-image 0.6.0

* No tilde && ImageButton as an option

* for CI and eslint

* 0.9.1 readme update for toolbar configuration

* 0.11.1 restore dist folder

* Revert README.md

* Remove dist and lib folder

* Remove dist and lib folder(again)

* Revert package.json

* Fix for flow
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.

5 participants