Commit Graph

224 Commits

Author SHA1 Message Date
Philipp Kühn
80144815a9 pass editor to sendable hook 2019-05-10 15:37:21 +02:00
Philipp Kühn
ec9c2f3e1f fix mark order 2019-05-09 10:52:34 +02:00
Philipp Kühn
3ce10e74b1
Merge pull request #286 from StickyKnow/fix-258-paste-link
do not transform text of pasted links
2019-05-09 10:34:13 +02:00
Philipp Kühn
7cd0fd40ac
Merge pull request #278 from Chrissi2812/issue-232
fixes #232: Clicking toolbar TodoItem lifts TodoItem
2019-05-09 10:32:08 +02:00
Philipp Kühn
f02461cc79 destroy sockets 2019-05-08 22:27:54 +02:00
Christoph Flathmann
5d2fac08f1
Merge branch 'master' into issue-232 2019-05-08 13:34:12 +02:00
Chrissi2812
fc41ff36de
allow nested todo_lists via options on todo_item 2019-05-08 12:26:13 +02:00
Gil B. Chan
c6f281e487 change deprecated slot-scope to v-slot
Directive `slot-scope` is deprecated as of Vue v2.6.0. See [here](https://vuejs.org/v2/guide/components-slots.html) for details. Currently tiptap depends on Vue ^2.6.10. So this commit introduces new directive `v-slot` on README.md and examples.
2019-05-08 06:25:36 +09:00
Marius Tolzmann
6384bfde4e fix Link route in examples to not transform pasted links anymore 2019-05-07 21:02:06 +02:00
Philipp Kühn
364c744cef wording 2019-05-07 10:38:27 +02:00
Philipp Kühn
1f953a3136 update collab text 2019-05-07 10:32:43 +02:00
Philipp Kühn
c624014877
Merge pull request #277 from Chrissi2812/simplified-placeholder-example
Placeholder Example: replace watcher with v-model only
2019-05-07 07:51:08 +02:00
Philipp Kühn
1df723d269 add heading to collab page 2019-05-06 10:16:55 +02:00
Philipp Kühn
a22185de57 improve spacings 2019-05-05 23:08:28 +02:00
Philipp Kühn
76dca53d80 send only json steps 2019-05-05 21:47:52 +02:00
Philipp Kühn
03cb2d4c75 show users count 2019-05-04 20:40:18 +02:00
Philipp Kühn
7cad96ee3c add some comments 2019-05-04 12:31:10 +02:00
Philipp Kühn
9a688409fb add history plugin to collab 2019-05-04 11:04:39 +02:00
Philipp Kühn
0a98827b4c refactoring 2019-05-04 10:54:53 +02:00
Philipp Kühn
a614f0cce1 move url 2019-05-04 00:28:29 +02:00
Philipp Kühn
55e5a4a3ae move collab extension 2019-05-04 00:25:14 +02:00
Philipp Kühn
cd46b163d0 add emitter, move some collab logic to extension 2019-05-04 00:05:39 +02:00
Philipp Kühn
2475bf6123 add loading state 2019-05-03 22:14:18 +02:00
Philipp Kühn
fd404f5c1f change socket url 2019-05-03 21:50:17 +02:00
Philipp Kühn
e9e50a2e75 refactoring 2019-05-03 18:05:05 +02:00
Philipp Kühn
b5a5472171 refactoring 2019-05-03 17:50:30 +02:00
Philipp Kühn
ee12e0577d add something broken 2019-05-03 16:05:30 +02:00
Philipp Kühn
5433870183 add something broken 2019-05-03 14:04:37 +02:00
Philipp Kühn
83075f28e6 Merge branch 'master' into feature/collab-plugin
# Conflicts:
#	packages/tiptap/src/Editor.js
#	yarn.lock
2019-05-03 10:56:52 +02:00
Philipp Kühn
0d69570576 code style 2019-04-30 16:19:28 +02:00
Philipp Kühn
0e6efc3889
Merge pull request #228 from Chrissi2812/menu-bubble-position
Fix Menu bubble position
2019-04-30 16:07:20 +02:00
Chrissi2812
1b5b60c595
simplify placeholder example 2019-04-25 17:29:52 +02:00
Chrissi2812
2f0acf2f91
keep menuBubble in bounding box of editor 2019-04-25 16:27:22 +02:00
Chrissi2812
cf7a442edd
add link to documentation 2019-04-24 18:33:59 +02:00
Philipp Kühn
d8f62f010a fix tippy for suggestions 2019-04-11 20:13:52 +02:00
Philipp Kühn
bafa4a62b1
Merge pull request #210 from Chrissi2812/reactive-plugin-options
Reactive extension options
2019-03-06 06:48:42 +01:00
Chrissi2812
7762316ecd
changed placeholder example for reactive placeholder 2019-02-25 16:24:39 +01:00
Chrissi2812
04de7048f2
change "add link" text to "update link" if it's already a link 2019-02-20 12:43:11 +01:00
Chrissi2812
b51ac10671
fixed bug in link-example
Link didn't got reset on menububble hide.
2019-02-20 12:17:36 +01:00
Chrissi2812
eb43c2030e
fix pasting in embed example 2019-02-18 16:21:10 +01:00
Philipp Kühn
94ede9c047 fix broken image 2019-02-06 11:34:21 +01:00
Philipp Kühn
9b90d6437e do not show placeholder if non editable 2019-02-06 11:28:40 +01:00
Philipp Kühn
ac3b95716e add new collab test 2019-02-06 10:33:16 +01:00
Philipp Kühn
6a0aaf15e6 add something broken again 2019-02-06 00:03:23 +01:00
Philipp Kühn
f4fa5a8e70 refactoring 2019-02-05 14:00:30 +01:00
Philipp Kühn
bdcd5c967f add socket.io to collab demo 2019-02-05 03:07:43 +01:00
Philipp Kühn
aba26c7e74 started adding a better collab demo 2019-02-05 02:20:49 +01:00
Philipp Kühn
bf21ebd719 improve collab demo 2019-02-03 21:18:03 +01:00
Philipp Kühn
b23cdcba6b add basic collab implementation 2019-02-03 14:06:17 +01:00
Илья
4c278e08a0
Update examples.js 2019-01-25 16:34:27 +02:00