lams-github / lams_learning / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
Last Commit:
Commits this week: 0

Lines of code count not available

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
Friday 29 Oct 2010
11:14 pm

Andrey Balan

LDEV-2481 fixing charset conversion

*merge from lams2_3_release

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
Wednesday 06 Oct 2010
6:18 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
    • -35
    • +36
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -74
    • +76
    ./org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  3. … 1095 more files in changeset.
Monday 04 Oct 2010
11:32 pm

Andrey Balan

LDEV-2550 Developed new event logging mechanism *merge from lams2_3_release

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +11
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +10
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 16 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
    • -10
    • +1
    ./org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 more files in changeset.
Wednesday 17 Mar 2010
9:37 pm

Andrey Balan

LDEV-2530 Changed lesson completion page

Options
    • -17
    • +19
    ./org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
  2. … 3 more files in changeset.
Thursday 11 Feb 2010
1:27 pm

jliew

LDEV-2481 merge from branch

Options
    • -1
    • +3
    ./org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
8:48 am

lfoxton

LDEV-2475 Meging changes with head

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/web/action/ExportDownloadServlet.java
  3. … 6 more files in changeset.
Friday 15 Jan 2010
8:22 am

jliew

LDEV-2481 merged from branch

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

lfoxton

LDEV-2486 Mergin with head

Options
    • -1
    • +6
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 20 Aug 2009
12:40 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
    • -4
    • +4
    ./org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -5
    • +5
    ./org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -7
    • +7
    ./org/lamsfoundation/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
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
Monday 06 Jul 2009
3:25 pm

jliew

merge lams2_3 to head

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -52
    • +62
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  4. … 20 more files in changeset.
Friday 03 Jul 2009
1:02 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -530
    • +550
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 50 more files in changeset.
Thursday 02 Jul 2009
9:06 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -79
    • +103
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 83 more files in changeset.
4:19 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
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -0
    • +1
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -293
    • +296
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -40
    • +113
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +5
    ./org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -264
    • +275
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  7. … 162 more files in changeset.
Thursday 07 May 2009
2:15 pm

paulg

LDEV-2254 Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

Options
    • -13
    • +13
    ./org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 162 more files in changeset.
Friday 17 Apr 2009
3:10 pm

paulg

LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated - export portfolio fixed - export fck recordings fixed - conditions added - preview images are now produced and displayed - more feedback for rating - instructions highlighted - clicking delete button does not trigger viewing of recording - timer display corrected - prompt validation - misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

Options
    • -0
    • +27
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -3
    • +21
    ./org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  3. … 54 more files in changeset.
Friday 03 Apr 2009
12:42 pm

lfoxton

LDEV-2187 Put time taken for activities and lessons in gradebook.

Fixing up LearnerProgress.java so it stores both finish time and start time for all completed activities

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  3. … 9 more files in changeset.
Thursday 02 Apr 2009
7:49 am

lfoxton

LDEV-2187 - Adding in time columns for gradebook

Options
    • -3
    • +5
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
  2. … 9 more files in changeset.
Thursday 26 Mar 2009
6:00 pm

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -8
    • +10
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
  2. … 118 more files in changeset.
Tuesday 24 Feb 2009
5:01 am

Marcin Cieslak

LDEV-2054: Added support for “viewStudentsBeforeSelection” option.

Options
    • -275
    • +341
    ./org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -61
    • +66
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -185
    • +195
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
  4. … 8 more files in changeset.
Thursday 19 Feb 2009
1:39 pm

paulg

LDEV-2005 - Voice recording tool - FCKEditor plugin present - Changes to configuration file for Red5 settings - Updates to VideoRecorderForFCK (Flex)

Options
    • -0
    • +70
    ./org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 76 more files in changeset.
Tuesday 17 Feb 2009
11:21 am

mseaton

LDEV-2141 Parallel (floating) activity is marked as completed when all children (both) are finished.

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
9:51 am

mseaton

LDEV-2127 Fixed floating parallel acts behaviour affect finished - display close window msg.

Options
    • -2
    • +5
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  2. … 2 more files in changeset.
Monday 16 Feb 2009
1:56 pm

mseaton

LDEV-2139 using a sync map with manually syncronize the method moveToActivity

Options
    • -18
    • +53
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 12 Feb 2009
11:02 am

asukkar

Fixed error in copyFile method. Replaced copyFileToDirectory with copyFile since the destFilePath includes the required file name.

LDEV-2126

Options
    • -4
    • +4
    ./org/lamsfoundation/lams/learning/export/web/action/Bundler.java
8:23 am

mseaton

LDEV-2115 Timestamp (current date time) added to completed activity record (table: lams_progress_completed)

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -3
    • +3
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -1
    • +1
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  5. … 8 more files in changeset.
Tuesday 10 Feb 2009
8:42 am

asukkar

Removed unused methods.

LDEV-2126

Options
    • -42
    • +0
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
7:50 am

asukkar

Modified bundleImages() to use the copyDirectory method from the commons-io library instead of copyFile() in Bundler

LDEV-2126

Options
    • -156
    • +155
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
7:48 am

asukkar

Modified copyFiles to use the copyFileToDirectory method from the commons-io library

Options
    • -59
    • +26
    ./org/lamsfoundation/lams/learning/export/web/action/Bundler.java