lams

lams_central

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 21
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 130,561
Net change in LoC this week: 0

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 21 Oct 2010
8:50 pm

Marcin Cieslak

LDEV-2577, LDEV-2588:

Fixed names of buttons that have changed from FCKEditor.

CKEditor are hidden until they are completely initialized.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
    • -15
    • +26
    ./web/includes/javascript/ckconfig_custom.js
  3. … 24 more files in changeset.
Tuesday 19 Oct 2010
7:08 pm

Andrey Balan

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

Options
    • -1
    • +5
    ./web/includes/javascript/pedagogicalPlanner.js
Monday 18 Oct 2010
10:51 pm

Marcin Cieslak

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.

Options
    • -0
    • +15
    ./web/WEB-INF/tags/CKEditor.tag
    • -3
    • +4
    ./web/includes/javascript/ckconfig_custom.js
  3. … 6 more files in changeset.
Saturday 16 Oct 2010
1:20 pm

Andrey Balan

LDEV-2089 Email messaging

*Merge from HEAD

Options
    • -108
    • +0
    ./src/java/org/lamsfoundation/lams/util/Emailer.java
  2. … 12 more files in changeset.
Friday 15 Oct 2010
7:22 pm

Andrey Balan

LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

*merge from HEAD

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
7:03 pm

Andrey Balan

LDEV-2509 Embedded SMTP server

*Merge from HEAD

Options
    • -4
    • +19
    ./src/java/org/lamsfoundation/lams/util/Emailer.java
  2. … 17 more files in changeset.
6:53 pm

Andrey Balan

LDEV-2580 fixed Forgot your password feature when configuration setting SMTP is blank

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java
8:05 am

Ernie Ghiglione

LDEV-2567: mergin to head

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
Sunday 10 Oct 2010
2:41 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/includes/javascript/ckconfig_custom.js
1:59 pm

Marcin Cieslak

LDEV-2577: Reaapplying changes lost in the upgrade process.

LAMS special folder management:

MAIN:fmalikoff:20080108065842

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080108065842

MAIN:fmalikoff:20080109053946

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080109053946

Add delete option:

MAIN:mseaton:20090209050916

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:mseaton:20090209050916

These remain unimplemented:

