Commit Graph

9 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
Philipp Kühn
db61d67156 add placeholder extension 2018-09-06 22:58:54 +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
02cee263b2 add export 2018-08-28 09:31:08 +02:00
Philipp Kühn
dcdc969fcf rename default route 2018-08-23 23:05:53 +02:00
Philipp Kühn
b01582f376 add subnavigation component 2018-08-23 07:53:08 +02:00