Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

cover restoring, versioning, sanitize and new initialization structure #105

Merged
merged 15 commits into from
Jan 10, 2017
Merged

cover restoring, versioning, sanitize and new initialization structure #105

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
8dea3af
cover restoring fixed
khaydarov Dec 19, 2016
0b7f330
upd
khaydarov Dec 19, 2016
876cc23
fetch fixed in safari
khaydarov Dec 19, 2016
f69d85d
updated
khaydarov Dec 19, 2016
a26c2fa
plugins
khaydarov Dec 21, 2016
586afdb
plugins ready
khaydarov Dec 21, 2016
c3d16cd
code improved
khaydarov Dec 23, 2016
fac0a66
fixed bug with backspace
khaydarov Dec 23, 2016
1c1e647
improved architecture
khaydarov Dec 23, 2016
f0545b6
Versioning (#102)
khaydarov Jan 10, 2017
5ae717f
Merge branch 'master' into cover-fix
khaydarov Jan 10, 2017
368f964
upd
khaydarov Jan 10, 2017
2c33a60
clear from conflicts
khaydarov Jan 10, 2017
7ee9bcc
upd
khaydarov Jan 10, 2017
60e8c9a
upd
khaydarov Jan 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
upd
  • Loading branch information
@khaydarov
khaydarov committed Jan 10, 2017
commit 368f9640f0e3615ae0a6b54d670fe877536fe482
17 changes: 0 additions & 17 deletions example.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,11 +53,8 @@
<script>
codex.start({
textareaId : "codex_area",
<<<<<<< HEAD
initialBlockPlugin : 'paragraph',
uploadImagesUrl : '/hull',
=======
>>>>>>> master
tools : {
paragraph: {
type: 'paragraph',
Expand All @@ -68,12 +65,8 @@
render: paragraphTool.render,
save: paragraphTool.save,
enableLineBreaks: false,
<<<<<<< HEAD
allowedToPaste: true,
// handleTagOnPaste : ['P']
=======
allowedToPaste: true
>>>>>>> master
},
paste: {
type: 'paste',
Expand All @@ -96,12 +89,8 @@
settings: headerTool.makeSettings(),
render: headerTool.render,
save: headerTool.save,
<<<<<<< HEAD
displayInToolbox: true,
// handleTagOnPaste : ['H1', 'H2', 'H3', 'H4', 'H5', 'H6']
=======
displayInToolbox: true
>>>>>>> master
},
code: {
type: 'code',
Expand Down Expand Up @@ -168,10 +157,7 @@
settings: null,
render: instagramTool.reneder,
save: instagramTool.save,
<<<<<<< HEAD
=======
displayInToolbox: false,
>>>>>>> master
enableLineBreaks: false,
allowedToPaste: false
},
Expand All @@ -184,10 +170,7 @@
settings: null,
render: twitterTool.render,
save: twitterTool.save,
<<<<<<< HEAD
=======
displayInToolbox: false,
>>>>>>> master
enableLineBreaks: false,
allowedToPaste: false
}
Expand Down