lams

lams_learning

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,912
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
Saturday 23 Oct 2010
3:43 am

Andrey Balan

LDEV-2481 fixing charset conversion

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
Friday 22 Oct 2010
2:52 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 3 more files in changeset.
Sunday 10 Oct 2010
7: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
6: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
    • -8
    • +0
    ./conf/xdoclet/taglibs.xml
    • -36
    • +37
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -75
    • +77
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -7
    • +1
    ./test/web/WEB-INF/web.xml
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -109
    • +109
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
  9. … 1089 more files in changeset.
Monday 04 Oct 2010
11:27 pm

Andrey Balan

LDEV-2550 Developed new event logging mechanism

*merge from lams2_3_release

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 16 more files in changeset.
Monday 17 May 2010
8:35 pm

Andrey Balan

LDEV-2550 further development of LAMS event logging mechanism

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
  3. … 4 more files in changeset.
Monday 03 May 2010
6:09 pm

mseaton

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

Options
    • binary
    ./web/lams_learner.swf
  2. … 7 more files in changeset.
Thursday 29 Apr 2010
10:24 am

mseaton

LDEV-2556 Setting theme style of ToolTip.

Options
    • binary
    ./web/lams_learner.swf
  2. … 6 more files in changeset.
Monday 19 Apr 2010
9:58 pm

mseaton

LDEV-2507 Merge changes to head. New IM pop-up from Monitor.

Options
    • -0
    • +64
    ./web/lessonChat.jsp
    • -0
    • +6
    ./web/includes/presence.js
    • -6
    • +13
    ./web/includes/presenceChat.jsp
  4. … 3 more files in changeset.
9:31 pm

mseaton

LDEV-2507 Fixed new IM dialog - show presence box open on-load.

Options
    • -7
    • +4
    ./web/lessonChat.jsp
    • -0
    • +6
    ./web/includes/presence.js
    • -3
    • +10
    ./web/includes/presenceChat.jsp
  4. … 3 more files in changeset.
Friday 16 Apr 2010
3:16 pm

Andrey Balan

LDEV-2550 further development of LAMS event logging mechanism

Options
    • -2
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 2 more files in changeset.
2:32 pm

Ernie Ghiglione

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

Options
    • -79
    • +78
    ./conf/language/lams/ApplicationResources.properties
    • -77
    • +78
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -77
    • +78
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -79
    • +78
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -77
    • +78
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +109
    ./conf/language/lams/ApplicationResources_es_MX.properties
    • -77
    • +78
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -53
    • +55
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
    • -79
    • +80
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -79
    • +80
    ./conf/language/lams/ApplicationResources_tr_TR.properties
2:31 pm

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. … 5 more files in changeset.
Thursday 15 Apr 2010
10:14 pm

mseaton

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

Options
    • -1
    • +1
    ./web/includes/presenceChat.jsp
  2. … 6 more files in changeset.
Wednesday 14 Apr 2010
11:55 pm

mseaton

file lessonChat.jsp was initially added on branch lams2_3_release.

Options
    • -0
    • +0
    ./web/lessonChat.jsp
11:50 pm

mseaton

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

Options
    • -1
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +67
    ./web/lessonChat.jsp
    • -0
    • +1
    ./web/mainflash.jsp
    • -0
    • +1
    ./web/mainnoflash.jsp
    • -2
    • +2
    ./web/includes/presenceChat.jsp
  7. … 5 more files in changeset.
8:19 pm

Andrey Balan

LDEV-2530 Changed lesson completion page (added completion date)

*merge from lams2_3_release

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -1
    • +4
    ./web/lessonComplete.jsp
Monday 12 Apr 2010
4:09 pm

Andrey Balan

LDEV-2530 Changed lesson completion page (modified completion date)

Options
    • -1
    • +1
    ./web/lessonComplete.jsp
Sunday 11 Apr 2010
4:57 pm

Andrey Balan

LDEV-2530 Changed lesson completion page (added completion date)

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -1
    • +4
    ./web/lessonComplete.jsp
Saturday 10 Apr 2010
2:01 am

Andrey Balan

LDEV-2550 Develop new event logging service

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +10
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 15 more files in changeset.
Thursday 18 Mar 2010
8:58 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
8:13 pm

Andrey Balan

LDEV-2329 When editing in monitor if press the "Cancel" button, the define_later flag *does* get removed.

Options
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 28 more files in changeset.
Wednesday 17 Mar 2010
9:48 pm

Andrey Balan

LDEV-2530 Changed lesson completion page

(merge from Head)

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -6
    • +20
    ./web/lessonComplete.jsp
9:37 pm

Andrey Balan

LDEV-2530 Changed lesson completion page

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -18
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -6
    • +20
    ./web/lessonComplete.jsp
Saturday 13 Mar 2010
12:49 am

Ernie Ghiglione

LDEV-2479: fix issue with ie8 in preview -planner

Options
    • -1
    • +1
    ./web/mainflash.jsp
12:46 am

Ernie Ghiglione

LDEV-2479: fix issue with ie8 in preview -planner

Options
    • -1
    • +1
    ./web/mainflash.jsp
Wednesday 03 Mar 2010
2:33 pm

Ernie Ghiglione

Updating translations for LAMS 2.3.4

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  12. … 127 more files in changeset.
Monday 01 Mar 2010
12:53 pm

lfoxton

LDEV-2517 Merging head theme changes with 2.3 branch for 2.3.4

Options
    • -12
    • +12
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -77
    • +102
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/CSSBundler.java
  4. … 62 more files in changeset.
Friday 19 Feb 2010
12:36 pm

Ernie Ghiglione

LDEV-2514: updating all labels for 2.3.4 release

Options
    • -79
    • +79
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -80
    • +80
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -79
    • +79
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -77
    • +77
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -80
    • +80
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -72
    • +86
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -78
    • +78
    ./conf/language/lams/ApplicationResources_ko_KR.properties
    • -81
    • +81
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -66
    • +85
    ./conf/language/lams/ApplicationResources_pl_PL.properties
    • -77
    • +79
    ./conf/language/lams/ApplicationResources_tr_TR.properties
  12. … 59 more files in changeset.
Thursday 11 Feb 2010
1:27 pm

jliew

LDEV-2481 merge from branch

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java