lams / lams_learning / src

java

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 18
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 10,126
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
12:57 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -561
    • +581
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  2. … 50 more files in changeset.
9:24 am

jliew

merge lams2_3_jboss5 to lams2_3 (continuing...)

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -81
    • +78
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -561
    • +581
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -53
    • +63
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  5. … 4 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
    • -0
    • +1
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./org/lamsfoundation/lams/learning/service/ILearnerService.java
    • -80
    • +104
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
  4. … 83 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
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -297
    • +300
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -41
    • +114
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +6
    ./org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -270
    • +281
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  7. … 209 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
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +7
    ./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
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -53
    • +63
    ./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
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -561
    • +581
    ./org/lamsfoundation/lams/learning/web/action/LearnerAction.java
  3. … 29 more files in changeset.
Wednesday 13 May 2009
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
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
  2. … 1 more file in changeset.
Thursday 07 May 2009
2:54 pm

paulg

Committed last changed from HEAD to 2.3 branch

Options
    • -0
    • +0
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -0
    • +0
    ./org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -13
    • +13
    ./org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
  4. … 97 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
    ./org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 162 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
    ./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
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
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
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +53
    ./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
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
12:26 pm

lfoxton

Fixing format of LearningWebUtil.java

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

lfoxton

Fixing the format of ProgressEngine.java

Options
    • -297
    • +300
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
Monday 20 Apr 2009
12:13 pm

mseaton

LDEV-2027 LDEV-2235 Separated notes into a lesson segmented list. Unknown heading label for empty ' ' external signatures.

Options
    • -3
    • +6
    ./org/lamsfoundation/lams/learning/web/action/NotebookAction.java
  2. … 7 more files in changeset.
Friday 17 Apr 2009
4:21 pm

paulg

Merging latest changes from HEAD to 2.3 branch

See MAIN:paulg:20090417074901 for details

Also, Video Recorder tool project was replaced completely given that it didn't exist in the 2.3 branch yet

Options
    • -1
    • +28
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -4
    • +22
    ./org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  3. … 240 more files in changeset.
3:06 pm

paulg

LDEV-2005 = VideoRecorder tool and FCKEditor video recorder updated

- export portfolio fixed

- export fck recordings fixed

- conditions added

- preview images are now produced and displayed

- more feedback for rating

- instructions highlighted

- clicking delete button does not trigger viewing of recording

- timer display corrected

- prompt validation

- misc bugs

LDEV-2197 = Presence Chat updated

- no longer stacking in ie7

- scrolling improved

- logged conversations are fetched on open new tab

- status messages no longer shown in chat boxes, user icons change instead

- minimize/maximize button shown on presence tab

iFrame fixed for ie6

Options
    • -1
    • +28
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -4
    • +22
    ./org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
  3. … 54 more files in changeset.
Friday 03 Apr 2009
12:42 pm

lfoxton

LDEV-2187 Put time taken for activities and lessons in gradebook.

Fixing up LearnerProgress.java so it stores both finish time and start time for all completed activities

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -2
    • +2
    ./org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  3. … 9 more files in changeset.
Thursday 02 Apr 2009
7:49 am

lfoxton

LDEV-2187 - Adding in time columns for gradebook

Options
    • -4
    • +6
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
  2. … 9 more files in changeset.
Thursday 26 Mar 2009
6:00 pm

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -8
    • +10
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
  2. … 118 more files in changeset.
Wednesday 18 Mar 2009
4:56 am

Marcin Cieslak

LDEV-2174:

Changed Spring contexts to use ContextSingletonBeanFactoryLocator.

Added Ant task to slim JBoss.

Options
    • -8
    • +10
    ./org/lamsfoundation/lams/learning/learningApplicationContext.xml
  2. … 30 more files in changeset.
Tuesday 24 Feb 2009
5:00 am

Marcin Cieslak

LDEV-2054: Added support for �viewStudentsBeforeSelection� option.

Options
    • -274
    • +340
    ./org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -63
    • +68
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
    • -199
    • +209
    ./org/lamsfoundation/lams/learning/web/action/GroupingAction.java
  4. … 8 more files in changeset.
Thursday 19 Feb 2009
1:36 pm

paulg

LDEV-2005 - Voice recording tool

- FCKEditor plugin present

- Changes to configuration file for Red5 settings

- Updates to VideoRecorderForFCK (Flex)

Options
    • -0
    • +70
    ./org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 76 more files in changeset.
Tuesday 17 Feb 2009
12:53 pm

mseaton

LDEV-2139 Merge for 2.2.1 - manual sync on the moveToActivity method.

Options
    • -15
    • +45
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
11:21 am

mseaton

LDEV-2141 Parallel (floating) activity is marked as completed when all children (both) are finished.

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/learning/progress/ProgressEngine.java
9:51 am

mseaton

LDEV-2127 Fixed floating parallel acts behaviour affect finished - display close window msg.

Options
    • -3
    • +6
    ./org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
  2. … 2 more files in changeset.
Monday 16 Feb 2009
1:56 pm

mseaton

LDEV-2139 using a sync map with manually syncronize the method moveToActivity

Options
    • -19
    • +54
    ./org/lamsfoundation/lams/learning/service/LearnerService.java
Thursday 12 Feb 2009
11:20 am

asukkar

Back porting changes from HEAD.

Fixed error in ImageBundler preventing contentFolder from containing sub directories.

LDEV-2126

Options
    • -60
    • +27
    ./org/lamsfoundation/lams/learning/export/web/action/Bundler.java
    • -164
    • +121
    ./org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java