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
Wednesday 15 Aug 2007
9:51 am

fmalikoff

Changes to support tool output based branching. Work in progress!

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -8
    • +24
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -10
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -8
    • +13
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -1
    • +60
    /lams_common/db/model/lams_11.clay
    • -2
    • +14
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +17
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -3
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -2
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -5
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -2
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
  16. … 18 more files in changeset.
Tuesday 14 Aug 2007
5:09 pm

mseaton

used recursive function to generate tool activity list

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +11
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
4:01 pm

mseaton

tool activity list for tool-based branching now includes children activity(s) of complex activity(s)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +77
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as
    • -54
    • +13
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as
    • -0
    • +110
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as
    • -2
    • +9
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -0
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -0
    • +11
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
2:03 pm

mseaton

added tool activity selection for tool based branching

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • 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
    • +15
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -5
    • +24
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -66
    • +100
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
Friday 10 Aug 2007
2:43 pm

mseaton

fixed random grouping issues LDEV-1263

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -4
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -20
    • +25
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
2:41 pm

dcarlier

windows installer/updater/uninstaller now gets mysql version through the newly added checkmysqlversion.java. Further a number of the calls, ie to dump the database, to create the database etc, have been changed to only occur if the mysql_host is set to localhost

Options
    • -3
    • +2
    /win_installer/src/build.xml
    • -0
    • +97
    /win_installer/src/checkmysqlversion.java
    • binary
    /win_installer/src/updater.nsi
12:17 pm

mseaton

restrict canvas objects so they cannot be placed in the negative plane

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
    • -2
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as
    • -8
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
Thursday 09 Aug 2007
3:28 pm

mseaton

improvements with grouping controls mixed with branching

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
    • -0
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
    • -23
    • +43
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
    • -4
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as
Wednesday 08 Aug 2007
5:08 pm

mseaton

handling for grouping properties changes when linked to branching activity

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +31
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -2
    • +12
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as
    • -8
    • +10
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -8
    • +24
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
    • -2
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
    • -32
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -26
    • +101
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
    • -1
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/ValidationIssue.as
Monday 06 Aug 2007
3:09 pm

lfoxton

lams2 and blackboard integration project. This is not a working version yet, but the main files in the project are there

Options
    • -0
    • +20
    /lams_bb_integration/.classpath
    • -0
    • +17
    /lams_bb_integration/.project
    • -0
    • +74
    /lams_bb_integration/build.xml
    • -0
    • +89
    /lams_bb_integration/WEB-INF/bb-manifest.xml
    • -0
    • +36
    /lams_bb_integration/WEB-INF/web.xml
    • -0
    • +20
    /lams_bb_integration/WEB-INF/config/log4j.properties
    • -0
    • +91
    /lams_bb_integration/WEB-INF/config/taglibs/bbData.tld
    • -0
    • +1823
    /lams_bb_integration/WEB-INF/config/taglibs/bbUI.tld
    • -0
    • +32
    /lams_bb_integration/WEB-INF/config/taglibs/bbUI.xsl
    • binary
    /lams_bb_integration/WEB-INF/lib/axis-ant.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/axis.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/commons-codec-1.3.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/commons-discovery-0.2.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/commons-logging-1.0.4.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/jaxrpc.jar
  16. … 45 more files in changeset.
Thursday 02 Aug 2007
12:23 pm

fmalikoff

Fixed up lookup of existing group to branch mappings based on UIID and ID. Now uses a combination of both that should cover all cases.

Options
    • -9
    • +21
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
12:22 pm

fmalikoff

Added validation for grouping activities - if the number of groups in the design is more than the specified number of groups then there is a validation error.

Options
    • -2
    • +3
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -1
    • +36
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
12:17 pm

mseaton

minor group and branch mapping changes

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
12:07 pm

mseaton

minor group and branch mapping changes

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as
    • -0
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -26
    • +14
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
    • -1
    • +0
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/layout/ILayoutManager.as
11:51 am

fmalikoff

Made spelling of branchingActivityUIID entry consistent between DTO and WDDXTAGS

Options
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
8:52 am

fmalikoff

Fixed up lookup of existing Groups based on UIID and ID. Now uses a combination of both that should cover all cases.

Options
    • -7
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
8:49 am

fmalikoff

Made the userlist in the GroupDTO optional, so that it isn't passed to authoring.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -3
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -2
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -3
    • +3
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java
Wednesday 01 Aug 2007
3:48 pm

mseaton

improved DDM for opening design with grouping (groups) and branch mappings

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -0
    • +8
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
2:45 pm

mseaton

group matching dialog + saving matches + group handling

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as
    • -15
    • +82
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as
    • -0
    • +110
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as
    • -1
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -37
    • +47
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
    • -2
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/WizardModel.as
Tuesday 31 Jul 2007
7:24 pm

fmalikoff

Handles group records that may or may not have an order id.

Options
    • -3
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
2:09 pm

fmalikoff

Fixing up Grouping related code so it will cope with more cases during grouping, and so that groupingDAO can better find all the groups in a learning design.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
    • -33
    • +49
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -7
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -3
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -10
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -34
    • +31
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -11
    • +17
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -3
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -2
    • +5
    /lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
11:45 am

mseaton

group naming dialog + saving groups

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml
    • -1
    • +1
    /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml
    • -2
    • +2
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -0
    • +88
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as
    • -10
    • +69
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -11
    • +38
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
    • -1
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -2
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
10:13 am

jliew

add results text when federation server list is updated

Options
    • -1
    • +16
    /lams_central/src/java/org/lamsfoundation/lams/web/FedRegistryUpdateServlet.java
    • -2
    • +10
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/FederationService.java
    • -1
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/federation/service/IFederationService.java
Monday 30 Jul 2007
6:57 pm

asukkar

Added adminURL

LDEV-1256

Options
    • -2
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
Friday 27 Jul 2007
2:46 pm

fmalikoff

Branching: basic group naming and branch -> group mapping screens. They don't save data to the server yet.

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
2:43 pm

fmalikoff

LDEV-1134: Preview now lets the author run through multiple branches, but if a stop point is reached then it stops the lesson.

Options
    • -17
    • +52
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -14
    • +22
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
1:13 pm

fmalikoff

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

Options
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_learning/conf/xdoclet/struts-forms.xml
    • -0
    • +7
    /lams_learning/web/WEB-INF/struts/struts-config.xml
    • -0
    • +4
    /lams_learning/web/WEB-INF/struts/tiles-defs.xml
    • -0
    • +139
    /lams_learning/web/branching/preview.jsp
    • -5
    • +0
    /lams_learning/web/branching/wait.jsp
8:38 am

fmalikoff

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times. Did some small refactoring to have only one piece of code that creates the branching mapping related to a group as we have many bits that need to do this (authoring, import, chosen branching in monitoring and now preview!)

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -7
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -20
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
8:36 am

fmalikoff

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times.

Options
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -6
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -31
    • +86
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -15
    • +107
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -10
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -1
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -2
    • +16
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -7
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Thursday 26 Jul 2007
4:45 pm

mseaton

branching changes + group/branch matching dialog + group naming dialog + some code cleanup + spliting PI class + PI and Branch/Sequence integration

Options
    • binary
    /lams_flash/src/central/flash/lams_authoring.fla
    • -8
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as
    • -41
    • +20
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
    • -1
    • +17
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
    • -0
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +299
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupMatchingDialog.as
    • -0
    • +226
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/GroupNamingDialog.as
    • -3
    • +5
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -774
    • +41
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
    • -0
    • +933
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as
    • -1
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
    • -3
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
    • -10
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as
  16. … 9 more files in changeset.