MAIN:ernieg:20090207003837 (not sure if the license allows that, link doesn't work anyway)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:ernieg:20090207003837

MAIN:fmalikoff:20080104074054

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:fmalikoff:20080104074054

MAIN:ernieg:20090213103501 (not sure if the changes are still needed)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:ernieg:20090213103501

MAIN:mseaton:20060824040139 (this change seems unnecessary, as it removes upload from from filemanager and we do support uploading)

http://lamscvs.melcoe.mq.edu.au/fisheye/changelog/lams/lams_central/web/fckeditor?cs=MAIN:mseaton:20060824040139

Options
    • -1
    • +4
    ./web/ckeditor/filemanager/browser/default/browser.html
    • -1
    • +2
    ./web/ckeditor/filemanager/browser/default/frmfolders.html
    • -4
    • +28
    ./web/ckeditor/filemanager/browser/default/frmresourceslist.html
    • -0
    • +1
    ./web/ckeditor/filemanager/browser/default/frmupload.html
    • binary
    ./web/ckeditor/filemanager/browser/default/images/trash.gif
1:46 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 27 more files in changeset.
Wednesday 06 Oct 2010
12:09 pm

Marcin Cieslak

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.

Options
    • -2
    • +2
    ./build.xml
    • -3
    • +3
    ./conf/xdoclet/filter-mappings.xml
    • -2
    • +2
    ./conf/xdoclet/taglib-tag.xml
    • -4
    • +0
    ./conf/xdoclet/taglibs.xml
    • -1
    • +1
    ./conf/xdoclet/web-security.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/LAMSUploadServlet.java
    • -1
    • +1
    ./src/web/template/js/tabcontroller.js
    • -15
    • +15
    ./src/web/template/lams_example_tool/author_page.html
    • -11
    • +11
    ./src/web/template/lams_example_tool/author_page_basic.html
    • -11
    • +12
    ./src/web/template/lams_example_tool/author_page_seperate.html
    • -67
    • +67
    ./web/WEB-INF/lams.tld
    • -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
  16. … 1082 more files in changeset.
Monday 04 Oct 2010
5:27 pm

Andrey Balan

LDEV-2550 Developed new event logging mechanism

*merge from lams2_3_release

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  3. … 17 more files in changeset.
Friday 01 Oct 2010
10:30 pm

Andrey Balan

LDEV-2544 Default Timezones

*merge from lams2_3_release

Options
    • -1
    • +1
    ./conf/xdoclet/struts-forms.xml
    • -0
    • +28
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
    • -4
    • +4
    ./web/editprofile.jsp
  4. … 33 more files in changeset.
6:54 pm

Andrey Balan

LDEV-2544 Default Timezones

*added ability to change server timezone

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/web/ProfileAction.java
  2. … 20 more files in changeset.
Friday 13 Aug 2010
1:12 pm

Ernie Ghiglione

LDEV-2557 reverting to previous

Options
    • binary
    ./web/lams_authoring.swf
    • binary
    ./web/lams_authoring_library.swf
Tuesday 10 Aug 2010
9:55 am

Andrey Balan

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

Options
    • -0
    • +1
    ./web/includes/javascript/pedagogicalPlanner.js
Friday 06 Aug 2010
2:49 pm

Andrey Balan

LDEV-2571 planner now supports requestSrc and notifyCloseURL URL parameters

Options
    • -2
    • +27
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +570
    ./web/css/jquery-ui.css
    • -3
    • +16
    ./web/includes/javascript/pedagogicalPlanner.js
Wednesday 02 Jun 2010
5:29 am

Ernie Ghiglione

LDEV-2567 - Making sure integration user is added as teacher when accessed through LearningDesignRepositoryServlet

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java
Tuesday 25 May 2010
10:38 pm

Andrey Balan

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

Options
    • -4
    • +10
    ./web/profile.jsp
  2. … 5 more files in changeset.
10:23 pm

Andrey Balan

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

Options
    • -4
    • +10
    ./web/profile.jsp
  2. … 5 more files in changeset.
Monday 03 May 2010
12:09 pm

mseaton

LDEV-2556 LDEV-2557 Tooltip style and Workspace dialog /author info changes to HEAD.

Options
    • -1
    • +1
    ./conf/flashxml/lams/defaultTheme.xml
    • -1
    • +1
    ./conf/flashxml/rams/defaultTheme.xml
    • binary
    ./web/lams_authoring.swf
    • binary
    ./web/lams_authoring_library.swf
  5. … 4 more files in changeset.
Thursday 29 Apr 2010
4:31 pm

mseaton

LDEV-2557 Added author information for a Learning Design to Workspace dialog in Author.

Options
    • -1
    • +1
    ./conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/authoring/en_dictionary.xml
    • binary
    ./web/lams_authoring.swf
    • binary
    ./web/lams_authoring_library.swf
  5. … 1 more file in changeset.
4:24 am

mseaton

LDEV-2556 Setting theme style of ToolTip.

Options
    • -1
    • +1
    ./conf/flashxml/lams/defaultTheme.xml
    • -1
    • +1
    ./conf/flashxml/rams/defaultTheme.xml
    • binary
    ./web/lams_authoring.swf
    • binary
    ./web/lams_authoring_library.swf
  5. … 3 more files in changeset.
Friday 16 Apr 2010
9:16 am

Andrey Balan

LDEV-2550 further development of LAMS event logging mechanism

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  2. … 2 more files in changeset.
8:19 am

Ernie Ghiglione

Adding Spanish (Mexico), Updating German, Greek, English, Spanish (Spain), French, Korean, Norwegian, Polish, Turkish

Options
    • -262
    • +236
    ./conf/language/lams/ApplicationResources.properties
    • -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
    • -0
    • +279
    ./conf/language/lams/ApplicationResources_es_MX.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
    • -98
    • +150
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  12. … 13 more files in changeset.
8:19 am

Ernie Ghiglione

file ApplicationResources_es_MX.properties was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./conf/language/lams/ApplicationResources_es_MX.properties
  2. … 1 more file in changeset.
Thursday 15 Apr 2010
4:14 pm

mseaton

LDEV-2507 Use common create date time str for room name (Learner and Monitor spawn IM window).

Options
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
  2. … 6 more files in changeset.
Wednesday 14 Apr 2010
5:50 pm

mseaton

LDEV-2507 New button in Monitor to open IM chat window.

Options
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/en_AU_dictionary.xml
    • -1
    • +1
    ./conf/flashxml/lams/monitoring/en_dictionary.xml
  3. … 9 more files in changeset.
Friday 09 Apr 2010
8:01 pm

Andrey Balan

LDEV-2550 Develop new event logging service

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -4
    • +11
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  3. … 15 more files in changeset.