lams

Tools

Line History

Line Count Graph
Line Count Graph

Stats

Commits this week: 0
Total Committers: 33
Last Commit:
Commits this week: 0
Total Lines of Code (LoC): 4,779,243
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
Tuesday 17 Feb 2009
12:53 pm

mseaton

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

Options
    • -15
    • +45
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
12:03 pm

mseaton

LDEV-2078 Merge for 2.2.1

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -3
    • +5
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as
    • -2
    • +3
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
11:21 am

mseaton

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

Options
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
11:09 am

dcarlier

LDEV-2140 Progress toward flash export to gradebook support. Added label & combobox to pi, populated it with toolOutputDefinition types for selected tool act. Got copy/paste copying selected definition working also

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -3
    • +32
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
    • -8
    • +15
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -3
    • +54
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -1
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
9:51 am

mseaton

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

Options
    • -4
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -3
    • +6
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
    • -2
    • +4
    /lams_learning/web/close.jsp
Monday 16 Feb 2009
1:56 pm

mseaton

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

Options
    • -19
    • +54
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
Sunday 15 Feb 2009
9:10 am

Ernie Ghiglione

Updating Greek, English, Spanish, Norwegian and Chinese (Taiwan)

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/el_GR_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/es_ES_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/no_NO_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/zh_TW_dictionary.xml
9:04 am

Ernie Ghiglione

Updating English, Spanish, Greek

Options
    • -5
    • +6
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -2
    • +5
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -5
    • +6
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
9:00 am

Ernie Ghiglione

Updating English and Spanish

Options
    • -49
    • +9
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -49
    • +9
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +9
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
8:57 am

Ernie Ghiglione

Updating greek and norwegian

Options
    • -2
    • +8
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +8
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
Saturday 14 Feb 2009
1:45 am

Marcin Cieslak

LDEV-1998: Added Pedagogical Planner editor with add/edit node functionality.

Options
    • binary
    /lams_build/lib/lams/lams-central.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +15
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +15
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +6
    /lams_central/conf/xdoclet/struts-forms.xml
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -150
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerActivityDTO.java
    • -92
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/authoring/dto/PedagogicalPlannerDTO.java
    • -84
    • +98
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java
    • -139
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/GroupingPedagogicalPlannerForm.java
    • -13
    • +92
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -0
    • +102
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java
    • -102
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerForm.java
  16. … 32 more files in changeset.
1:31 am

Marcin Cieslak

Added local copy of application DTD so LAMS developers can build the project without internet access.

Options
    • -1
    • +7
    /lams_build/build.xml
    • -1
    • +2
    /lams_build/shared.properties
    • -0
    • +271
    /lams_build/conf/j2ee/application_1_3.dtd
    • -1
    • +1
    /lams_build/conf/j2ee/lams.application.xml
Friday 13 Feb 2009
6:35 pm

Ernie Ghiglione

LDEV-2138 and LDEV-2136: Now BasePath and FullBasePath work as before. So that fixes the smilies.

Options
    • -1
    • +1
    /lams_central/web/fckeditor/editor/js/fckeditorcode_gecko.js
    • -1
    • +1
    /lams_central/web/fckeditor/editor/js/fckeditorcode_ie.js
2:35 pm

asukkar

Tag is no longer used.

LDEV-2135

Options
    • -72
    • +0
    /lams_www/web/WEB-INF/tags/HTMLEditor.tag
2:24 pm

asukkar

Updated fck:editor tag

LDEV-2135

Options
    • -12
    • +13
    /lams_admin/web/loginmaintain.jsp
1:56 pm

mseaton

LDEV-2131 Using ajax call to servlet to complete item's (from popup), return javascript to refresh main frame (share resources) and just close window if tool session for the user is finished (ie user moved to next activity).

Options
    • -3
    • +3
    /lams_tool_larsrc/conf/xdoclet/struts-actions.xml
    • -27
    • +2
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java
    • -0
    • +141
    /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/servlet/CompleteItemServlet.java
    • -0
    • +10
    /lams_tool_larsrc/web/WEB-INF/web.xml
    • -0
    • +1
    /lams_tool_larsrc/web/common/header.jsp
    • -14
    • +49
    /lams_tool_larsrc/web/pages/itemreview/instructionsnav.jsp
1:32 pm

asukkar

Get EARDir and lamsContextPath at request time, not just when servlet inits

LDEV-2134

Options
    • -4
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
12:56 pm

asukkar

Get EARDir and lamsContextPath at request time, not just when servlet inits

LDEV-2134

Options
    • -4
    • +9
    /lams_central/src/java/org/lamsfoundation/lams/web/LAMSConnectorServlet.java
8:49 am

asukkar

Replaced indicator dots with loading animation

LDEV-2133

Options
    • -1
    • +1
    /lams_learning/web/exportWaitingPage.jsp
8:46 am

Ernie Ghiglione

Updating english

Options
    • -3
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -4
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources_en_AU.properties
8:43 am

Ernie Ghiglione

Updating English

Options
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
8:17 am

asukkar

Replaced indicator dots with loading animation

LDEV-2133

Options
    • -1
    • +1
    /lams_learning/web/exportWaitingPage.jsp
7:19 am

asukkar

Wrapped FileOutputStream with BufferedOutputStream

LDEV-2132

Options
    • -8
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java
7:17 am

asukkar

Wrapped FileOutputStream with BufferedOutputStream

LDEV-2132

Options
    • -8
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/HttpUrlConnectionUtil.java
Thursday 12 Feb 2009
12:30 pm

lfoxton

LDEV-2128 Changing the createTempDirectory() method to not use the System.currentTimeInMillis() to name the files. Instead using the generateContentFolderID() method to randomly generate the file names. This is the only explanation I could think of for this JIRA

Options
    • -6
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java
12:07 pm

lfoxton

LDEV-2099 - Forgot to commit db changes for server registration and lamscommunity tokens in the update scripts

Options
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
11:23 am

mseaton

LDEV-2074 Fixed bug in update script.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
11:20 am

asukkar

Back porting changes from HEAD.

Fixed error in ImageBundler preventing contentFolder from containing sub directories.

LDEV-2126

Options
    • -60
    • +27
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/Bundler.java
    • -164
    • +121
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/ImageBundler.java
11:02 am

asukkar

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

LDEV-2126

Options
    • -5
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/web/action/Bundler.java
8:22 am

mseaton

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

Options
    • -9
    • +5
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
    • -0
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -0
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0015_updateFrom22.sql
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ComplexActivityStrategy.java
    • -10
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/lesson/LearnerProgress.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -4
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -3
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -3
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java