Activity lams/lams

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

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

8:00 am

lfoxton

More
MAIN:lfoxton:20081031000031
changed 1 file
MAIN

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);

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

7:48 am

lfoxton

More
MAIN:lfoxton:20081030234813
changed 1 file
MAIN

Fixing up format of main export servlet

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

11:48 am

asukkar

More
MAIN:asukkar:20081030034829
changed 23 files
MAIN

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:34 pm

Marcin Cieslak

More
MAIN:marcin:20081029053451
changed 26 files
MAIN

LDEV-1299: Backend for condition gates.

- -2
- +2
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -2
- +2
./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
- -9
- +14
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -132
- +132
./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:02 pm

paulg

More
MAIN:paulg:20081020050203
changed 8 files
MAIN

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

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

7:24 am

paulg

More
MAIN:paulg:20081019232406
changed 3 files
MAIN

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
MAIN:paulg:20081017013911
changed 3 files
MAIN

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:20 am

Ernie Ghiglione

More
MAIN:ernieg:20081017002033
changed 2 files
MAIN

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:46 pm

paulg

More
MAIN:paulg:20081016064609
changed 37 files
MAIN

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

- binary
./web/lams_learner.swf
- History
- Source
- Diff
./web/lams_learner.swf
- -0
- +455
./web/includes/JavaScriptFlashGateway.js
- History
- Source
./web/includes/JavaScriptFlashGateway.js
- binary
./web/includes/JavaScriptFlashGateway.swf
- History
- Source
./web/includes/JavaScriptFlashGateway.swf
- -0
- +404
./web/includes/presence.js
- History
- Source
./web/includes/presence.js
- binary
./web/includes/jsjac-1.3.1/AUTHORS
- History
- Source
./web/includes/jsjac-1.3.1/AUTHORS
- binary
./web/includes/jsjac-1.3.1/COPYING
- History
- Source
./web/includes/jsjac-1.3.1/COPYING
- binary
./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
- binary
./web/includes/jsjac-1.3.1/Makefile
- History
- Source
./web/includes/jsjac-1.3.1/Makefile
- binary
./web/includes/jsjac-1.3.1/README
- History
- Source
./web/includes/jsjac-1.3.1/README
- -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
- +314
./web/includes/jsjac-1.3.1/examples/simpleclient.html
- History
- Source
./web/includes/.../examples/simpleclient.html
… 22 more files in changeset.

2:23 pm

paulg

More
MAIN:paulg:20081016062315
changed 23 files
MAIN

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
MAIN:marcin:20081009061752
changed 1 file
MAIN

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

- -1
- +4
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java

7:38 am

Ernie Ghiglione

More
MAIN:ernieg:20081002233806
changed 12 files
MAIN

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:12 am

Ernie Ghiglione

More
MAIN:ernieg:20081001011238
changed 10 files
MAIN

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
… 5 more files in changeset.

8:00 am

Marcin Cieslak

More
MAIN:marcin:20081001000005
changed 1 file
MAIN

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

- -1089
- +1138
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java

1:29 pm

jliew

More
MAIN:jliew:20080922052919
changed 36 files
MAIN

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).