Activity lams-github/lams

11:50 am

erniegx <ernieg@gmail.com>

More
0799eea
changed 1 file
v4.7, v4.8

Updating Chinese China

- -2
- +16
./conf/language/lams/ApplicationResources_zh_CN.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_zh_CN.properties

11:28 am

Marcin Cieslak

More
240f5a8
changed 8 files
v4.7, v4.8

LDEV-1932: Added competences to export portfolio both for teacher and learner.

- -2
- +4
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +4
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
- -110
- +132
./src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
- History
- Source
- Diff
./src/java/.../export/ActivityPortfolio.java
- -92
- +107
./src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
- History
- Source
- Diff
./src/java/org/.../export/Portfolio.java
- -442
- +410
./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
- History
- Source
- Diff
./src/java/.../ExportPortfolioService.java
- -278
- +315
./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
- History
- Source
- Diff
./src/java/.../service/PortfolioBuilder.java
- -0
- +9
./web/WEB-INF/tags/ExportPortOutput.tag
- History
- Source
- Diff
./web/WEB-INF/tags/ExportPortOutput.tag
- -1
- +19
./web/exportPortfolio/main.jsp
- History
- Source
- Diff
./web/exportPortfolio/main.jsp

11:10 am

lfoxton

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

LDEV-1971

From a tip from a Fiona, the context path "rams/" or "lams/' is actually stored in the db, so we can get it from there instead of getting it from the context of the request

- -14
- +7
./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
./src/java/.../action/MainExportServlet.java

8:00 am

lfoxton

More
7157e4c
changed 1 file
v4.7, v4.8

LDEV-1971 : Main export server only adjusts image urls for lams, not in rams,

this is because "/lams/secure/www" was included in the regex

now the "lams" bit is retrieved from the request context using:

request.getContextPath().substring(0, 5);

- -12
- +20
./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
./src/java/.../action/MainExportServlet.java

7:48 am

lfoxton

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

Fixing up format of main export servlet

- -201
- +199
./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
- History
- Source
- Diff
./src/java/.../action/MainExportServlet.java

11:48 am

asukkar

More
406cdd6
changed 23 files
v4.7, v4.8

Updated .classpath

Removed references to lams jar files in lams_build/lib

- -1
- +1
./.classpath
- History
- Source
- Diff
./.classpath
… 22 more files in changeset.

1:35 pm

Marcin Cieslak

More
8386a3f
changed 26 files
v4.7, v4.8

LDEV-1299: Backend for condition gates.

- -1
- +1
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +1
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
- -0
- +1
./conf/xdoclet/struts-forms.xml
- History
- Source
- Diff
./conf/xdoclet/struts-forms.xml
- -8
- +13
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -129
- +129
./src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
- History
- Source
- Diff
./src/java/org/.../web/action/GateAction.java
- -2
- +3
./web/gate/gateNext.jsp
- History
- Source
- Diff
./web/gate/gateNext.jsp
… 20 more files in changeset.

1:07 pm

paulg

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

LDEV-1929 Presence now creating users with LAMS Jabber manager account in both flash and flashless learner modules

- -7
- +12
./web/includes/presence.js
- History
- Source
- Diff
./web/includes/presence.js
- binary
./web/lams_learner.swf
- History
- Source
- Diff
./web/lams_learner.swf
- -5
- +18
./web/mainnoflash.jsp
- History
- Source
- Diff
./web/mainnoflash.jsp
… 5 more files in changeset.

7:24 am

paulg

More
3c82bed
changed 3 files
v4.7, v4.8

LDEV-1929 Fixed a bug with IE not detecting flashvars for connecting with presence

- -1
- +1
./web/controlFrame.jsp
- History
- Source
- Diff
./web/controlFrame.jsp
- binary
./web/lams_learner.swf
- History
- Source
- Diff
./web/lams_learner.swf
… 1 more file in changeset.

9:39 am

paulg

More
5bdc7f9
changed 3 files
v4.7, v4.8

LDEV-1976 Space in username added for presence

- binary
./web/lams_learner.swf
- History
- Source
- Diff
./web/lams_learner.swf
- -1
- +1
./web/mainnoflash.jsp
- History
- Source
- Diff
./web/mainnoflash.jsp
… 1 more file in changeset.

8:23 am

erniegx <ernieg@gmail.com>

More
2820b12
changed 2 files
v4.7, v4.8

