lams-github

lams_monitoring

Clone Tools

Stats

Commits this week: 0
Total Committers: 30
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
Wednesday 06 Oct 2010
12: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
    • -7
    • +0
    ./conf/xdoclet/taglibs.xml
    • -7
    • +1
    ./test/web/WEB-INF/web.xml
    • -2
    • +2
    ./web/WEB-INF/lams.tld
    • -37
    • +37
    ./web/WEB-INF/struts/struts-config.xml
    • -0
    • +53
    ./web/WEB-INF/tags/CKEditor.tag
    • -54
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
  7. … 1091 more files in changeset.
Monday 04 Oct 2010
5:32 pm

Andrey Balan

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

Options
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -2
    • +20
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 17 more files in changeset.
Friday 01 Oct 2010
10:38 pm

Andrey Balan

LDEV-2544 Default Timezones *merge from lams2_3_release

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -6
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -12
    • +40
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
  4. … 33 more files in changeset.
Monday 03 May 2010
12:11 pm

mseaton

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

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 6 more files in changeset.
Monday 19 Apr 2010
3:58 pm

mseaton

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

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
    • -1
    • +1
    ./web/monitorLesson.jsp
  4. … 3 more files in changeset.
Friday 09 Apr 2010
1:23 am

erniegx <ernieg@gmail.com>

LDEV-2484: Learner's tab only shows one student (only one row)

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
Thursday 18 Mar 2010
1: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 Feb 2010
5:23 am

jliew

LDEV-2510 merged from branch

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  3. … 2 more files in changeset.
Wednesday 10 Feb 2010
7:50 am

jliew

LDEV-2489 don't encapsulate cloneLessons in a transaction; the main submethods are already in their own transactions. otherwise we don't get an activityId from a forum&scribe's forum. that's another problem though.

Options
    • -1
    • +0
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
Wednesday 03 Feb 2010
5:29 am

jliew

LDEV-2489 put clone lessons in a transaction

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +117
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
  4. … 1 more file in changeset.
Friday 29 Jan 2010
2:25 am

lfoxton

LDEV-2471 Merging swf to head

Options
    • binary
    ./web/CloudWizard.swf
Friday 13 Nov 2009
4:14 am

jliew

LDEV-2459 use double quotes when enclosing i18n text in javascript

Options
    • -1
    • +1
    ./web/errorbox.jsp
  2. … 47 more files in changeset.
Monday 09 Nov 2009
7:48 am

jliew

translation update

Options
    • -44
    • +124
    ./conf/language/lams/ApplicationResources_fr_FR.properties
  2. … 31 more files in changeset.
Tuesday 01 Sep 2009
2:49 am

lfoxton

LDEV-2433 Fixing bug causing default user selected in monitors to always be Mary Morgan

Oops, forgot to include the swf file with this

Options
    • binary
    ./web/CloudWizard.swf
1:49 am

lfoxton

LDEV-2433 Fixed the issue that was stopping the course name from being displayed

Options
    • binary
    ./web/CloudWizard.swf
  2. … 3 more files in changeset.
Friday 28 Aug 2009
6:09 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 1 more file in changeset.
5:08 am

lfoxton

LDEV-2413 Sorting sequences alphabetically case-insensitive

Options
    • binary
    ./web/CloudWizard.swf
  2. … 1 more file in changeset.
Wednesday 29 Jul 2009
8:13 am

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -27
    • +27
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 more files in changeset.
Tuesday 28 Jul 2009
4: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
2:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
Sunday 05 Jul 2009
3:21 pm

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Japanese, Norwegian

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

jliew

Merge lams2_3 to head (continuing...)

Options
    • binary
    ./web/TimeChart.swf
    • -1
    • +5
    ./web/WEB-INF/web.xml
  3. … 49 more files in changeset.
Thursday 02 Jul 2009
11:59 am

jliew

more merging lams2_3 into head

Options
    • -29
    • +55
    ./web/assets/styles/main.css
    • -1
    • +1
    ./web/timeChart.jsp
  3. … 31 more files in changeset.
10:19 am

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
    ./src/java/org/lamsfoundation/lams/monitoring/MonitoringConstants.java
    • -11
    • +33
    ./web/WEB-INF/web.xml
  3. … 166 more files in changeset.
Wednesday 01 Jul 2009
4:48 am

jliew

Merge lams2_3 into head

Options
    • -3
    • +3
    ./.classpath
    • -1
    • +5
    ./conf/xdoclet/web-settings.xml
    • -13
    • +9
    ./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -11
    • +35
    ./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -4
    • +29
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • binary
    ./web/CloudWizard.swf
    • -2
    • +2
    ./web/addLesson.jsp
  9. … 118 more files in changeset.
Friday 15 May 2009
4:26 am

dcarlier

LDEV-2341 Fixed problems with mouse cursor loosing focus, loading icon not appearing properly in monitor

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 2 more files in changeset.
Thursday 30 Apr 2009
4:01 am

paulg

Monitoring now allows IM to be enabled

Options
    • -3
    • +8
    ./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  4. … 2 more files in changeset.
Thursday 23 Apr 2009
2:08 am

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Norwegian

Options
    • -42
    • +43
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +17
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -42
    • +43
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -42
    • +43
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
Wednesday 22 Apr 2009
12:40 am

dcarlier

LDEV-2218 increased widths for opt sequences title, support acts title, and title of activity in PI

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 5 more files in changeset.
Tuesday 21 Apr 2009
4:05 am

dcarlier

LDEV-2244 window sizes changed from 800x600 to 920x700 for preview window and when users double clicks an activity

Options
    • binary
    ./web/lams_monitoring.swf
    • binary
    ./web/lams_monitoring_library.swf
  3. … 5 more files in changeset.