• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2586 removing HTML tags on export to xls

LDEV-2586 removing HTML tags on export to xls

LDEV-2089 Email messaging

*Merge from HEAD

    • binary
    /lams_build/lib/lams/lams-central.jar
    • -6
    • +6
    /lams_common/db/sql/insert_lams_windows_config_data.sql
LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

*merge from HEAD

LDEV-2509 Embedded SMTP server

*Merge from HEAD

    • -0
    • +29
    /lams_admin/web/config/editconfig.jsp
    • -0
    • +12
    /lams_build/conf/j2ee/lams.application.xml
    • -0
    • +12
    /lams_build/conf/j2ee/rams.application.xml
    • binary
    /lams_build/lib/aspirin/aspirin.jar
    • binary
    /lams_build/lib/aspirin/dnsjava-2.0.6.jar
    • -0
    • +3
    /lams_common/db/sql/insert_lams_unix_config_data.sql
    • -0
    • +3
    /lams_common/db/sql/insert_lams_windows_config_data.sql
    • -0
    • +3
    /lams_common/db/sql/insert_rams_unix_config_data.sql
  1. … 3 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".

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
    • -7
    • +7
    /lams_common/db/sql/insert_types_data.sql
  1. … 4 more files in changeset.
LDEV-2519 added fields 'timezone' and 'enable flash for learner window' to Admin user edit page

    • -0
    • +2
    /lams_admin/conf/xdoclet/struts-forms.xml
LDEV-2544 Default Timezones

*merge from lams2_3_release

    • -0
    • +6
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -0
    • +65
    /lams_admin/web/timezoneManagement.jsp
    • -0
    • +64
    /lams_admin/web/timezoneServerManagement.jsp
    • -0
    • +31
    /lams_admin/web/WEB-INF/struts/struts-config.xml
  1. … 21 more files in changeset.
file timezoneManagement.jsp was initially added on branch lams2_3_release.

    • -0
    • +0
    /lams_admin/web/timezoneManagement.jsp
file timezoneServerManagement.jsp was initially added on branch lams2_3_release.

    • -0
    • +0
    /lams_admin/web/timezoneServerManagement.jsp
LDEV-2544 Default Timezones

*added ability to change server timezone

    • -0
    • +65
    /lams_admin/web/timezoneManagement.jsp
    • -0
    • +64
    /lams_admin/web/timezoneServerManagement.jsp
    • -58
    • +0
    /lams_admin/web/timezonemanagement.jsp
    • -318
    • +355
    /lams_admin/web/WEB-INF/struts/struts-config.xml
    • -1
    • +3
    /lams_common/db/sql/create_lams_11_tables.sql
    • -34
    • +34
    /lams_common/db/sql/insert_types_data.sql
  1. … 6 more files in changeset.
LDEV-2030 fixing an error that occurs on updating user during LDAP sync

LDEV-2572 *merged to lams2_3_release

LDEV-2572 fixing some issues

* libs updated

LDEV-2564 fixing some issues

And libs updated

    • -28
    • +1
    /lams_build/conf/j2ee/lams.application.xml
    • binary
    /lams_build/lib/batik/batik-1.7.jar
    • binary
    /lams_build/lib/batik/batik-anim.jar
    • binary
    /lams_build/lib/batik/batik-bridge.jar
    • binary
    /lams_build/lib/batik/batik-css.jar
    • binary
    /lams_build/lib/batik/batik-dom.jar
    • binary
    /lams_build/lib/batik/batik-ext.jar
    • binary
    /lams_build/lib/batik/batik-gvt.jar
    • binary
    /lams_build/lib/batik/batik-parser.jar
    • binary
    /lams_build/lib/batik/batik-svg-dom.jar
    • binary
    /lams_build/lib/batik/batik-util.jar
    • binary
    /lams_build/lib/batik/batik-xml.jar
LDEV-2572 fixing minor bugs

LDEV-2574 adding new output line

LDEV-2574 removed image padding, added adjusting width capability

    • -0
    • +201
    /lams_svggenerator/conf/batikjar/META-INF/LICENSE
    • -0
    • +11
    /lams_svggenerator/conf/batikjar/META-INF/MANIFEST.MF
    • -0
    • +18
    /lams_svggenerator/conf/batikjar/META-INF/NOTICE
    • binary
    /lams_svggenerator/lib/batik-anim.jar
    • binary
    /lams_svggenerator/lib/batik-awt-util.jar
    • binary
    /lams_svggenerator/lib/batik-bridge.jar
    • binary
    /lams_svggenerator/lib/batik-codec.jar
    • binary
    /lams_svggenerator/lib/batik-css.jar
    • binary
    /lams_svggenerator/lib/batik-dom.jar
    • binary
    /lams_svggenerator/lib/batik-ext.jar
    • binary
    /lams_svggenerator/lib/batik-gvt.jar
    • binary
    /lams_svggenerator/lib/batik-parser.jar
    • binary
    /lams_svggenerator/lib/batik-script.jar
    • binary
    /lams_svggenerator/lib/batik-svg-dom.jar
  1. … 4 more files in changeset.
file batik-1.7.jar was added on branch lams2_3_release on 2010-09-14 12:25:42 +0000

    • binary
    /lams_build/lib/batik/batik-1.7.jar
LDEV-2572 Add SVG *and PNG* images on export

    • binary
    /lams_build/lib/batik/batik-1.7.jar
    • binary
    /lams_build/lib/batik/batik-anim.jar
    • binary
    /lams_build/lib/batik/batik-bridge.jar
    • binary
    /lams_build/lib/batik/batik-css.jar
    • binary
    /lams_build/lib/batik/batik-dom.jar
    • binary
    /lams_build/lib/batik/batik-ext.jar
    • binary
    /lams_build/lib/batik/batik-gvt.jar
    • binary
    /lams_build/lib/batik/batik-parser.jar
    • binary
    /lams_build/lib/batik/batik-svg-dom.jar
    • binary
    /lams_build/lib/batik/batik-util.jar
    • binary
    /lams_build/lib/batik/batik-xml.jar
file ActivityTreeNodeComparator.java was added on branch lams2_3_release on 2010-09-14 12:35:04 +0000

LDEV-2572 Add SVG *and PNG* images on export

LDEV-2572 supports ordering inside branching activity

LDEV-2572 fixed handling of overlapped activities