lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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
Sunday 24 Oct 2010
9:39 pm

Marcin Cieslak

LDEV-2577: Readded videorecorder plugin. Readded missing contentFolderID parameter to CKEditor instances.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 36 more files in changeset.
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:48 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: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
    • -8
    • +0
    ./conf/xdoclet/taglibs.xml
    • -35
    • +36
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -74
    • +76
    ./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:32 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
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -0
    • +10
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 16 more files in changeset.
Monday 03 May 2010
6:11 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.
Monday 19 Apr 2010
9:58 pm

mseaton

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

Options
    • -0
    • +6
    ./web/includes/presence.js
    • -6
    • +13
    ./web/includes/presenceChat.jsp
    • -0
    • +64
    ./web/lessonChat.jsp
  4. … 3 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
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java
    • -1
    • +4
    ./web/lessonComplete.jsp
Thursday 18 Mar 2010
8:59 pm

Andrey Balan

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

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

Andrey Balan

LDEV-2530 Changed lesson completion page

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

erniegx <ernieg@gmail.com>

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

Options
    • -1
    • +1
    ./web/mainflash.jsp
Thursday 11 Feb 2010
1:27 pm

jliew

LDEV-2481 merge from branch

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

lfoxton

LDEV-2475 Meging changes with head

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -1
    • +1
    ./src/java/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
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Monday 09 Nov 2009
2:48 pm

jliew

translation update

Options
    • -58
    • +62
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
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
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -5
    • +5
    ./src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
    • -7
    • +7
    ./src/java/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
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
Wednesday 29 Jul 2009
2:13 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -22
    • +22
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 more files in changeset.
Tuesday 28 Jul 2009
10:20 pm

Andrey Balan

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
  3. … 96 more files in changeset.
Tuesday 14 Jul 2009
8:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
Monday 06 Jul 2009
3:25 pm

jliew

merge lams2_3 to head

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -52
    • +62
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -1
    • +1
    ./web/includes/presenceChat.jsp
  5. … 19 more files in changeset.
Sunday 05 Jul 2009
9:21 pm

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Japanese, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./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
    • -12
    • +26
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 19 more files in changeset.
Friday 03 Jul 2009
1:02 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -0
    • +4
    ./conf/xdoclet/web-settings.xml
    • -530
    • +550
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +5
    ./web/WEB-INF/web.xml
  4. … 48 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
    • -1
    • +1
    ./conf/xdoclet/web-settings.xml
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -79
    • +103
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  5. … 82 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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -293
    • +296
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -40
    • +113
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -264
    • +275
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -92
    • +92
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +13
    ./web/WEB-INF/tags/ProgressOutput.tag
    • -66
    • +92
    ./web/notebook/viewall.jsp
  10. … 159 more files in changeset.
Wednesday 01 Jul 2009
10:19 pm

Marcin Cieslak

Added missing library and fixed classpaths - changes needed after code merge.

Options
    • -4
    • +3
    ./.classpath
  2. … 17 more files in changeset.
Friday 19 Jun 2009
6:54 pm

Marcin Cieslak

LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch). Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

Options
    • -1
    • +1
    ./web/mainnoflash.jsp
  2. … 18 more files in changeset.
Thursday 14 May 2009
1:28 pm

dcarlier

LDEV-2142 Support activities's progress now update on normal progress update (as learner progresses through the sequence)

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file 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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
    • -5
    • +26
    ./web/includes/presence.css
    • -47
    • +64
    ./web/includes/presence.js
    • -23
    • +56
    ./web/includes/presenceChat.jsp
    • -1
    • +1
    ./web/mainflash.jsp
  6. … 158 more files in changeset.