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 03 Jul 2007
10:00 am

fmalikoff

Branching: Adding x and y co-ordinates for the start and stop points. This is to support to UI - the details are not used by the progress engine.

Options
    • -0
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -2
    • +54
    /lams_common/db/model/lams_11.clay
    • -1
    • +5
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +6
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -4
    • +65
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -4
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java
    • -85
    • +129
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -4
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -13
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -15
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
9:20 am

jliew

added collection of external servers, since it's stored locally in new table (lams_lesson_fed)

Options
    • -0
    • +19
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationServer.hbm.xml
9:20 am

jliew

changed lessonId property to lesson object, since it's on the local server

Options
    • -7
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/FederationLesson.hbm.xml
9:18 am

jliew

file FedRegistryUpdateServlet.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
9:18 am

jliew

change update registry url from struts action to servlet so that it falls outside of web security context.

Options
    • -1
    • +1
    /lams_admin/web/federation/federation.jsp
    • -0
    • +43
    /lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
    • -41
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/FederationRegistryAction.java
    • -0
    • +0
    /lams_central/web/federationUpdateResults.jsp
9:17 am

jliew

add validation for duplicate name

Options
    • -0
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
9:16 am

jliew

complete updateFederationRegistry so that outdated servers are deleted

Options
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/federation/FederationServer.java
    • -1
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java
Monday 02 Jul 2007
2:46 pm

mseaton

improved canvas branch view - adding canvas activities (group, branching, optional activities etc)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -18
    • +28
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -11
    • +39
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -1
    • +1
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/CommonCanvasView.as
12:09 pm

dcarlier

LI-120 creating the build ant scipt for the unix installer package.

Options
    • -0
    • +81
    /unix_installer/installer-package/build-package.xml
12:07 pm

dcarlier

Updating with changes that fiona made for 2.0.4 release. Some files replace with code downloaded from the installer package website

Options
    • binary
    /unix_installer/installer-package/ant-scripts/.createdabase.xml.swp
    • binary
    /unix_installer/installer-package/sql-scripts/create-database.sql
9:38 am

dcarlier

File is generated by installer, so should not be in the build package

Options
    • -12
    • +0
    /unix_installer/installer-package/ant-scripts/update-configuration.xml
9:13 am

fmalikoff

Branching: Improved validation logic for adding branch connectors or transitions in Branching Activity view. Added firstActivityUIID field to SequenceActivity. Creating branches on fly (onload of sequence activities in branching activity).

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
Friday 29 Jun 2007
4:37 pm

mseaton

added firstActivityUIID field to SequenceActivity + improve branching validation logic + creating branches on fly (onload of sequence activities in branching activity)

Options
    • -3
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +27
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -13
    • +30
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -21
    • +34
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
4:23 pm

fmalikoff

Rolling back previous update as the validation changes caused problems with drawing the "transitions" from the start hub.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
3:28 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -4
    • +32
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -24
    • +40
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/SequenceActivityStrategy.java
    • -2
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
2:55 pm

jliew

file LessonFederation.hbm.xml was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/LessonFederation.hbm.xml
2:55 pm

jliew

file LessonFederation.java was initially added on branch shibboleth_2_0.

Options
    • -0
    • +0
    /lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java
2:55 pm

jliew

added new table to record list of external lessons joined by local groups

Options
    • -1
    • +2
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/FederationAction.java
    • -4
    • +26
    /lams_admin/web/federation/federation.jsp
    • -0
    • +82
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/federation/LessonFederation.hbm.xml
    • -0
    • +12
    /lams_common/db/sql/create_sharedlesson_tables.sql
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -11
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/federation/FederationLesson.java
    • -0
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/federation/FederationServer.java
    • -0
    • +116
    /lams_common/src/java/org/lamsfoundation/lams/federation/LessonFederation.java
    • -1
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -0
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
1:35 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java
1:13 pm

fmalikoff

Branching: Added a new field firstActivity to the SequenceActivity, so Flash can easily indicate where to start in a sequence activity. That way, the logic works in the same way as it does in a learning design.

