Commit Graph

11 Commits

Author SHA1 Message Date
Philipp Kühn
b2e73fc0a4 Merge branch 'master' into feature/suggestions
# Conflicts:
#	examples/Components/App/style.scss
#	examples/Components/Subnavigation/index.vue
#	examples/main.js
#	packages/tiptap-extensions/package.json
2018-09-24 15:44:42 +02:00
Chrissi2812
2489997e91
UnderlineMark added 2018-09-11 10:36:44 +02:00
Philipp Kühn
db61d67156 add placeholder extension 2018-09-06 22:58:54 +02:00
Chrissi2812
e91c76334d
StrikeMark added 2018-09-06 12:29:09 +02:00
Philipp Kühn
0e3810bca0 Merge branch 'master' into feature/suggestions
# Conflicts:
#	packages/tiptap-extensions/package.json
2018-09-04 23:12:00 +02:00
Philipp Kühn
feb79e0648 add basic implementation of hightlight.js 2018-09-02 15:13:57 +02:00
Philipp Kühn
c716fe605f add prosemirror-suggestions 2018-09-01 20:51:17 +02:00
Philipp Kühn
8e2e037828 add basic image support 2018-08-31 20:42:13 +02:00
Philipp Kühn
2be2a69f35 change tiptap-extensions export 2018-08-26 19:43:02 +02:00
Philipp Kühn
deb8cb33b0 move history plugin to extension package 2018-08-25 21:33:06 +02:00
Philipp Kühn
e2176f00fd move extensions to own package 2018-08-23 22:08:19 +02:00