Activity lams-github/lams

CNG-1: Single activity LD configuration opens authoring for only that activity instead of Planner with the whole LD. Parameter "notifyCloseURL" support has been added to each Tool's authoring saved page in order to redirect back to MindApp.

- -1
- +14
./web/WEB-INF/tags/AuthoringButton.tag
- History
- Source
- Diff
./web/WEB-INF/tags/AuthoringButton.tag
… 30 more files in changeset.

4:56 pm

Andrey Balan

More
7329c82
changed 35 files
v4.7, v4.8

LDEV-2702 moving css properties from TabName.tag to .css files

merge from lams2_3_release

- -3
- +2
./web/WEB-INF/tags/TabName.tag
- History
- Source
- Diff
./web/WEB-INF/tags/TabName.tag
… 34 more files in changeset.

2:04 pm

Andrey Balan

More
3ed103d
changed 61 files
v4.7, v4.8

LDEV-2664 LearnerFlashEnabled.tag has been reimplemented as Java class (this is done in order to prevent updating list of mobile devices in all modules )

*merged from lams2_3_release

- -29
- +33
./web/WEB-INF/lams.tld
- History
- Source
- Diff
./web/WEB-INF/lams.tld
- -53
- +0
./web/WEB-INF/tags/LearnerFlashEnabled.tag
- History
- Source
- Diff
./web/WEB-INF/tags/LearnerFlashEnabled.tag
… 59 more files in changeset.

5:29 pm

Andrey Balan

More
9a3e79a
changed 25 files
v4.7, v4.8

LDEV-2664 update LearnerFlashEnabled tag with detecting mobile devices

- -1
- +9
./web/WEB-INF/tags/LearnerFlashEnabled.tag
- History
- Source
- Diff
./web/WEB-INF/tags/LearnerFlashEnabled.tag
… 24 more files in changeset.

4:03 am

erniegx <ernieg@gmail.com>

More
ea02b97
changed 2 files
v4.7, v4.8

LDEV-2670: LAMS doesn't redirect when using https

- -2
- +2
./web/errorbox.jsp
- History
- Source
- Diff
./web/errorbox.jsp
… 1 more file in changeset.

3:31 pm

Marcin Cieslak

More
faba595
changed 28 files
v4.7, v4.8

LDEV-2577: Fixed a bug preventing multiple CKEditor instances on one page to be properly reinitialized after form submit.

- -7
- +14
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

9:52 pm

Marcin Cieslak

More
a7ea49b
changed 28 files
v4.7, v4.8

LDEV-2577: Added extra safety measure preventing plain textarea from being show instead of CKEditor instance.

- -1
- +1
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

7:36 pm

Marcin Cieslak

More
1cd46cd
changed 27 files
v4.7, v4.8

LDEV-2607: Hardcoded CKEditor width as a fix for Chrome inability to process "100%" width correctly.

- -1
- +1
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 26 more files in changeset.

8:13 am

Marcin Cieslak

More
5fc841f
changed 28 files
v4.7, v4.8

LDEV-2577: Set default height for CKEditor instances, as in IE it was minimal.

- -0
- +4
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

11:28 pm

Marcin Cieslak

More
94f0ee9
changed 28 files
v4.7, v4.8

LDEV-2595: As CSS parameter "display: none" does not work in IE, the initial textarea for CKEditor has height = 0px which does the trick instead.

- -1
- +1
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

1:19 am

Andrey Balan

More
4020e48
changed 8 files
v4.7, v4.8

LDEV-2548 Ability for a course manager to see *all* lessons...

*merge from lams2_3_release

- -3
- +10
./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./src/java/.../service/MonitoringService.java
… 7 more files in changeset.

9:24 pm

Marcin Cieslak

More
4de7728
changed 29 files
v4.7, v4.8

LDEV-2596: Forcing CKEditor be reinitialized after AJAX form submit.

- -17
- +27
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 28 more files in changeset.

7:35 pm

Andrey Balan

More
ddf8524
changed 1 file
v4.7, v4.8

LDEV-2523 Trim lesson name to 254 characters

