Commit graph

323 commits

Author SHA1 Message Date
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
Murod Khaydarov 262f2d04fe Merge branch 'master' into release.1.6 2017-04-23 01:29:48 +03:00
Taly 79dfa8cbe7 Merge pull request #185 from codex-team/sanitizer
sanitize improvements
2017-04-23 01:29:14 +03:00
Murod Khaydarov aadde64fbe comments 2017-04-23 01:12:06 +03:00
Murod Khaydarov a281802b18 update 2017-04-23 01:08:10 +03:00
Murod Khaydarov 49a4290e8e sanitize improvements 2017-04-23 00:53:06 +03:00
Peter Savchenko bff230e7c7 Stylelint config added 2017-04-22 17:13:43 +03:00
Peter Savchenko 0c8f6e6a70 Merge remote-tracking branch 'origin/release.1.6' 2017-03-21 21:46:32 +03:00
George Berezhnoy 510764a3cd Attaches plugin (#181)
* Attaches plugin

* Ignore server dir

* Progress bar added

* Styles upd

* Fix

* refactoring

* core.ajax fix

* Upd

* Upd

* update styles

* remove tmp return

* styles updated

* file title now 'title'

* Current upload check

* update attaches and image plugin
2017-03-21 21:45:52 +03:00
Murod Khaydarov aff9ea13ad Merge branch 'master' into release.1.6
# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	package.json
#	whatwg-fetch.js.map
2017-03-16 01:08:48 +03:00
khaydarov 7972b2ff50 sanitizer configuration (#179) 2017-03-16 00:42:47 +03:00
Taly a98d6e4f1a Release.1.6 (#178)
* Remove textarea, add holder

* Change textareaId to holderId release.1.6.0

* Update bundles release.1.6
2017-03-15 17:29:55 +03:00
Taly Guryn 35b6f4f83b Update bundles release.1.6 2017-03-15 17:27:50 +03:00
Taly Guryn 0bba3dcc3a Merge branch 'remove-textarea' into release.1.6 2017-03-15 17:26:43 +03:00
Taly Guryn 37a51c3faf Merge branch 'master' into release.1.6.0 2017-03-15 17:25:22 +03:00
Taly Guryn 53fb12dc7e Change textareaId to holderId release.1.6.0 2017-03-15 17:23:03 +03:00
Taly Guryn 16effa5f11 Remove textarea, add holder 2017-03-15 17:03:24 +03:00
Taly d581856d78 Update code block release.1.5.5 (#176) 2017-03-08 16:46:50 +03:00