Updating Greek

- -3
- +5
./conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_el_GR.properties
… 1 more file in changeset.

2:47 pm

paulg

More
0b7d091
changed 37 files
v4.7, v4.8

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

- -0
- +455
./web/includes/JavaScriptFlashGateway.js
- History
- Source
./web/includes/JavaScriptFlashGateway.js
- binary
./web/includes/JavaScriptFlashGateway.swf
- History
- Source
./web/includes/JavaScriptFlashGateway.swf
- -0
- +3
./web/includes/jsjac-1.3.1/AUTHORS
- History
- Source
./web/includes/jsjac-1.3.1/AUTHORS
- -0
- +11
./web/includes/jsjac-1.3.1/COPYING
- History
- Source
./web/includes/jsjac-1.3.1/COPYING
- -0
- +143
./web/includes/jsjac-1.3.1/ChangeLog
- History
- Source
./web/includes/jsjac-1.3.1/ChangeLog
- -0
- +470
./web/includes/jsjac-1.3.1/MPL-1.1.txt
- History
- Source
./web/includes/jsjac-1.3.1/MPL-1.1.txt
- -0
- +57
./web/includes/jsjac-1.3.1/Makefile
- History
- Source
./web/includes/jsjac-1.3.1/Makefile
- -0
- +87
./web/includes/jsjac-1.3.1/README
- History
- Source
./web/includes/jsjac-1.3.1/README
- -0
- +314
./web/includes/jsjac-1.3.1/examples/simpleclient.html
- History
- Source
./web/includes/.../examples/simpleclient.html
- -0
- +339
./web/includes/jsjac-1.3.1/gpl-2.0.txt
- History
- Source
./web/includes/jsjac-1.3.1/gpl-2.0.txt
- -0
- +506
./web/includes/jsjac-1.3.1/jsjac.js
- History
- Source
./web/includes/jsjac-1.3.1/jsjac.js
- -0
- +33
./web/includes/jsjac-1.3.1/jsjac.packed.js
- History
- Source
./web/includes/jsjac-1.3.1/jsjac.packed.js
- -0
- +504
./web/includes/jsjac-1.3.1/lgpl-2.1.txt
- History
- Source
./web/includes/jsjac-1.3.1/lgpl-2.1.txt
- -0
- +55
./web/includes/jsjac-1.3.1/src/JSJaC.js
- History
- Source
./web/includes/jsjac-1.3.1/src/JSJaC.js
- -0
- +126
./web/includes/jsjac-1.3.1/src/JSJaCBuilder.js
- History
- Source
./web/includes/jsjac-1.3.1/src/JSJaCBuilder.js
… 22 more files in changeset.

2:29 pm

paulg

More
b5f1c61
changed 23 files
v4.7, v4.8

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

- -0
- +2
./build.xml
- History
- Source
- Diff
./build.xml
- -3
- +17
./web/controlFrame.jsp
- History
- Source
- Diff
./web/controlFrame.jsp
- -2
- +2
./web/mainflash.jsp
- History
- Source
- Diff
./web/mainflash.jsp
- -0
- +26
./web/mainnoflash.jsp
- History
- Source
- Diff
./web/mainnoflash.jsp
… 19 more files in changeset.

2:17 pm

Marcin Cieslak

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

LDEV-1950: Learner can no longer choose two groups using browser navigation.

- -0
- +3
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java

7:41 am

erniegx <ernieg@gmail.com>

More
d5ff2e0
changed 12 files
v4.7, v4.8

Updating English, Spanish, Norwegian

- -2
- +4
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -2
- +4
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
- -2
- +7
./conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_es_ES.properties
- -2
- +4
./conf/language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_no_NO.properties
… 8 more files in changeset.

9:20 am

erniegx <ernieg@gmail.com>

More
9af281f
changed 5 files
v4.7, v4.8

Updating Greek, English, French, Norwegian

- -9
- +7
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -2
- +5
./conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_el_GR.properties
- -9
- +7
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
- -60
- +63
./conf/language/lams/ApplicationResources_fr_FR.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_fr_FR.properties
- -2
- +5
./conf/language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_no_NO.properties

8:00 am

Marcin Cieslak

More
22ee1b8
changed 1 file
v4.7, v4.8

LDEV-1534: If a deadlock occurs when trying to join a lesson, the attempt is repeated.

- -1022
- +1071
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java

1:29 pm

LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).