lams

lams_learning

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 20
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 32,912
Net change in LoC this week: 0

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
Thursday 15 Jan 2009
3:54 pm

mseaton

LDEV-2074 Fixes progress related bugs found. No long set nextActivity when moving to a floating Activity (only set as attemped); Flags floating activities as readOnly (true) when they are attempted (LiveEdit).

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -7
    • +20
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
11:18 am

mseaton

LDEV-2074 Updated export for learners to include floating activities.

Options
    • -1
    • +15
    ./src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -1
    • +1
    ./web/progress.jsp
    • -1
    • +3
    ./web/exportPortfolio/main.jsp
Tuesday 13 Jan 2009
3:16 pm

mseaton

LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

Options
    • -0
    • +3
    ./web/progress.jsp
    • -1
    • +1
    ./web/WEB-INF/tags/ProgressOutput.tag
2:58 pm

mseaton

LDEV-2074 Updated the Progress Engine to handle floating (reference) activities, activation from the progress bar and progress status of the activities. Display floating activities in non-flash progress bar with valid links to launch the activities (to-do: still need to fix window pop-up size).

Options
    • -1
    • +6
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -10
    • +19
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java
    • -1
    • +5
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -1
    • +3
    ./web/progress.jsp
    • -1
    • +13
    ./web/WEB-INF/tags/ProgressOutput.tag
Friday 09 Jan 2009
2:46 pm

Ernie Ghiglione

Updating Norwegian, Turkish

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
    • -56
    • +56
    ./conf/language/lams/ApplicationResources_tr_TR.properties
Tuesday 02 Dec 2008
6:12 am

Ernie Ghiglione

UPdating Greek

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 17 more files in changeset.
Monday 01 Dec 2008
1:16 pm

Ernie Ghiglione

Adding Turkish. Updating Greek, Italian

Options
    • -8
    • +8
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -9
    • +21
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -0
    • +106
    ./conf/language/lams/ApplicationResources_tr_TR.properties
Friday 28 Nov 2008
6:45 am

paulg

LDEV-2026 Presence.js missing...

Options
    • -2
    • +14
    ./web/includes/presence.js
6:12 am

Ernie Ghiglione

Updating Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 14 more files in changeset.
Thursday 27 Nov 2008
9:26 am

paulg

LDEV-2026 Proper solution for bad encoding integrated. The problem lay in the fact that strings were not urlEncoded when passed from Flash to Javascript. Url encoding and decoding are now taken care of both in on the Flash-side and JS-side.

NOTE: When a Flash movie is being run in IE, urlEncoding seems to be automatic. Therefore, if Flash is being run in IE, no urlEncoding is done on the Flash-side. For all other browsers urlEncoding is done.

Options
    • -5
    • +1
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
  3. … 5 more files in changeset.
Tuesday 25 Nov 2008
8:59 am

paulg

Fixes Smack throwing exceptions (flashless version)

The problem was being caused by the PresenceServlet calling Smack in order to create a new room which already existed.

Example:

-shaun has 5 lessons, each with their chatrooms which are named using the lessonId ie 1,2,3...

-shaun gets rebuilt, no more lessons, lessons restart counting at 1

-jabber server already has a room named "1" so it throws an exception

