lams-github

lams_learning

Clone Tools

Stats

Commits this week: 0
Total Committers: 28
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
Monday 17 Aug 2009
8:41 am

lfoxton

LDEV-2420 Merging the stylesheets so there is only one defaultHTML.css file, to make it easier to implement themes

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
Wednesday 29 Jul 2009
2:13 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -22
    • +22
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 22 more files in changeset.
Tuesday 28 Jul 2009
10:20 pm

Andrey Balan

LDEV-2387 simplified rendering of FCKEditor

* removed commented JS part from FCKEditor jsp tag

* removed fckeditorheader.jsp

* got rid of any references to fckeditor.js, fckcontroller.js, fckeditor.css

Options
    • -23
    • +0
    ./web/WEB-INF/tags/FCKEditor.tag
    • -6
    • +1
    ./web/WEB-INF/tags/headItems.tag
  3. … 96 more files in changeset.
Tuesday 14 Jul 2009
8:23 pm

erniegx <ernieg@gmail.com>

Updating Japanese

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_ja_JP.properties
  2. … 14 more files in changeset.
Monday 06 Jul 2009
3:25 pm

jliew

merge lams2_3 to head

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -52
    • +62
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -1
    • +1
    ./web/includes/presenceChat.jsp
  5. … 19 more files in changeset.
Sunday 05 Jul 2009
9:21 pm

erniegx <ernieg@gmail.com>

Updating Greek, English, Spanish, Japanese, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -12
    • +26
    ./conf/language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 19 more files in changeset.
Friday 03 Jul 2009
1:02 pm

jliew

Merge lams2_3 to head (continuing...)

Options
    • -0
    • +4
    ./conf/xdoclet/web-settings.xml
    • -530
    • +550
    ./src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java
    • -1
    • +5
    ./web/WEB-INF/web.xml
  4. … 48 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
    • -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
    • -79
    • +103
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
  5. … 82 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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -293
    • +296
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -40
    • +113
    ./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -2
    • +5
    ./src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java
    • -264
    • +275
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -92
    • +92
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -1
    • +13
    ./web/WEB-INF/tags/ProgressOutput.tag
    • -66
    • +92
    ./web/notebook/viewall.jsp
  10. … 159 more files in changeset.
Wednesday 01 Jul 2009
10:19 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:54 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.
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.
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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MultipleDirFileBundler.java
    • -5
    • +26
    ./web/includes/presence.css
    • -47
    • +64
    ./web/includes/presence.js
    • -23
    • +56
    ./web/includes/presenceChat.jsp
    • -1
    • +1
    ./web/mainflash.jsp
  6. … 158 more files in changeset.
Friday 24 Apr 2009
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
7:46 am

erniegx <ernieg@gmail.com>

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
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
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
    • -3
    • +21
    ./src/java/org/lamsfoundation/lams/learning/export/web/action/MainExportServlet.java
    • -0
    • +1
    ./web/.cvsignore
    • -71
    • +70
    ./web/WEB-INF/lams.tld
    • -92
    • +92
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -9
    • +0
    ./web/WEB-INF/tags/ExportPortOutput.tag
    • -13
    • +1
    ./web/WEB-INF/tags/ProgressOutput.tag
    • -0
    • +136
    ./web/WEB-INF/tags/TextSearch.tag
    • -13
    • +31
    ./web/WEB-INF/web.xml
    • -1
    • +10
    ./web/includes/presence.css
    • -117
    • +226
    ./web/includes/presence.js
    • -24
    • +25
    ./web/includes/presenceChat.jsp
    • -2
    • +3
    ./web/mainflash.jsp
  14. … 43 more files in changeset.
Saturday 11 Apr 2009
7:27 pm

jliew

LDEV-1790 show tick when completed previewing a branch; ticks already added for optional/optional sequences by Luke for LDEV-1784

Options
    • -1
    • +1
    ./web/branching/preview.jsp
Friday 03 Apr 2009
2:29 pm

erniegx <ernieg@gmail.com>

Updating Greek and Maori

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
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
    ./src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
  3. … 9 more files in changeset.
Thursday 02 Apr 2009
9:42 am

paulg

LDEV-2197 Presence Chat - Added a scrollbar to Presence user listings - Changed css - Scrolling better, still a bit iffy

Options
    • -1
    • +8
    ./web/includes/presence.css
    • -5
    • +5
    ./web/includes/presenceChat.jsp
  3. … 1 more file in changeset.
7:49 am

lfoxton

LDEV-2187 - Adding in time columns for gradebook

Options
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
  2. … 9 more files in changeset.
Wednesday 01 Apr 2009
8:45 am

paulg

- Updated jQuery core to v1.3.2 - Updated jQuery UI to v1.7.1 - Classic Wizard now has checkbox visible to enable Presence Chat - Learner no longer has a Presence box - Presence Chat committed

Options
    • -0
    • +76
    ./web/includes/presence.css
    • -252
    • +553
    ./web/includes/presence.js
    • -0
    • +117
    ./web/includes/presenceChat.jsp
    • binary
    ./web/lams_learner.swf
    • -23
    • +127
    ./web/mainflash.jsp
    • -62
    • +22
    ./web/mainnoflash.jsp
  7. … 259 more files in changeset.
Thursday 26 Mar 2009
6:00 pm

jliew

merging improvements from lams2_3_spring_jboss_tune branch

Options
    • -11
    • +19
    ./conf/xdoclet/web-settings.xml
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -0
    • +4
    ./web/WEB-INF/applicationContext.xml
    • -109
    • +109
    ./web/WEB-INF/struts/struts-config.xml
  5. … 115 more files in changeset.
Friday 13 Mar 2009
1:12 pm

dcarlier

LDEV-1782 Complex boxes now closing properly on progress update

Options
    • binary
    ./web/lams_learner.swf
  2. … 3 more files in changeset.
10:44 am

erniegx <ernieg@gmail.com>

Updating Norwegian

Options
    • -3
    • +4
    ./conf/language/lams/ApplicationResources_no_NO.properties
  2. … 1 more file in changeset.
Thursday 12 Mar 2009
2:14 pm

dcarlier

LDEV-1841 Fixed haywire issue

Options
    • binary
    ./web/lams_learner.swf
  2. … 3 more files in changeset.
Sunday 08 Mar 2009
10:55 am

erniegx <ernieg@gmail.com>

Updating English, Spanish

Options
    • -5
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -5
    • +6
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  4. … 12 more files in changeset.
10:12 am

erniegx <ernieg@gmail.com>

Updatin Maori Italian Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_it_IT.properties
    • -28
    • +40
    ./conf/language/lams/ApplicationResources_mi_NZ.properties
Monday 02 Mar 2009
10:40 am

erniegx <ernieg@gmail.com>

Oopps... it was UTF-8

Options
    • -2
    • +2
    ./web/WEB-INF/web.xml
10:37 am

erniegx <ernieg@gmail.com>

Reverting wrong commit

Options
    • -14
    • +4
    ./web/WEB-INF/web.xml