Commit graph

340 commits

Author SHA1 Message Date
Taly Guryn
dfdaba6bb1 editor.settings.placeholder 2017-08-30 06:48:52 +03:00
Taly
73ebe4162f Merge pull request #199 from codex-team/placeholder
Add custom placeholder
2017-08-30 06:38:36 +03:00
Taly Guryn
49827b75d7 Add custom placeholder 2017-08-30 06:33:09 +03:00
Taly
91011e650b Merge pull request #198 from codex-team/add-article-id
Add article id
2017-08-30 05:23:48 +03:00
Taly Guryn
610ee0b27c Update version 2017-08-30 05:23:01 +03:00
Taly Guryn
ae073a61ce Add article id 2017-08-30 05:22:35 +03:00
Taly
140d67d198 Merge pull request #197 from codex-team/update-toolbar
Update inline toolbar and remove underline
2017-08-30 04:20:39 +03:00
Taly Guryn
8d628b9dc3 Update version 2017-08-30 04:19:02 +03:00
Taly Guryn
3e93bbde3c 💔 2017-08-30 04:14:34 +03:00
Taly Guryn
a879e1db35 Update inline toolbar and remove underline 2017-08-30 04:12:30 +03:00
George Berezhnoy
4d862967d5 Merge pull request #194 from codex-team/remove-placeholder
Remove placeholder when toolbar is opened
2017-08-30 03:50:20 +03:00
George Berezhnoy
e0df769419 content: '' => display: none 2017-08-30 03:50:05 +03:00
George Berezhnoy
880505a88c Remove placeholder when toolbar is opened 2017-08-30 03:40:16 +03:00
George Berezhnoy
276f797599 Merge pull request #193 from codex-team/new-saver
New saver
2017-08-30 02:47:28 +03:00
George Berezhnoy
b1dcd3872d Small upd 2017-08-30 02:43:03 +03:00
George Berezhnoy
3078e753f2 Merge branch 'master' into new-saver 2017-08-30 02:36:32 +03:00
George Berezhnoy
b5fae97b3d New saver 2017-08-30 02:33:57 +03:00
Taly
67bd710045 Merge pull request #191 from codex-team/keyup-event-for-showing-inline-toolbar
Add keyup event for showing inline toolbar
2017-08-30 02:23:05 +03:00
Taly Guryn
9692840ef5 Update version 2017-08-30 02:20:20 +03:00
Taly Guryn
1e86e4d076 Add CODEOWNERS 2017-08-30 02:16:33 +03:00
Taly Guryn
5122cb783e Add keyup event 2017-08-30 02:12:17 +03:00
George Berezhnoy
ec30ad53e3 Fix indent 2017-05-23 17:27:26 +03:00
George Berezhnoy
07167f6dc8 Fix attaches plugin 2017-05-23 17:17:30 +03:00
George Berezhnoy
19599675fc Merge pull request #190 from codex-team/attaches-fix
Attaches fix
2017-05-23 17:15:04 +03:00
George Berezhnoy
ba88cf0ce9 Attaches fix 2017-05-23 17:10:48 +03:00
Murod Khaydarov
fd065a08ef Merge branch 'fix' into release.1.6 2017-04-25 18:07:12 +03:00
khaydarov
665523a423 fix ce-block data attribute (#188) 2017-04-25 18:06:51 +03:00
Murod Khaydarov
78db8563d6 fix ce-block data attribute 2017-04-25 18:05:05 +03:00
Peter Savchenko
b009799e65 Merge branch 'master' into release.1.6 2017-04-25 03:47:43 +03:00
Peter Savchenko
dc1d780c89 configure sanitize 2017-04-25 03:47:30 +03:00
George Berezhnoy
f2ef09ed43 Merge remote-tracking branch 'origin/master' into release.1.6 2017-04-24 20:44:12 +03:00
George Berezhnoy
50ef10ff51 Merge pull request #187 from codex-team/paste-hotfix
Paste hotfix
2017-04-24 20:43:42 +03:00
George Berezhnoy
aecd0da45a Update version 2017-04-24 20:41:36 +03:00
George Berezhnoy
4989affd05 Paste hotfix 2017-04-24 20:34:40 +03:00
George Berezhnoy
cbef91ea11 Merge remote-tracking branch 'origin/master' into release.1.6 2017-04-24 20:07:39 +03:00
George Berezhnoy
02ab4b50d2 Merge pull request #186 from codex-team/split-pasted-data
Now pasted text splits into paragraphs
2017-04-24 20:06:47 +03:00
George Berezhnoy
eed31bb193 Upd 2017-04-24 19:46:03 +03:00
George Berezhnoy
eb362a6e23 Upd 2017-04-24 19:21:47 +03:00
George Berezhnoy
0968152570 Upd 2017-04-24 13:49:57 +03:00
George Berezhnoy
cf1734d1b6 Remove log 2017-04-24 13:08:07 +03:00
George Berezhnoy
f0e92915ad Better browser behaviour emulation 2017-04-24 13:06:50 +03:00
George Berezhnoy
1286311d38 Some improvements 2017-04-24 10:23:48 +03:00
George Berezhnoy
f8dda6c65d Finally remove personality from example.html 2017-04-24 03:17:01 +03:00
George Berezhnoy
de9572064d Remove personality from example.html 2017-04-24 03:16:42 +03:00
George Berezhnoy
f4a6f1cd9c Don't allow empty paragraphs 2017-04-24 03:08:03 +03:00
George Berezhnoy
8fac7517c6 Move paste event handler to paste.js 2017-04-24 02:26:08 +03:00
George Berezhnoy
e027488fa8 Update version 2017-04-24 02:04:38 +03:00
George Berezhnoy
891d26ded7 Now pasted text splits into paragraphs 2017-04-24 02:02:06 +03:00
Peter Savchenko
a0014e6296 Merge branch 'master' into release.1.6 2017-04-23 21:42:51 +03:00
Peter Savchenko
da4d8153d7 Improve AJAX context saving (#184)
* Improve AJAX context saving

Value returned in beforeSend method now will be passed as context to
the Error, Success and Progress events

* resolve conflict
2017-04-23 17:11:03 +03:00