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.

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

fix: force submodule to point at right upstream version #21

Merged
merged 2 commits into from
May 20, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion ck.sh
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ case "$COMMAND" in
commitmsg=$(git log --oneline | head -1)

cd ..
git add ckeditor-dev
git add -f ckeditor-dev
git commit -m "Update ckeditor-dev to $commitmsg"

echo
Expand Down
2 changes: 1 addition & 1 deletion ckeditor-dev
2 changes: 1 addition & 1 deletion ckeditor/ckeditor.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ckeditor/samples/old/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -148,12 +148,12 @@ <h2 class="samples">
<dt><a class="samples" href="enterkey/enterkey.html">Using the &quot;Enter&quot; key in CKEditor</a></dt>
<dd>Configuring the behavior of <em>Enter</em> and <em>Shift+Enter</em> keys.</dd>

<dt><a class="samples" href="htmlwriter/outputforflash.html">Output for Flash</a></dt>
<dd>Configuring CKEditor to produce HTML code that can be used with Adobe Flash.</dd>

<dt><a class="samples" href="htmlwriter/outputhtml.html">Output HTML</a></dt>
<dd>Configuring CKEditor to produce legacy HTML 4 code.</dd>

<dt><a class="samples" href="htmlwriter/outputforflash.html">Output for Flash</a></dt>
<dd>Configuring CKEditor to produce HTML code that can be used with Adobe Flash.</dd>

<dt><a class="samples" href="toolbar/toolbar.html">Toolbar Configurations</a></dt>
<dd>Configuring CKEditor to display full or custom toolbar layout.</dd>

Expand Down
2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/kama/editor_iequirks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono-lisa/editor_iequirks.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_gecko.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie7.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_ie8.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ckeditor/skins/moono/editor_iequirks.css

Large diffs are not rendered by default.