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
Friday 27 Jul 2007
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
12:41 pm

mseaton

fix for toolbar enabling/disabling (alert)

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/cv/CanvasHelper.as
    • -2
    • +23
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
11:46 am

mseaton

added stopAfterActivity (Activity) field

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/Activity.as
    • -2
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/SequenceActivity.as
    • -1
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -0
    • +14
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
9:17 am

fmalikoff

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

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +3
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +1
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -0
    • +13
    /lams_common/db/model/lams_11.clay
    • -0
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
    • -1
    • +3
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +24
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -2
    • +16
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
    • -0
    • +5
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
Wednesday 18 Jul 2007
6:21 pm

mseaton

made alert modal (disabled toolbar buttons) + apply style setting (rgb offset) through ThemeManager

Options
    • -1
    • +1
    /lams_central/conf/flashxml/lams/defaultTheme.xml
    • -1
    • +1
    /lams_central/conf/flashxml/rams/defaultTheme.xml
    • -1
    • +1
    /lams_central/conf/flashxml/rams/ramsTheme.xml
    • binary
    /lams_central/web/lams_authoring.swf
    • binary
    /lams_central/web/lams_authoring_library.swf
    • -0
    • +16
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
    • -14
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
    • -2
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
    • -2
    • +2
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
    • -0
    • +3
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
    • -0
    • +18
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/Toolbar.as
    • -2
    • +1
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarModel.as
    • -5
    • +6
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as
    • -10
    • +39
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
    • -1
    • +1
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
2:42 pm

asukkar

Replaced <bean:message> with <fmt:message> tags

Options
    • -99
    • +85
    /lams_admin/web/WEB-INF/tags/Tab.tag
    • -62
    • +48
    /lams_central/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_learning/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_monitoring/web/WEB-INF/tags/Tab.tag
    • -62
    • +48
    /lams_tool_chat/web/WEB-INF/tags/Tab.tag
    • -62
    • +48
    /lams_tool_forum/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_lamc/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_laqa/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_larsrc/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_nb/web/WEB-INF/tags/Tab.tag
    • -62
    • +48
    /lams_tool_notebook/web/WEB-INF/tags/Tab.tag
    • -62
    • +48
    /lams_tool_sbmt/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_scribe/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_survey/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_tool_vote/web/WEB-INF/tags/Tab.tag
    • -99
    • +85
    /lams_www/web/WEB-INF/tags/Tab.tag
11:08 am

dcarlier

Currently the mechanism employed to update news.html isn't future proof, in that it would require us to manually change news.html (if unmodified) to the current version for successive upgrade, in order for news.html to remain current. Added are changes to be implemented in the 2.1 installer and 2.1.x upgrader to remedy this problem.

Options
    • -424
    • +427
    /unix_installer/installer-package/install-lams.sh
    • -0
    • +15
    /unix_installer/upgrader-package/ant-scripts/update-lams.xml
Tuesday 17 Jul 2007
1:36 pm

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Fixing problems with previous version - parallel activities were generating a link rather than just a heading, and a gate heading was appearing for learning and it should not appear at all.

Options
    • -0
    • +13
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/ActivityPortfolio.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -6
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
12:34 pm

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -2
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
9:35 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio. Required refactoring of classes and moving the system tool link to move to an interface.

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +8
    /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -0
    • +15
    /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -61
    • +66
    /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml
    • -12
    • +12
    /lams_common/db/sql/insert_types_data.sql
    • -19
    • +17
    /lams_common/db/sql/updatescripts/alter_21_branching.sql
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
    • -4
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -3
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -3
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java
    • -3
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupBranchingActivity.java
    • -3
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
    • -0
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ISystemToolActivity.java
    • -8
    • +20
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignProcessor.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
  16. … 5 more files in changeset.
9:32 am

fmalikoff

LDEV-1134: Branching: View screen for the class export portfolio

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
    • -32
    • +50
    /lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/PortfolioBuilder.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java
    • -18
    • +15
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
    • -1
    • +1
    /lams_learning/web/WEB-INF/struts/struts-config.xml
    • -1
    • +1
    /lams_learning/web/branching/wait.jsp
    • -1
    • +1
    /lams_learning/web/layout/branchingWaitLayout.jsp
    • -0
    • +69
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingExportPortfolioServlet.java
    • -29
    • +61
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ChosenBranchingAJAXAction.java
    • -0
    • +9
    /lams_monitoring/web/WEB-INF/web.xml
    • -2
    • +3
    /lams_monitoring/web/branching/viewBranches.jsp
    • -3
    • +5
    /lams_monitoring/web/template/template.jsp
9:28 am

fmalikoff

Typo fixed in a comment

Options
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java
Monday 16 Jul 2007
4:35 pm

mseaton

custom Alert dialog

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
    • +307
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/AlertDialog.as
    • -27
    • +45
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/Dialog.as
    • -78
    • +58
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMessage.as
    • -14
    • +11
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFWindow.as
    • -2
    • +9
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/LFError.as
    • -0
    • +13
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as
    • -0
    • +2
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as
    • -11
    • +20
    /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceView.as
4:35 pm

mseaton

bin modifications

Options
    • -13
    • +0
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
    • -2
    • +4
    /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as
1:07 pm

dcarlier

Jira: LI-130. Fixed update-lams.sh such that JAVE_HOME is now taken from the JDK_DIR variable in lams.properties and does not need to be explicitly set prior to updating

Options
    • -69
    • +222
    /unix_installer/upgrader-package/update-lams.sh
12:46 pm

dcarlier

fixed install-lams.sh such that is now taken from the JDK_DIR variable in lams.properties and does not need to be explicitly set prior to installation

Options
    • -21
    • +40
    /unix_installer/installer-package/install-lams.sh