lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 06 Aug 2007
3:10 pm

lfoxton <lfoxton@melcoe.mq.edu.au>

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
    • +89
    /lams_bb_integration/WEB-INF/bb-manifest.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
    • binary
    /lams_bb_integration/WEB-INF/lib/log4j-1.2.8.jar
    • binary
    /lams_bb_integration/WEB-INF/lib/saaj.jar
  16. … 45 more files in changeset.
Thursday 02 Aug 2007
12:23 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
    • -1
    • +2
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
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
    • -8
    • +20
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.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
    • -1
    • +1
    /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
    • -6
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
8:52 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
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Group.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupDTO.java
    • -2
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
    • -1
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/PerformChosenGroupingServlet.java
Wednesday 01 Aug 2007
3:49 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
    • -2
    • +7
    /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
    • -32
    • +48
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
    • -6
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
    • -9
    • +25
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
    • -33
    • +30
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
    • -10
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java
    • -2
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -1
    • +4
    /lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
11:47 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
    • -1
    • +1
    /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
Monday 30 Jul 2007
6:57 pm

asukkar

Added adminURL

LDEV-1256

Options
    • -1
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
Friday 27 Jul 2007
2:47 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:44 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
    • -16
    • +51
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/BranchingActivityStrategy.java
    • -13
    • +21
    /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
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /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
    • -6
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +12
    /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
    • -5
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/ICoreLearnerService.java
    • -30
    • +85
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
    • -14
    • +106
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -9
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
    • -0
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java
    • -1
    • +15
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java
    • -6
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
Thursday 26 Jul 2007
4:47 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.
Wednesday 25 Jul 2007
12:20 pm

dcarlier

Jira LI-129: Wrapper log file size changed from 10 bytes to 10 megabytes

Options
    • -1
    • +1
    /unix_installer/installer-package/wrapper/wrapper.conf
10:19 am

dcarlier

Jira LI-134: Changed targets to include correct DEFAULT_DIR variable settings

Options
    • -5
    • +6
    /unix_installer/installer-package/install-lams.sh
    • -4
    • +4
    /unix_installer/upgrader-package/ant-scripts/update-lams.xml
Monday 23 Jul 2007
12:37 pm

dcarlier

Jira LI-133 The user is now given the option to manually backup lams at the start of the upgrade procedure

Options
    • -15
    • +18
    /unix_installer/upgrader-package/update-lams.sh
Friday 20 Jul 2007
1:12 pm

dcarlier

Jira LI-131: Fixed problem where windows updater would overwrite news.html if it has been modified by the user

Options
    • -2
    • +12
    /win_installer/src/updater.nsi
    • -0
    • +13
    /win_installer/templates/news-2.0.2.html
11:38 am

dcarlier

fixed problem where it could not find the database when running lams-restore

Options
    • -5
    • +6
    /win_installer/src/revert.nsi
11:30 am

dcarlier

changed mysql check for backup.nsi to be vista compatible

Options
    • -4
    • +13
    /win_installer/src/backup.nsi
8:34 am

dcarlier

Jira LI-135: Update no longer overwrites sysadmin password. Fixed for both unix and windows updaters.

Options
    • -1
    • +1
    /unix_installer/upgrader-package/sql-scripts/setLamsConfiguration.sql
    • -1
    • +1
    /win_installer/templates/update_lams_configuration.sql
Thursday 19 Jul 2007
3:12 pm

mseaton

cleaned up some monitor code + added code for adding branching activity to canvas

Options
    • -8
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/LearnerIcon.as
    • -9
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as
    • -13
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorView.as
    • -1
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorTabView.as
3:10 pm

fmalikoff

LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Progress engine changes done.

Options
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -1
    • +3
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
    • -2
    • +4
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SystemGateActivity.java
  16. … 4 more files in changeset.
3:08 pm

mseaton

use PI to set grouping for Branching Activity (group type)

Options
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -1
    • +31
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as