Commit graph

246 commits

Author SHA1 Message Date
George Berezhnoy
cb1c328548 codex -> codex.eritor totally 2017-02-02 14:33:22 +03:00
George Berezhnoy
4336036d5c codex -> codex.editor 2017-02-02 14:07:29 +03:00
George Berezhnoy
5abe5d55cb Merge remote-tracking branch 'refs/remotes/origin/master' into comments
# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	codex.js
#	modules/draw.js
#	modules/ui.js
#	whatwg-fetch.js
#	whatwg-fetch.js.map
2017-02-02 13:36:00 +03:00
George Berezhnoy
b6b8155ce8 Comments for block added 2017-02-02 02:37:47 +03:00
Peter Savchenko
e71a12401a Refactoring (#144)
* codex -> codex.editor

* ESlint code style

* Code lint

* fix inline module 'this' call

* fixed toolbox leaf

* removed empty spaces

* caret module code improved
2017-02-01 20:25:59 +03:00
Peter Savchenko
70df6b20b0 New plugin preparation scheme - now async (#143)
- core.importScript now returns a Promise
- ui.preparePlugins now returns a Promise
- `prepare` method of tools now *should* return a promise
2017-02-01 12:14:00 +03:00
Peter Savchenko
c7e97ef938 mobile view toolbar updated 2017-01-31 20:10:59 +03:00
Peter Savchenko
001eea4206 mobile view updated 2017-01-31 19:54:11 +03:00
Peter Savchenko
62b3ed440d some mobile view improvements 2017-01-31 18:59:54 +03:00
Peter Savchenko
a7ed07a9e8 header type updated 2017-01-31 16:19:19 +03:00
Peter Savchenko
097c334ee2 fix header type -> header style 2017-01-31 16:06:09 +03:00
Peter Savchenko
a224c55836 header types lowercase 2017-01-31 15:52:46 +03:00
Peter Savchenko
80303bc573 fix 'undefined' bug 2017-01-31 15:20:09 +03:00
Peter Savchenko
503bdf3a8a wrap text into <p> in paragraph tool 2017-01-31 00:49:56 +03:00
khaydarov
6960dbe58d removed image style dublicates (#142) 2017-01-30 20:45:19 +03:00
khaydarov
c4f19d5c59 return empty text instead of undefined (#141)
* return empty text instead of undefined

* upd
2017-01-30 20:37:47 +03:00
khaydarov
44b31c16b7 Merge pull request #140 from codex-team/paragraph-parser-algorythm
Paragraph parser algorythm
2017-01-30 20:29:49 +03:00
khaydarov
ab66bb9ca5 new bundle v1.3.11 2017-01-30 20:29:26 +03:00
khaydarov
4811d44848 conflics resolved 2017-01-30 20:28:07 +03:00
khaydarov
b18a6a6deb Merge branch 'master' into paragraph-parser-algorythm
# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	package.json
#	whatwg-fetch.js.map
2017-01-30 20:26:03 +03:00
khaydarov
c5140d1085 comments to function 2017-01-30 20:20:29 +03:00
khaydarov
87b20c0686 APi method renamed 2017-01-30 20:14:01 +03:00
khaydarov
869c65f3da code improved after review 2017-01-30 20:11:58 +03:00
khaydarov
7393708d77 restore paragraph tool as initial 2017-01-30 20:00:02 +03:00
khaydarov
bb7aaee8e3 Merge branch 'master' into paragraph-parser-algorythm
# Conflicts:
#	codex-editor.js.map
#	whatwg-fetch.js.map
2017-01-30 19:57:52 +03:00
khaydarov
119f7b7ec7 new method for paragraph parser
made new method that parses content
UL won’t we passed from sanitize
2017-01-30 19:56:52 +03:00
Peter Savchenko
1cf1c3bbca increment version to 1.3.10 2017-01-30 18:12:50 +03:00
Peter Savchenko
1caaaeaaf0 incorrect scheme 2017-01-30 17:56:04 +03:00
Peter Savchenko
1b090ba815 quote styles updated 2017-01-30 17:10:59 +03:00
Peter Savchenko
6639a140e7 tweet and quote plugins updated
- [x] В цитате слишком мелкий шрифт в имени и должности. Нужно сделать
обычный, как у текста
- [x] Цитата - должность должна быть черным шрифтом
- [x] Цитата - сделать квадратное фото
- [x] Цитата у ce-quote 	— margin: 0;  padding: 15px 0;
- [x] В плагине твиттера лоадер пропадает слишком рано, до рендеринга
твита
- [x] Твиттер — у подписи добавить белый фон
- [x] Твиттер — добавить width 100% к iframe, убрать max-width у подписи
- [x] Твиттер — разрешить добавлять ссылки/жирность в подписи
2017-01-30 16:18:54 +03:00
khaydarov
5a08b311d1 twitters caption (#138) 2017-01-29 22:19:35 +03:00
khaydarov
e9e05c9a9f apply filter blur immediatelly (#137) 2017-01-28 22:54:04 +03:00
khaydarov
664e01a020 small fixes 2017-01-28 22:51:09 +03:00
George Berezhnoy
81886fc563 Twitch fix (#135)
* fix

* Update embed.css

* upd version from master
2017-01-28 17:59:57 +03:00
Peter Savchenko
13d9c04781 settings&delete icons background 2017-01-28 17:40:42 +03:00
khaydarov
8eb549aa35 pasted text/plain or text/html (#134) 2017-01-28 17:14:36 +03:00
Peter Savchenko
0c55a995b4 plus button showing, embed.js paddings removed (#133) 2017-01-28 17:11:03 +03:00
khaydarov
6889112301 changed caption contains to InnerHTML (#132) 2017-01-28 17:00:02 +03:00
khaydarov
6e81e84b97 embed to video_extended (#131) 2017-01-28 16:52:53 +03:00
khaydarov
bb00b3e156 Hotfix (#130)
* fixed bug with onload callback

onload callback sends context

* fixed dataset bigurl

* heading settings
2017-01-28 16:38:10 +03:00
khaydarov
d55c06d650 fixed bug with onload callback (#129)
onload callback sends context
2017-01-28 16:33:09 +03:00
khaydarov
37982f5dbc link tool improved (#128)
- Modular version
- Callbacks appended
- Can be configured
2017-01-28 01:28:37 +03:00
khaydarov
43b7467409 update paste pattern map 2017-01-27 21:51:04 +03:00
khaydarov
30af67f3cf remove unused variables (#127) 2017-01-27 21:19:22 +03:00
khaydarov
d1a04fc454 image module hotfix (#126)
* image module hotfix

* image improved configurations

* Image plugin updated

- add border settings
- show selected settings
- stretched setting
2017-01-27 21:10:04 +03:00
khaydarov
cefa27971e update redactor version. New bundle 2017-01-26 21:12:17 +03:00
khaydarov
9ed8a19208 Merge pull request #125 from codex-team/quote-mods
Quote modifications
2017-01-26 20:13:01 +03:00
khaydarov
b6148a747c upd 2017-01-26 20:12:30 +03:00
khaydarov
e710a41e8c quote photo preview 2017-01-26 20:01:22 +03:00
khaydarov
6e88738c9b quote modifications 2017-01-26 19:27:48 +03:00