lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2481 fixing charset conversion

*merge from lams2_3_release

LDEV-2573 subFolders within the Public Folders are going to be public as well

*merge from lams2_3_release

LDEV-2568 Q&A export portfolio to include teacher's comments

*merge from lams2_3_release

    • -12
    • +15
    /lams_tool_laqa/web/export/exportportfolio.jsp
Updating English, Spanish(ES)

Updating German

Adding Spanish Mexico

    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_es_MX.properties
Adding Slovenian, Catalan

    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_ca_ES.properties
    • -0
    • +221
    /lams_tool_forum/conf/language/lams/ApplicationResources_sl_SI.properties
LDEV-1743 fixing problem with NULL sequence_id

*merge from lams2_3_release

LDEV-2577: Changed position of dialogs from "fixed" to "absolute" to display them properly in iframes.

    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
LDEV-2595: An attempt to fix overflowing of viewable screen by CKEditor: reduced width of the initial textarea.

LDEV-2595: CKEditor needs an HTML element ID to recognise which div/textfield to replace. Changed ambiguous naming in Noticeboard tool - two elements had name "content".

    • -25
    • +20
    /lams_tool_nb/web/WEB-INF/web.xml
LDEV-2523 Trim lesson name to 254 characters

LDEV-2545 Deliver email messages to students/teachers on forum postings

*merge from lams2_3_release

    • -2
    • +4
    /lams_tool_forum/db/sql/create_lams_tool_forum.sql
LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

    • -1
    • +2
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 22 more files in changeset.
LDEV-2577, LDEV-2588: Fixed names of buttons that have changed from FCKEditor. CKEditor are hidden until they are completely initialized.

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 10 more files in changeset.
LDEV-2577: Reverted CKEditor skin back to "office2003".

LDEV-2577: Workaround for Firefox limitation of inserting malicious HTML.

    • -1
    • +7
    /lams_tool_wiki/web/wikilink/wikilink.js
LDEV-2577: Reverting to previous configuration.

    • -1
    • +1
    /lams_common/db/sql/insert_lams_windows_config_data.sql
LDEV-2576 UTF-8 emails being sent correct now

LDEV-2584 fixed Instruction files displaying in Monitor

CLOUD-57 fixing planner error: losing notifyColseURL's query parameters when open in simple editor then full editor

LDEV-2577: Rewrote WikiLink for new CKEditor. For Firefox 3.6.10 inserting HTML is not working: https://bugzilla.mozilla.org/show_bug.cgi?id=596300 https://bugzilla.mozilla.org/show_bug.cgi?id=597784 https://bugzilla.mozilla.org/show_bug.cgi?id=597784

Maybe future releases of FF will allow to insert any content into editor area.

    • -19
    • +0
    /lams_tool_wiki/web/wikilink/fckplugin.js
    • -7
    • +13
    /lams_tool_wiki/web/wikilink/lang/en.js
    • -0
    • +34
    /lams_tool_wiki/web/wikilink/plugin.js
    • -0
    • +91
    /lams_tool_wiki/web/wikilink/wikilink.js
    • -0
    • +55
    /lams_tool_wiki/web/wikilink/wikilink.jsp
LDEV-2586 removing HTML tags on export to xls

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".

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
  1. … 13 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.

    • -0
    • +54
    /lams_admin/web/WEB-INF/tags/CKEditor.tag
    • binary
    /lams_build/lib/fckeditor/fckeditor-java-core-2.6.jar
    • -2
    • +2
    /lams_central/conf/xdoclet/taglib-tag.xml
    • -4
    • +0
    /lams_central/conf/xdoclet/taglibs.xml
  1. … 1082 more files in changeset.
LDEV-2550 Developed new event logging mechanism *merge from lams2_3_release

    • -7
    • +17
    /lams_common/db/sql/create_lams_11_tables.sql
    • -6
    • +6
    /lams_common/db/sql/insert_types_data.sql
  1. … 4 more files in changeset.