- -0
- +4
./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./src/java/.../service/MonitoringService.java

3:39 pm

Marcin Cieslak

More
d0c090e
changed 37 files
v4.7, v4.8

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

- -1
- +2
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 36 more files in changeset.

8:52 pm

Marcin Cieslak

More
3b43792
changed 4 files
v4.7, v4.8

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

- -1
- +1
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 3 more files in changeset.

1:48 pm

Marcin Cieslak

More
2857686
changed 28 files
v4.7, v4.8

LDEV-2577: Removed quotation marks on "displayExpanded" option so it gets parsed correctly.

- -1
- +1
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/CKEditor.tag
… 27 more files in changeset.

12:18 pm

Marcin Cieslak

More
8179037
changed 1097 files
v4.7, v4.8

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.

- -7
- +0
./conf/xdoclet/taglibs.xml
- History
- Source
- Diff
./conf/xdoclet/taglibs.xml
- -7
- +1
./test/web/WEB-INF/web.xml
- History
- Source
- Diff
./test/web/WEB-INF/web.xml
- -2
- +2
./web/WEB-INF/lams.tld
- History
- Source
- Diff
./web/WEB-INF/lams.tld
- -37
- +37
./web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
./web/WEB-INF/struts/struts-config.xml
- -0
- +53
./web/WEB-INF/tags/CKEditor.tag
- History
- Source
./web/WEB-INF/tags/CKEditor.tag
- -54
- +0
./web/WEB-INF/tags/FCKEditor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/FCKEditor.tag
… 1091 more files in changeset.

5:32 pm

Andrey Balan

More
8cbd631
changed 19 files
v4.7, v4.8

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

- -1
- +2
./src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
- History
- Source
- Diff
./src/.../monitoringApplicationContext.xml
- -2
- +20
./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./src/java/.../service/MonitoringService.java
… 17 more files in changeset.

10:38 pm

Andrey Balan

More
009fbce
changed 36 files
v4.7, v4.8

LDEV-2544 Default Timezones *merge from lams2_3_release

- -3
- +3
./src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
./src/java/.../service/IMonitoringService.java
- -6
- +7
./src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
- History
- Source
- Diff
./src/java/.../service/MonitoringService.java
- -12
- +40
./src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
- History
- Source
- Diff
./src/java/org/.../web/MonitoringAction.java
… 33 more files in changeset.

12:11 pm

mseaton

More
e47890c
changed 8 files
v4.7, v4.8

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

- binary
./web/lams_monitoring.swf
- History
- Source
- Diff
./web/lams_monitoring.swf
- binary
./web/lams_monitoring_library.swf
- History
- Source
- Diff
./web/lams_monitoring_library.swf
… 6 more files in changeset.

3:58 pm

mseaton

More
c5cee0e
changed 6 files
v4.7, v4.8

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

- binary
./web/lams_monitoring.swf
- History
- Source
- Diff
./web/lams_monitoring.swf
- binary
./web/lams_monitoring_library.swf
- History
- Source
- Diff
./web/lams_monitoring_library.swf
- -1
- +1
./web/monitorLesson.jsp
- History
- Source
- Diff
./web/monitorLesson.jsp
… 3 more files in changeset.

1:23 am

erniegx <ernieg@gmail.com>

More
25f7a28
updated 2 files
v4.7, v4.8

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

- binary
./web/lams_monitoring.swf
- History
- Source
- Diff
./web/lams_monitoring.swf
- binary
./web/lams_monitoring_library.swf
- History
- Source
- Diff
./web/lams_monitoring_library.swf

lams_monitoring

Stats

Commits this week: 0

Commit Activity

52 week commits volume

Commits by day

Commits by hour

Commit calendar

Most active committers (90 days)

erniegx <ernieg@gmail.com>

erniegx <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

Andrey Balan

erniegx <ernieg@gmail.com>

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Marcin Cieslak

Andrey Balan

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Marcin Cieslak

Andrey Balan

Andrey Balan

mseaton

mseaton

erniegx <ernieg@gmail.com>