The lessonId as chatRoomName is bound to cause problems if different servers are using the same chatServer. Therefore, room names are now formed by concatenating lessonId to createDateTime and by replacing " " and ":" characters with underscores (Jabber servers don't accept those characters).

Options
    • -1
    • +3
    ./web/mainnoflash.jsp
    • -0
    • +7
    ./web/includes/presence.js
  3. … 3 more files in changeset.
8:15 am

Ernie Ghiglione

Updating Greek, English

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -14
    • +14
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 3 more files in changeset.
6:20 am

paulg

Fixes Smack throwing exceptions

The problem was being caused by the PresenceServlet calling Smack in order to create a new room which already existed.

Example: shaun has 5 lessons, each with their chatrooms which are named using the lessonId ie 1,2,3...

Options
    • binary
    ./web/lams_learner.swf
  2. … 8 more files in changeset.
Monday 24 Nov 2008
11:14 am

paulg

Learner not coming up. Recompiled from Flash and will see if it helps.

Options
    • binary
    ./web/lams_learner.swf
8:11 am

paulg

LDEV-2036 Grouping now showing in viewMode (src typo)

LDEV-2026 Flashless presence showing all characters perfect (html), in Flash latin accents are removed to ensure that they display correctly (mx2004 issue?)

LDEV-2025 Flash presence now displaying OK in IE6

LDEV-2040 New checkboxes were not being skinned

Options
    • binary
    ./web/lams_learner.swf
    • -1
    • +2
    ./web/mainnoflash.jsp
    • -7
    • +59
    ./web/includes/presence.js
  4. … 27 more files in changeset.
Friday 21 Nov 2008
8:38 pm

Ernie Ghiglione

Updating Greek and English

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 6 more files in changeset.
Thursday 20 Nov 2008
2:30 am

Ernie Ghiglione

Updating Greek, Spanish, Chinese

Options
    • -17
    • +17
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -7
    • +7
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +8
    ./conf/language/lams/ApplicationResources_zh_CN.properties
Tuesday 18 Nov 2008
7:26 am

asukkar

Moved javascript variable 'tb_pathToImage' and converted to absolute path.

Options
    • -0
    • +3
    ./web/mainnoflash.jsp
  2. … 2 more files in changeset.
Monday 17 Nov 2008
7:36 am

paulg

-Presence in Flash now shows the number of leaners using presence

-Little indentation error in flashless interface

Options
    • binary
    ./web/lams_learner.swf
    • -1
    • +1
    ./web/mainnoflash.jsp
  3. … 1 more file in changeset.
7:24 am

paulg

LDEV-2025 Flashless presence is now sorted as in Flash

Options
    • -0
    • +10
    ./web/includes/presence.js
6:52 am

paulg

LDEV-2023 Resizing correctly now

Options
    • -0
    • +2
    ./web/controlFrame.jsp
    • binary
    ./web/lams_learner.swf
  3. … 2 more files in changeset.
Friday 14 Nov 2008
8:06 pm

Ernie Ghiglione

Updating Greek and Norwegian

Options
    • -4
    • +11
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
  3. … 4 more files in changeset.
Monday 10 Nov 2008
2:12 pm

Ernie Ghiglione

Updating French, Spanish and English

Options
    • -2
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +4
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +9
    ./conf/language/lams/ApplicationResources_fr_FR.properties
Friday 07 Nov 2008
1:38 pm

Ernie Ghiglione

Updating Norwegian

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 1 more file in changeset.
Monday 03 Nov 2008
11:56 am

Ernie Ghiglione

Updating English and Spanish

Options
    • -6
    • +9
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +8
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +8
    ./conf/language/lams/ApplicationResources_es_ES.properties
11:50 am

Ernie Ghiglione

Updating Chinese China

Options
    • -2
    • +16
    ./conf/language/lams/ApplicationResources_zh_CN.properties
11:28 am

Marcin Cieslak

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

Options
    • -3
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -110
    • +132
    ./src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -91
    • +106
    ./src/java/org/lamsfoundation/lams/learning/export/Portfolio.java
    • -449
    • +417
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -302
    • +339
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -0
    • +9
    ./web/WEB-INF/tags/ExportPortOutput.tag
    • -1
    • +19
    ./web/exportPortfolio/main.jsp
11:10 am

lfoxton

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

Options
    • -15
    • +8
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
Friday 31 Oct 2008
8:00 am

lfoxton

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

Options
    • -13
    • +21
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
7:48 am

lfoxton

Fixing up format of main export servlet

Options
    • -199
    • +197
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java