Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5083 Reset branch to current 4.7 state

4.7 contains latest 4.6, React back end initial implementation and

previous LDEV-5083 changes

    • binary
    ./office2013/images/hidpi/close.png
    • binary
    ./office2013/images/hidpi/lock-open.png
    • binary
    ./office2013/images/hidpi/refresh.png
  1. … 10 more files in changeset.
LDEV-5268 Merge 4.5 into 4.6

  1. … 4 more files in changeset.
LDEV-5268 Add wordcount and notification plugins to CKEditor

    • -0
    • +168
    ./office2013/notification.css
  1. … 87 more files in changeset.
LDEV-5257 Update CKEditor from 4.16.0 to 4.16.2

  1. … 29 more files in changeset.
LDEV-5198 Fix CKEditor icons

LDEV-5198 Remove emojione plugin

  1. … 11 more files in changeset.
LDEV-5198 Upgrade CKEditor to version 4.16.0

    • binary
    ./office2013/images/hidpi/close.png
    • binary
    ./office2013/images/hidpi/lock-open.png
    • binary
    ./office2013/images/hidpi/refresh.png
  1. … 157 more files in changeset.
LDEV-4997 Renormalize line endings with git

  1. … 419 more files in changeset.
LDEV-4999 Fix monitor role detection when updating learner mark

  1. … 462 more files in changeset.
LDEV-4556 Upgrade CKEditor to the latest version 4.9.2

  1. … 235 more files in changeset.
LDEV-4428 Add emojione and autoembed plugins

Both plugins were added as integrated plugins (so no need to specify

them as extraPlugins). At the same time Emojione button replaced Smiley

one.

As a side note, when adding Emojione plugin as integrated one, its icon

gets incorporated into icons.png incorrectly (the size of the icon is

much bigger than 16 px) that's why it doesn't get displayed at all. So

we need to tweak editor.css and replace CSS rule for

.cke_button__emojione_icon with the following:

.cke_button__emojione_icon {background:

url(../../plugins/emojione/icons/emojione.png?t=dee79e2) no-repeat 0 0

!important; background-size: 100% !important;}

  1. … 49 more files in changeset.
LDEV-4428 Upgrade CKEditor to the latest version 4.7.3

Build is created using CKEditor's Download builder. Full preset is

chosen after which some of the plugins were removed (for details on

which plugins is chosen see \lams_central\web\ckeditor\build-config.js).

Office2013 skin is selected as the default skin.

  1. … 372 more files in changeset.
LDEV-3310 Switched to using office2013 skin

    • -0
    • +5
    ./office2013/dialog.css
    • -0
    • +5
    ./office2013/editor.css
    • binary
    ./office2013/icons.png
    • binary
    ./office2013/icons_hidpi.png
    • binary
    ./office2013/images/arrow.png
    • binary
    ./office2013/images/close.png
    • binary
    ./office2013/images/hidpi/close.png
    • binary
    ./office2013/images/hidpi/lock-open.png
    • binary
    ./office2013/images/hidpi/lock.png
    • binary
    ./office2013/images/hidpi/refresh.png
    • binary
    ./office2013/images/lock-open.png
    • binary
    ./office2013/images/lock.png
    • binary
    ./office2013/images/refresh.png
  1. … 2 more files in changeset.
LDEV-3310 Switched to using office2013 skin

  1. … 25 more files in changeset.
LDEV-3296 Upgrade CKEditor to version 4.4.3

    • -0
    • +5
    ./moonocolor/dialog.css
    • -0
    • +5
    ./moonocolor/dialog_ie.css
    • -0
    • +5
    ./moonocolor/dialog_ie7.css
    • -0
    • +5
    ./moonocolor/dialog_ie8.css
    • -0
    • +5
    ./moonocolor/dialog_iequirks.css
    • -0
    • +5
    ./moonocolor/dialog_opera.css
    • -0
    • +5
    ./moonocolor/editor.css
    • -0
    • +5
    ./moonocolor/editor_gecko.css
    • -0
    • +5
    ./moonocolor/editor_ie.css
    • -0
    • +5
    ./moonocolor/editor_ie7.css
    • -0
    • +5
    ./moonocolor/editor_ie8.css
    • -0
    • +5
    ./moonocolor/editor_iequirks.css
    • binary
    ./moonocolor/icons.png
    • binary
    ./moonocolor/icons_hidpi.png
    • binary
    ./moonocolor/images/arrow.png
  1. … 313 more files in changeset.
