lams / lams_learning / src / java / org

lamsfoundation

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 18
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 10,126
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
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
    • -36
    • +37
    ./lams/learning/export/web/action/ImageBundler.java
    • -75
    • +77
    ./lams/learning/export/web/action/MainExportServlet.java
  3. … 1095 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
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +12
    ./lams/learning/progress/ProgressEngine.java
    • -1
    • +11
    ./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
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +12
    ./lams/learning/progress/ProgressEngine.java
  3. … 4 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
    ./lams/learning/service/LearnerService.java
  2. … 2 more files in changeset.
Wednesday 14 Apr 2010
8:19 pm

Andrey Balan

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

*merge from lams2_3_release

Options
    • -11
    • +2
    ./lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 more files in changeset.
Sunday 11 Apr 2010
4:57 pm

Andrey Balan

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

Options
    • -11
    • +2
    ./lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 more files in changeset.
Saturday 10 Apr 2010
2:01 am

Andrey Balan

LDEV-2550 Develop new event logging service

Options
    • -1
    • +2
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +10
    ./lams/learning/service/LearnerService.java
  3. … 15 more files in changeset.
Wednesday 17 Mar 2010
9:48 pm

Andrey Balan

LDEV-2530 Changed lesson completion page

(merge from Head)

Options
    • -18
    • +20
    ./lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 more files in changeset.
9:37 pm

Andrey Balan

LDEV-2530 Changed lesson completion page

Options
    • -18
    • +20
    ./lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 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
    ./lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +6
    ./lams/learning/export/service/IExportPortfolioService.java
    • -77
    • +102
    ./lams/learning/export/web/action/CSSBundler.java
  4. … 62 more files in changeset.
Thursday 11 Feb 2010
1:27 pm

jliew

LDEV-2481 merge from branch

Options
    • -2
    • +4
    ./lams/learning/export/web/action/ExportDownloadServlet.java
8:48 am

lfoxton

LDEV-2475 Meging changes with head

Options
    • -2
    • +2
    ./lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +2
    ./lams/learning/export/web/action/ExportDownloadServlet.java
  3. … 6 more files in changeset.
8:32 am

lfoxton

LDEV-2475 Temp dir issue

- Only files with "lams" prefix deleted on startup

- Instead of temp dir being a startup constant, it is a fetched via a method in FileUtil that:

- Creates the directory if writable and exists

- Returns the specified temp if its writeable

- Otherwise returns the java temp

Options
    • -2
    • +2
    ./lams/learning/export/service/ExportPortfolioService.java
    • -2
    • +2
    ./lams/learning/export/web/action/ExportDownloadServlet.java
  3. … 6 more files in changeset.
Friday 05 Feb 2010
1:09 pm

jliew

LDEV-2481 need to read param as utf8

Options
    • -1
    • +2
    ./lams/learning/export/web/action/ExportDownloadServlet.java
9:18 am

jliew

LDEV-2481 use lams custom browser workaround for filenames

Options
    • -2
    • +3
    ./lams/learning/export/web/action/ExportDownloadServlet.java
Friday 15 Jan 2010
8:22 am

jliew

LDEV-2481 merged from branch

Options
    • -3
    • +3
    ./lams/learning/export/web/action/MainExportServlet.java
8:20 am

jliew

LDEV-2481 export portfolio files were being written by image link replacer which didn't read or encode the new files in utf8

Options
    • -3
    • +3
    ./lams/learning/export/web/action/MainExportServlet.java
Wednesday 13 Jan 2010
11:07 am

lfoxton

LDEV-2486 Mergin with head

Options
    • -2
    • +7
    ./lams/learning/service/LearnerService.java
11:05 am

lfoxton

LDEV-2486 Fixing a null pointer

Options
    • -3
    • +8
    ./lams/learning/service/LearnerService.java
Thursday 20 Aug 2009
12:37 pm

lfoxton

LDEV-2420 Removing uneccessary data structures and tables from the db, as well as implementing the same theme settings for flash themes

Options
    • -5
    • +5
    ./lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +6
    ./lams/learning/export/service/IExportPortfolioService.java
    • -8
    • +8
    ./lams/learning/export/web/action/CSSBundler.java
  4. … 47 more files in changeset.
Monday 17 Aug 2009
8:41 am

lfoxton

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

Options
    • -2
    • +2
    ./lams/learning/export/service/ExportPortfolioService.java
Monday 06 Jul 2009
3:25 pm

jliew

merge lams2_3 to head

Options
    • -2
    • +4
    ./lams/learning/learningApplicationContext.xml
    • -2
    • +2
    ./lams/learning/service/LearnerService.java
    • -53
    • +63
    ./lams/learning/web/util/LearningWebUtil.java
  4. … 20 more files in changeset.
Friday 03 Jul 2009
12:57 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -561
    • +581
    ./lams/learning/web/action/LearnerAction.java
  2. … 50 more files in changeset.
9:24 am

jliew

merge lams2_3_jboss5 to lams2_3 (continuing...)

Options
    • -2
    • +4
    ./lams/learning/learningApplicationContext.xml
    • -81
    • +78
    ./lams/learning/service/LearnerService.java
    • -561
    • +581
    ./lams/learning/web/action/LearnerAction.java
    • -53
    • +63
    ./lams/learning/web/util/LearningWebUtil.java
  5. … 4 more files in changeset.
Thursday 02 Jul 2009
8:59 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./lams/learning/service/ILearnerService.java
    • -80
    • +104
    ./lams/learning/service/LearnerService.java
  4. … 83 more files in changeset.
4:18 pm

jliew

Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -2
    • +2
    ./lams/learning/export/web/action/ImageBundler.java
    • -297
    • +300
    ./lams/learning/progress/ProgressEngine.java
    • -41
    • +114
    ./lams/learning/service/LearnerService.java
    • -3
    • +6
    ./lams/learning/web/action/NotebookAction.java
    • -270
    • +281
    ./lams/learning/web/util/LearningWebUtil.java
  7. … 209 more files in changeset.
Tuesday 26 May 2009
11:02 pm

Marcin Cieslak

LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

Options
    • -2
    • +4
    ./lams/learning/learningApplicationContext.xml
    • -1
    • +7
    ./lams/learning/service/LearnerService.java
  3. … 9 more files in changeset.
2:16 am

Marcin Cieslak

LDEV-2071, LDEV-2201, LDEV-57: Changed the Transaction Manager to Hibernate instead of JTA. Synchronized code in 2 more spots as deadlock exceptions had been thrown.

Options
    • -2
    • +2
    ./lams/learning/service/LearnerService.java
    • -53
    • +63
    ./lams/learning/web/util/LearningWebUtil.java
  3. … 5 more files in changeset.
Thursday 21 May 2009
11:25 pm

Marcin Cieslak

LDEV-2071: Fixed authentication issues. Fixed deadlock issues. Cleaned up.

Options
    • -80
    • +71
    ./lams/learning/service/LearnerService.java
    • -561
    • +581
    ./lams/learning/web/action/LearnerAction.java
  3. … 29 more files in changeset.
Wednesday 13 May 2009
1:20 pm

paulg

VideoRecorder tool shows a help button in export portfolio which links to the wiki for extra config settings

Options
    • -2
    • +2
    ./lams/learning/export/web/action/ImageBundler.java
  2. … 1 more file in changeset.