lams-github / lams_learning / src / java / org

lamsfoundation

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
Last Commit:
Commits this week: 0

Lines of code count not available

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
1:02 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -530
    • +550
    ./lams/learning/web/action/LearnerAction.java
  2. … 50 more files in changeset.
Thursday 02 Jul 2009
9:06 pm

Marcin Cieslak

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

Options
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -13
    • +16
    ./lams/learning/service/ILearnerService.java
    • -79
    • +103
    ./lams/learning/service/LearnerService.java
  4. … 83 more files in changeset.
4:19 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
    • -1
    • +1
    ./lams/learning/export/web/action/ImageBundler.java
    • -0
    • +1
    ./lams/learning/learningApplicationContext.xml
    • -293
    • +296
    ./lams/learning/progress/ProgressEngine.java
    • -40
    • +113
    ./lams/learning/service/LearnerService.java
    • -2
    • +5
    ./lams/learning/web/action/NotebookAction.java
    • -264
    • +275
    ./lams/learning/web/util/LearningWebUtil.java
  7. … 162 more files in changeset.
Thursday 07 May 2009
2:15 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
    ./lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 162 more files in changeset.
Friday 17 Apr 2009
3:10 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
    • -0
    • +27
    ./lams/learning/export/web/action/ImageBundler.java
    • -3
    • +21
    ./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
    • -1
    • +1
    ./lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    ./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
    • -3
    • +5
    ./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
    ./lams/learning/learningApplicationContext.xml
  2. … 118 more files in changeset.
Tuesday 24 Feb 2009
5:01 am

Marcin Cieslak

LDEV-2054: Added support for “viewStudentsBeforeSelection” option.

Options
    • -275
    • +341
    ./lams/learning/service/ICoreLearnerService.java
    • -61
    • +66
    ./lams/learning/service/LearnerService.java
    • -185
    • +195
    ./lams/learning/web/action/GroupingAction.java
  4. … 8 more files in changeset.
Thursday 19 Feb 2009
1:39 pm

paulg

LDEV-2005 - Voice recording tool - FCKEditor plugin present - Changes to configuration file for Red5 settings - Updates to VideoRecorderForFCK (Flex)

Options
    • -0
    • +70
    ./lams/learning/export/web/action/MultipleDirFileBundler.java
  2. … 76 more files in changeset.
Tuesday 17 Feb 2009
11:21 am

mseaton

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

Options
    • -2
    • +2
    ./lams/learning/progress/ProgressEngine.java
9:51 am

mseaton

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

Options
    • -2
    • +5
    ./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
    • -18
    • +53
    ./lams/learning/service/LearnerService.java
Thursday 12 Feb 2009
11:02 am

asukkar

Fixed error in copyFile method. Replaced copyFileToDirectory with copyFile since the destFilePath includes the required file name.

LDEV-2126

Options
    • -4
    • +4
    ./lams/learning/export/web/action/Bundler.java
8:23 am

mseaton

LDEV-2115 Timestamp (current date time) added to completed activity record (table: lams_progress_completed)

Options
    • -1
    • +1
    ./lams/learning/export/service/PortfolioBuilder.java
    • -3
    • +3
    ./lams/learning/progress/ProgressEngine.java
    • -1
    • +1
    ./lams/learning/service/LearnerService.java
    • -2
    • +2
    ./lams/learning/web/util/LearningWebUtil.java
  5. … 8 more files in changeset.
Tuesday 10 Feb 2009
8:42 am

asukkar

Removed unused methods.

LDEV-2126

Options
    • -42
    • +0
    ./lams/learning/export/web/action/ImageBundler.java
7:50 am

asukkar

Modified bundleImages() to use the copyDirectory method from the commons-io library instead of copyFile() in Bundler

LDEV-2126

Options
    • -156
    • +155
    ./lams/learning/export/web/action/ImageBundler.java
7:48 am

asukkar

Modified copyFiles to use the copyFileToDirectory method from the commons-io library

Options
    • -59
    • +26
    ./lams/learning/export/web/action/Bundler.java
Friday 23 Jan 2009
5:32 pm

Marcin Cieslak

LDEV-2094: Added missing argument in ExportPorfolioService so Shaun does not fail builds.

Options
    • -1
    • +1
    ./lams/learning/export/service/ExportPortfolioService.java
Friday 16 Jan 2009
1:57 pm

mseaton

LDEV-2074 Improvements handle insert/merge of two designs with floating activities. Only set readOnly to true when value is not set in LearnerService (when moving to Floating Activities).

Options
    • -2
    • +5
    ./lams/learning/service/LearnerService.java
  2. … 1 more file in changeset.
7:24 am

mseaton

LDEV-2074 Missing toActivity null check

Options
    • -6
    • +7
    ./lams/learning/service/LearnerService.java
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
    • -1
    • +1
    ./lams/learning/progress/ProgressBuilder.java
    • -5
    • +9
    ./lams/learning/service/LearnerService.java
    • -6
    • +19
    ./lams/learning/web/action/LearnerAction.java
11:18 am

mseaton

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

Options
    • -0
    • +14
    ./lams/learning/export/ActivityPortfolio.java
    • -4
    • +5
    ./lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    ./lams/learning/web/util/LearningWebUtil.java
  4. … 2 more files in changeset.
Tuesday 13 Jan 2009
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
    • -0
    • +5
    ./lams/learning/export/service/PortfolioBuilder.java
    • -9
    • +18
    ./lams/learning/progress/ProgressBuilder.java
    • -0
    • +4
    ./lams/learning/progress/ProgressEngine.java
    • -3
    • +3
    ./lams/learning/service/LearnerService.java
    • -1
    • +1
    ./lams/learning/web/action/BranchingActivityAction.java
    • -1
    • +1
    ./lams/learning/web/action/DisplayOptionsActivityAction.java
    • -0
    • +11
    ./lams/learning/web/bean/ActivityURL.java
    • -2
    • +5
    ./lams/learning/web/util/LearningWebUtil.java
  9. … 2 more files in changeset.
Monday 03 Nov 2008
11:28 am

Marcin Cieslak

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

Options
    • -110
    • +132
    ./lams/learning/export/ActivityPortfolio.java
    • -92
    • +107
    ./lams/learning/export/Portfolio.java
    • -442
    • +410
    ./lams/learning/export/service/ExportPortfolioService.java
    • -278
    • +315
    ./lams/learning/export/service/PortfolioBuilder.java
  5. … 4 more files in changeset.
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
    • -14
    • +7
    ./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
    • -12
    • +20
    ./lams/learning/export/web/action/MainExportServlet.java
7:48 am

lfoxton

Fixing up format of main export servlet

Options
    • -201
    • +199
    ./lams/learning/export/web/action/MainExportServlet.java
Wednesday 29 Oct 2008
1:35 pm

Marcin Cieslak

LDEV-1299: Backend for condition gates.

Options
    • -8
    • +13
    ./lams/learning/service/LearnerService.java
    • -129
    • +129
    ./lams/learning/web/action/GateAction.java
  3. … 24 more files in changeset.
Thursday 09 Oct 2008
2:17 pm

Marcin Cieslak

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

Options
    • -0
    • +3
    ./lams/learning/service/LearnerService.java