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
Friday 03 Jul 2009
9:24 am

jliew

merge lams2_3_jboss5 to lams2_3 (continuing...)

Options
    • -4
    • +2
    ./.classpath
    • -1
    • +5
    ./conf/xdoclet/web-settings.xml
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -81
    • +78
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -561
    • +581
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -53
    • +63
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  7. … 2 more files in changeset.
Thursday 02 Jul 2009
8:59 pm

Marcin Cieslak

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

Options
    • -1
    • +1
    ./conf/xdoclet/web-settings.xml
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -80
    • +104
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  5. … 82 more files in changeset.
4:18 pm

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/learning/learningApplicationContext.xml
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -297
    • +300
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -41
    • +114
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +6
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -270
    • +281
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • binary
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +13
    ./web/WEB-INF/tags/ProgressOutput.tag
    • -66
    • +92
    ./web/notebook/viewall.jsp
  10. … 206 more files in changeset.
Wednesday 01 Jul 2009
10:16 pm

Marcin Cieslak

Added missing library and fixed classpaths - changes needed after code merge.

Options
    • -4
    • +3
    ./.classpath
  2. … 17 more files in changeset.
Friday 19 Jun 2009
6:50 pm

Marcin Cieslak

LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

Options
    • -1
    • +1
    ./web/mainnoflash.jsp
  2. … 18 more files in changeset.
Tuesday 26 May 2009
11:02 pm

Marcin Cieslak

LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +7
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 9 more files in changeset.
2:16 am

Marcin Cieslak

LDEV-2071, LDEV-2201, LDEV-57: Changed the Transaction Manager to Hibernate instead of JTA. Synchronized code in 2 more spots as deadlock exceptions had been thrown.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -53
    • +63
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  3. … 5 more files in changeset.
Thursday 21 May 2009
11:25 pm

Marcin Cieslak

LDEV-2071: Fixed authentication issues. Fixed deadlock issues. Cleaned up.

Options
    • -80
    • +71
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -561
    • +581
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  3. … 29 more files in changeset.
Thursday 14 May 2009
1:28 pm

dcarlier

LDEV-2142 Support activities's progress now update on normal progress update (as learner progresses through the sequence)

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
1:19 pm

dcarlier

LDEV-2142 Support activities's progress now update on normal progress update (as learner progresses through the sequence)

Options
    • binary
    ./web/lams_learner.swf
  2. … 1 more file in changeset.
Wednesday 13 May 2009
8:15 pm

paulg

PresenceChat fixed for no IM

Options
    • -1
    • +1
    ./web/includes/presenceChat.jsp
7:47 pm

Marcin Cieslak

LDEV-2071: Added initial version of LAMS 2.3 on JBoss 5.1.

Options
    • -4
    • +2
    ./.classpath
    • -1
    • +5
    ./conf/xdoclet/web-settings.xml
  3. … 9 more files in changeset.
1:20 pm

paulg

VideoRecorder tool shows a help button in export portfolio which links to the wiki for extra config settings

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
  2. … 1 more file in changeset.
Tuesday 12 May 2009
12:42 pm

mseaton

update Learning struts and web config.

Options
    • -13
    • +31
    ./web/WEB-INF/web.xml
Saturday 09 May 2009
2:33 pm

Ernie Ghiglione

Updating Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 8 more files in changeset.
Friday 08 May 2009
12:21 pm

lfoxton

gradebook classpath should be in lams_learning project

Options
    • -0
    • +1
    ./.classpath
Thursday 07 May 2009
2:54 pm

paulg

Committed last changed from HEAD to 2.3 branch

Options
    • -1
    • +0
    ./.classpath
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
    • -1
    • +1
    ./web/mainflash.jsp
    • -5
    • +26
    ./web/includes/presence.css
    • -47
    • +64
    ./web/includes/presence.js
    • -23
    • +56
    ./web/includes/presenceChat.jsp
  9. … 92 more files in changeset.
2:14 pm

paulg

LDEV-2254

Safari and VR Author fixed

LDEV-2286

VR tool now deployed as archived .war

LDEV-2281

Lessons with VR tool activities are now exported correctly

Author recordings are held locally on LAMS server

LDEV-2289

Popup now shown if EITHER media server settings are blank (both required for VR to work)

LDEV-2005

Export for learner/teacher working

Conditions tab removed

Author recordings added to FCK content folder

Preview images uploaded to own content folder for each VR session

Options
    • -13
    • +13
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
    • -1
    • +1
    ./web/mainflash.jsp
    • -5
    • +26
    ./web/includes/presence.css
    • -47
    • +64
    ./web/includes/presence.js
    • -23
    • +56
    ./web/includes/presenceChat.jsp
  6. … 158 more files in changeset.
Friday 01 May 2009
2:13 pm

lfoxton

LDEV-2261 Setting a flag in gradebook activities so that they can be updated more than once if hte request comes from an external source like a tool. If it is set in gradebook, the flag is set so it cant be updated from an external source again

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  2. … 10 more files in changeset.
11:00 am

mseaton

LDEV-2268 Added null check for current activity.

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
Monday 27 Apr 2009
2:23 pm

lfoxton

Adding lams_gradebook to lams_learning's classpath

Options
    • -0
    • +1
    ./.classpath
Friday 24 Apr 2009
11:06 am

paulg

Merged latest changes for PresenceChat and VideoRecorder to 2.3 branch

Options
    • -0
    • +9
    ./web/includes/presence.css
    • -85
    • +90
    ./web/includes/presence.js
    • -7
    • +4
    ./web/includes/presenceChat.jsp
  4. … 85 more files in changeset.
10:43 am

paulg

LDEV-2005

VideoRecorder tool and FCKEditor video recorder updated

LDEV-2197

PresenceChat fixed for IE7/IE8

Better user management/no more status messages onConnect and onDisconnect

Options
    • -0
    • +9
    ./web/includes/presence.css
    • -85
    • +90
    ./web/includes/presence.js
    • -7
    • +4
    ./web/includes/presenceChat.jsp
  4. … 19 more files in changeset.
Thursday 23 Apr 2009
2:42 pm

Ernie Ghiglione

Removing lams_learner.swd as it was checked it by accident (aparently -ask Mitch otherwise :-)

Options
    • binary
    ./web/lams_learner.swd
7:46 am

Ernie Ghiglione

Updating Greek, English, Spanish, Norwegian

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
7:46 am

Ernie Ghiglione

Updating Greek, English, Spanish, Norwegian

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_no_NO.properties
Wednesday 22 Apr 2009
2:39 pm

lfoxton

LDEV-2173 Adding the functionality into the progress engine to force outputs into gradebook if specified by the user

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +53
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  3. … 13 more files in changeset.
12:28 pm

lfoxton

Fixing up the format of LearnerService.java

Options
    • -41
    • +62
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
12:26 pm

lfoxton

Fixing format of LearningWebUtil.java

Options
    • -270
    • +281
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
12:20 pm

lfoxton

Fixing the format of ProgressEngine.java

Options
    • -297
    • +300
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java