• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2089 Email messaging

*Merge from HEAD

  1. … 12 more files in changeset.
LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

*merge from HEAD

LDEV-2509 Embedded SMTP server

*Merge from HEAD

  1. … 17 more files in changeset.
LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

LDEV-2567: mergin to head

LDEV-2577: Reverted CKEditor skin back to "office2003".

    • binary
    ./web/ckeditor/filemanager/browser/default/images/trash.gif
LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

  1. … 27 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.

    • -1
    • +1
    ./src/web/template/js/tabcontroller.js
    • -129
    • +0
    ./web/WEB-INF/fckeditor/tlds/FCKeditor.tld
    • -216
    • +216
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
  1. … 1082 more files in changeset.
LDEV-2550 Developed new event logging mechanism

*merge from lams2_3_release

  1. … 17 more files in changeset.
LDEV-2544 Default Timezones

*merge from lams2_3_release

  1. … 33 more files in changeset.
LDEV-2544 Default Timezones

*added ability to change server timezone

  1. … 20 more files in changeset.
LDEV-2557 reverting to previous

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

    • -0
    • +570
    ./web/css/jquery-ui.css
LDEV-2567 - Making sure integration user is added as teacher when accessed through LearningDesignRepositoryServlet

LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

  1. … 5 more files in changeset.
LDEV-2564 add Option in "Edit configuration settings" for not displaying the "All My Lesson" option in My Profile tab

  1. … 5 more files in changeset.
LDEV-2556 LDEV-2557 Tooltip style and Workspace dialog /author info changes to HEAD.

  1. … 4 more files in changeset.
LDEV-2557 Added author information for a Learning Design to Workspace dialog in Author.

  1. … 1 more file in changeset.
LDEV-2556 Setting theme style of ToolTip.

  1. … 3 more files in changeset.
LDEV-2550 further development of LAMS event logging mechanism

  1. … 2 more files in changeset.
Adding Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Korean, Norwegian, Polish, Turkish

    • -217
    • +217
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -263
    • +236
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -217
    • +217
    ./conf/language/lams/ApplicationResources_pl_PL.properties
  1. … 13 more files in changeset.
file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
  1. … 1 more file in changeset.
LDEV-2507 Use common create date time str for room name (Learner and Monitor spawn IM window).

  1. … 6 more files in changeset.
LDEV-2507 New button in Monitor to open IM chat window.

  1. … 9 more files in changeset.
LDEV-2550 Develop new event logging service

  1. … 15 more files in changeset.
LDEV-2544 it displays now both timezone ID and DisplayName

  1. … 1 more file in changeset.
LDEV-2329 setAsDefineLater is triggered now only for monitors

LDEV-2329 setAsDefineLater is triggered now only for monitors