LDEV-3296 Upgrade CKEditor to version 4.4.3

    • -0
    • +5
    ./moonocolor/dialog.css
    • -0
    • +5
    ./moonocolor/dialog_ie.css
    • -0
    • +5
    ./moonocolor/dialog_ie7.css
    • -0
    • +5
    ./moonocolor/dialog_ie8.css
    • -0
    • +5
    ./moonocolor/dialog_iequirks.css
    • -0
    • +5
    ./moonocolor/dialog_opera.css
    • -0
    • +5
    ./moonocolor/editor.css
    • -0
    • +5
    ./moonocolor/editor_gecko.css
    • -0
    • +5
    ./moonocolor/editor_ie.css
    • -0
    • +5
    ./moonocolor/editor_ie7.css
    • -0
    • +5
    ./moonocolor/editor_ie8.css
    • -0
    • +5
    ./moonocolor/editor_iequirks.css
    • binary
    ./moonocolor/icons.png
    • binary
    ./moonocolor/icons_hidpi.png
    • binary
    ./moonocolor/images/arrow.png
  1. … 313 more files in changeset.
LDEV-2951: removing unused CKEditor skins

  1. … 13 more files in changeset.
LDEV-2746: Unmodified CKEditor version 3.6.2 with filemanager, movieplayer, videorecorder, pain and equation copied from previous version.

  1. … 144 more files in changeset.
LDEV-2577 The new CKEditor does not have Java Integration library (yet). We have been using it to: a) get the tag library to create our own tag <lams:FCKeditor> But the new CKEditor uses AJAX to get the contents, so the library is not needed anymore. The references to it has been deleted from every tool. FCKEditor.tag has been rewritten to use the new syntax. b) get a FCKEditor internal file manager by a Connector from the jar The new CKEditor does not provide a file manager - the license became commercial and the whole thing became a separate project, CKFinder. There were alternatives suggested on the web: jasfinder - http://sourceforge.net/projects/jasfinder/support kcfinder - http://kcfinder.sunhater.com/ some other - http://www.miguelmanchego.com/2009/gestor-de-archivos-ckeditor/ but we have already nicely integrated with the old file manager. This page: http://jacek-kromski.jogger.pl/2009/09/25/integracja-ckeditor-z-przegladarka-plikow-z-fckeditor/ in polish says how to use the file manager from the old FCKEditor. The steps that have to be done: - download the new CKEditor - download the old FCKEditor - copy the filemanager to ckeditor directory - in the file browser/default/frmresourceslist.html, line 92 (with SetUrl call) needs to be replaced to: window.top.opener.CKEDITOR.tools.callFunction( window.top.document.CKEditorFuncNum, fileUrl, '' ); - in the file browser/default/browser.html add in line 80: document.CKEditorFuncNum = GetUrlParam( 'CKEditorFuncNum');

FCKeditor has been used in version 2.6.6, the last one before switching to CKEditor project.

Changes required to use newer version of Java Integration library

for FCKEditor so it was upgraded to the latest (for FCKEditor, because one for CKEditor does not exist) version 2.6.

This also required the Prototype to be upgraded to the latest 1.6.1.

The CKEditor code also needed to be changed, so if another upgrade to a newer version occurs, we need to remember to repeat these steps:

http://cksource.com/forums/viewtopic.php?f=5&t=15750

It says:

/ckeditor/plugins/link/dialogs/link.js

Changes

label:a.lang.common.target,'default':'notSet' --> label:a.lang.common.target,'default':'_blank'

label:a.lang.link.targetFrameName,'default':'' --> label:a.lang.link.targetFrameName,'default':'_blank'

It is also worth mentioning that if you include the ckeditor.js file twice in the same page, sometimes it causes trouble, thus detection in the CKEditor.tag files.

    • binary
    ./kama/icons_rtl.png
    • binary
    ./kama/images/dialog_sides.gif
    • binary
    ./kama/images/dialog_sides.png
    • binary
    ./kama/images/dialog_sides_rtl.png
    • binary
    ./kama/images/mini.gif
    • binary
    ./kama/images/noimage.png
    • binary
    ./kama/images/sprites.png
    • binary
    ./kama/images/sprites_ie6.png
    • binary
    ./kama/images/toolbar_start.gif
    • -0
    • +9
    ./office2003/dialog.css
  1. … 1082 more files in changeset.