Options
    • -2
    • +10
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    /lams_common/db/model/lams_11.clay
    • -1
    • +2
    /lams_common/db/sql/create_lams_11_tables.sql
    • -0
    • +3
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -10
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -4
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -3
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
9:39 am

mseaton

improved validation logic for adding branch connectors or transitions in Branching Activity view

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -1
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -16
    • +50
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • binary
    /lams_flash/src/common/flash/LFWindow.fla
    • -3
    • +0
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
    • -12
    • +7
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
7:52 am

fmalikoff

Clarifying comparison for group - will now work even if the groups have the same order id. Removed unneeded saving logic from the import code now that the comparison is fixed.

Options
    • -5
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -8
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
7:14 am

fmalikoff

Branching: Wasn't updating the branch link when we copied the branch mappings (when copying a design).

Options
    • -1
    • +4
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
7:13 am

fmalikoff

Update done the day after the initial release - the db was being created locally on a fresh machine as user grants were failing. Referred to a non-existent parameter SQL_GRANT, which has been replaced by SQL_HOST.

Options
    • -1
    • +1
    /unix_installer/installer-package/ant-scripts/configure-database.xml
    • binary
    /unix_installer/installer-package/sql-scripts/create-database.sql
Thursday 28 Jun 2007
10:08 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • -0
    • +2
    /lams_learning/build.xml
10:08 pm

fmalikoff

Branching: Getting the import working for grouped branching

Options
    • -1
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -12
    • +105
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
2:49 pm

fmalikoff

Stop it deploying the classes directory under WEB-INF - this can give us class conflicts as the code ends up in two places.

Options
    • -0
    • +2
    /lams_learning/build.xml
    • -3
    • +7
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +6
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +9
    /lams_learning/conf/xdoclet/struts-forms.xml
    • -20
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -37
    • +24
    /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
    • -1
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -19
    • +122
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -9
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
    • -52
    • +72
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -2
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java
    • -10
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
  16. … 11 more files in changeset.
2:43 pm

fmalikoff

Branching: Getting the progress engine working so it will display the branch activities if the sequence/branch contains one or no activities

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -15
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -2
    • +9
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.hbm.xml
    • -6
    • +26
    /lams_common/db/model/lams_11.clay
    • -5
    • +10
    /lams_common/db/sql/create_lams_11_tables.sql
    • -4
    • +8
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -4
    • +22
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchActivityEntry.java
    • -1
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupBranchActivityEntryDTO.java
    • -7
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -4
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java
11:22 am

fmalikoff

Updating version to 2.0.4 / 2.0.4 Dev

Options
    • -5
    • +5
    /lams_common/db/sql/insert_lams_unix_config_data.sql
10:17 am

dcarlier

Updates unix updater for the 2.0.4 release

Options
    • -4
    • +4
    /unix_installer/upgrader-package/ant-scripts/lang.properties
    • -2
    • +2
    /unix_installer/upgrader-package/ant-scripts/language-pack.xml
    • -0
    • +32
    /unix_installer/upgrader-package/ant-scripts/update-204_jbossweb-tomcat55.sar.xml
    • -6
    • +6
    /unix_installer/upgrader-package/ant-scripts/update-core-database.xml
    • -1
    • +1
    /unix_installer/upgrader-package/ant-scripts/update-deploy-tools.xml
    • -0
    • +334
    /unix_installer/upgrader-package/ant-scripts/update-lams.xml
    • binary
    /unix_installer/upgrader-package/ant-scripts/updateLocales.sql
    • -0
    • +4
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/context.xml
    • -0
    • +138
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/jboss-service.xml
    • -0
    • +128
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/server.xml
    • -0
    • +984
    /unix_installer/upgrader-package/ant-scripts/tomcat-204-files/web.xml
    • binary
    /unix_installer/upgrader-package/bin/UpdateLAMS202Chat.class
    • binary
    /unix_installer/upgrader-package/bin/checkmysql.class
    • binary
    /unix_installer/upgrader-package/bin/copyllid.class
    • binary
    /unix_installer/upgrader-package/bin/hibernate3.jar
  16. … 479 more files in changeset.