Activity lams/

10:30 am

Andrey Balan

More
MAIN:andreyb:20080626023017
changed 16 files
MAIN

LDEV-1662 Summary page: should display a summary of the Advanced features entered in Author

(Task List Tool)

- -1
- +7
/lams_tool_task/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_task/.../ApplicationResources.properties
- -1
- +7
/lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_task/.../ApplicationResources_en_AU.properties
- -1
- +7
/lams_tool_task/conf/language/rams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_task/.../ApplicationResources.properties
- -1
- +7
/lams_tool_task/conf/language/rams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_tool_task/.../ApplicationResources_en_AU.properties
- binary
/lams_tool_task/db/model/taskList.clay
- History
- Source
- Diff
/lams_tool_task/db/model/taskList.clay
- -2
- +2
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/TaskListConstants.java
- History
- Source
- Diff
/lams_tool_task/.../TaskListConstants.java
- -18
- +8
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/GroupSummary.java
- History
- Source
- Diff
/lams_tool_task/src/.../dto/GroupSummary.java
- -121
- +17
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/ItemSummary.java
- History
- Source
- Diff
/lams_tool_task/src/.../dto/ItemSummary.java
- -0
- +165
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dto/TaskListItemVisitLogSummary.java
- History
- Source
/lams_tool_task/.../TaskListItemVisitLogSummary.java
- -5
- +6
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/ITaskListService.java
- History
- Source
- Diff
/lams_tool_task/src/.../ITaskListService.java
- -31
- +32
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java
- History
- Source
- Diff
/lams_tool_task/.../TaskListServiceImpl.java
- -6
- +5
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_task/src/.../MonitoringAction.java
- -9
- +10
/lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/servlet/ExportServlet.java
- History
- Source
- Diff
/lams_tool_task/src/.../ExportServlet.java
- -10
- +10
/lams_tool_task/web/pages/export/itemsummary.jsp
- History
- Source
- Diff
/lams_tool_task/web/.../itemsummary.jsp
- -8
- +8
/lams_tool_task/web/pages/monitoring/itemsummary.jsp
- History
- Source
- Diff
/lams_tool_task/web/.../itemsummary.jsp
- -6
- +74
/lams_tool_task/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_task/web/.../summary.jsp

10:20 am

mseaton

More
MAIN:mseaton:20080626022059
changed 6 files
MAIN

LDEV-1814 Fixed start branching hub (entry door) positioning - was being set to default values and not saved start X,Y coords for the Branching Activity.

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -5
- +12
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as
- -3
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasActivity.as
- -4
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasController.as
- -48
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasModel.as

8:21 am

lfoxton

More
MAIN:lfoxton:20080626002106
changed 16 files
MAIN

learner and monitor draft versions are done

- -2
- +2
/lams_tool_gmap/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_gmap/.../ApplicationResources.properties
- -8
- +5
/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_gmap/src/.../MonitoringAction.java
- -0
- +0
/lams_tool_gmap/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_tool_gmap/web/WEB-INF/web.xml
- -15
- +13
/lams_tool_gmap/web/common/learnerheader.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../learnerheader.jsp
- binary
/lams_tool_gmap/web/images/collapse.gif
- History
- Source
/lams_tool_gmap/web/images/collapse.gif
- binary
/lams_tool_gmap/web/images/expand.gif
- History
- Source
/lams_tool_gmap/web/images/expand.gif
- -1
- +2
/lams_tool_gmap/web/includes/javascript/mapFunctions.js
- History
- Source
- Diff
/lams_tool_gmap/web/.../mapFunctions.js
- -1
- +1
/lams_tool_gmap/web/includes/javascript/mapFunctionsAuthoring.js
- History
- Source
- Diff
/lams_tool_gmap/.../mapFunctionsAuthoring.js
- -1
- +1
/lams_tool_gmap/web/includes/javascript/mapFunctionsLearning.js
- History
- Source
- Diff
/lams_tool_gmap/.../mapFunctionsLearning.js
- -0
- +0
/lams_tool_gmap/web/includes/javascript/mapFunctionsMonitoring.js
- History
- Source
/lams_tool_gmap/web/.../mapFunctionsMonitoring.js
- -3
- +17
/lams_tool_gmap/web/includes/jsp/mapFunctions.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../jsp/mapFunctions.jsp
- -2
- +6
/lams_tool_gmap/web/pages/authoring/basic.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../authoring/basic.jsp
- -0
- +1
/lams_tool_gmap/web/pages/authoring/headItems.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../headItems.jsp
- -10
- +17
/lams_tool_gmap/web/pages/learning/gmap.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../learning/gmap.jsp
- -2
- +157
/lams_tool_gmap/web/pages/monitoring/headItems.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../headItems.jsp
- -1
- +46
/lams_tool_gmap/web/pages/monitoring/summary.jsp
- History
- Source
- Diff
/lams_tool_gmap/web/.../summary.jsp

8:18 am

lfoxton

More
MAIN:lfoxton:20080626001836
changed 1 file
MAIN

Fixed a problem with removing markers, that was causing the rest of the markers to not be updated after the first was removed

Also, fixed a problem that was creating a new gmapUser each time the sequence was saved and not using the existing one

- -13
- +23
/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_gmap/src/.../AuthoringAction.java

8:17 am

lfoxton

More
MAIN:lfoxton:20080626001738
changed 1 file
MAIN

Fixed a problem with removing markers, that was causing the rest of the markers to not be updated after the first was removed

- -2
- +2
/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_gmap/src/.../LearningAction.java

2:40 pm

fmalikoff

More
MAIN:fmalikoff:20080625064023
changed 2 files
MAIN

LDEV-1208: Preview's special define later screen to update the Flash progress bar.

- -3
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
- History
- Source
- Diff
/lams_learning/.../LoadToolActivityAction.java
- -0
- +6
/lams_learning/web/previewDefineLater.jsp
- History
- Source
- Diff
/lams_learning/web/previewDefineLater.jsp

12:33 pm

fmalikoff

More
MAIN:fmalikoff:20080625043342
changed 3 files
MAIN

LDEV-1217: Check the length of the description so that it doesn't trigger a database error.

- -1
- +2
/lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_sbmt/.../ApplicationResources.properties
- -0
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../form/LearnerForm.java
- -1
- +3
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../LearnerAction.java

8:49 am

dcarlier

More
MAIN:dcarlier:20080625004948
changed 4 files
MAIN

Fixed lost tooltips in learner progress bar (happened sometime after 2.1rc)

- -4
- +12
/lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as
- History
- Source
- Diff
/lams_flash/src/.../common/LearnerActivity.as
- binary
/lams_learning/web/lams_learner.swf
- History
- Source
- Diff
/lams_learning/web/lams_learner.swf
- binary
/lams_monitoring/web/lams_monitoring.swf
- History
- Source
- Diff
/lams_monitoring/web/lams_monitoring.swf
- binary
/lams_monitoring/web/lams_monitoring_library.swf
- History
- Source
- Diff
/lams_monitoring/.../lams_monitoring_library.swf

12:12 pm

fmalikoff

More
MAIN:fmalikoff:20080624041222
changed 1 file
MAIN

Updating project property for the correct version

- -1
- +1
/lams_build/common.properties
- History
- Source
- Diff
/lams_build/common.properties

9:23 am

mseaton

More
MAIN:mseaton:20080624012324
changed 3 files
MAIN

LDEV-1781 Update max no value when min no is incremented (if min is larger than max) value.

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -0
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspector.as
- History
- Source
- Diff
/lams_flash/src/.../cv/PropertyInspector.as

2:11 pm

mseaton

More
MAIN:mseaton:20080623061159
changed 3 files
MAIN

LDEV-1789 Fixed clearing grouping reference from grouped children within optional activity/sequence(s).

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -3
- +42
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasSuperModel.as

7:32 am

dcarlier

More
MAIN:dcarlier:20080622233223
changed 3 files
MAIN

LDEV-1769 Branching activity no longer highlighted after close

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -1
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as
- History
- Source
- Diff
/lams_flash/src/.../br/CanvasBranchView.as

2:17 pm

mseaton

More
MAIN:mseaton:20080620061733
changed 4 files
MAIN

LDEV-1835 LDEV-1831 LDEV-1834 Fixed 2.1.1 tasks, I18N labels to be added for label in input tool drop-down (Property Inspector) and Branching/Transition error messages. Fixed validation of multiple branches to/from activity.

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -36
- +31
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/CanvasModel.as
- -1
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasSuperModel.as

2:15 pm

mseaton

More
MAIN:mseaton:20080620061503
changed 112 files
MAIN

cleaned up AS codebase - removing unrequired comments or code

- -27
- +30
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Activity.as
- -30
- +24
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Application.as
- -1
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as
- History
- Source
- Diff
/lams_flash/src/.../ComplexActivity.as
- -41
- +11
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_flash/src/.../DesignDataModel.as
- -0
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Grouping.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/Grouping.as
- -10
- +3
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupingActivity.as
- History
- Source
- Diff
/lams_flash/src/.../GroupingActivity.as
- -36
- +4
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/ToolActivity.as
- -2
- +2
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchConnector.as
- History
- Source
- Diff
/lams_flash/src/.../br/BranchConnector.as
- -7
- +7
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as
- History
- Source
- Diff
/lams_flash/src/.../br/BranchMappingDialog.as
- -30
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchingDiagram.as
- History
- Source
- Diff
/lams_flash/src/.../CanvasBranchingDiagram.as
- -2
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ConditionMatchingDialog.as
- History
- Source
- Diff
/lams_flash/.../ConditionMatchingDialog.as
- -9
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/ToolOutputConditionsDialog.as
- History
- Source
- Diff
/lams_flash/.../ToolOutputConditionsDialog.as
- -1
- +0
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Bin.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/Bin.as
- -7
- +6
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as
- History
- Source
- Diff
/lams_flash/src/central/.../cv/Canvas.as
- -12
- +1
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as
- History
- Source
- Diff
/lams_flash/src/.../cv/CanvasActivity.as
… 97 more files in changeset.

11:16 am

lfoxton

More
MAIN:lfoxton:20080620031645
changed 2 files
MAIN

Fixing up the name of this file

- binary
/unix_installer/installer-package/repository/repository_sample_21.tar.gz
- History
- Source
/unix_installer/.../repository_sample_21.tar.gz
- binary
/unix_installer/installer-package/repository/repository_sample_21.zip.tar.gz
- History
- Source
- Diff
/unix_installer/.../repository_sample_21.zip.tar.gz

10:59 am

lfoxton

More
MAIN:lfoxton:20080620025910
changed 2 files
MAIN

Final commit for updater package for 2.1, making the copy-tools target in the project's build.xml also copy the deploy-tool lib form lams_build instead of using the old one

- -1
- +12
/unix_installer/upgrader-package/build.xml
- History
- Source
- Diff
/unix_installer/.../build.xml
- binary
/unix_installer/upgrader-package/bin/backup.class
- History
- Source
- Diff
/unix_installer/.../backup.class

10:56 am

lfoxton

More
MAIN:lfoxton:20080620025653
added 2 files
MAIN

Committing sample sequences and scure directory with the installer so they can be retireved later if required. (2.1)

- binary
/unix_installer/installer-package/sample-sequences/sample-sequence-21/sample-sequences-21.tar.gz
- History
- Source
/unix_installer/.../sample-sequences-21.tar.gz
- binary
/unix_installer/installer-package/secure/secure-21/secure21.tar.gz
- History
- Source
/unix_installer/.../secure21.tar.gz

10:42 am

lfoxton

More
MAIN:lfoxton:20080620024208
changed 1 file
MAIN

Final change for database for 2.1 unix installer, removing the lamssupportemail

- -1
- +1
/unix_installer/installer-package/database/dump.sql
- History
- Source
- Diff
/unix_installer/.../dump.sql

9:26 am

lfoxton

More
MAIN:lfoxton:20080620012617
changed 2 files
MAIN

Fixed up backup to make sure it includes the repository and /etc/lams directories

- binary
/unix_installer/upgrader-package/update-lams.sh
- History
- Source
- Diff
/unix_installer/.../update-lams.sh
- -18
- +21
/unix_installer/upgrader-package/java/backup.java
- History
- Source
- Diff
/unix_installer/.../backup.java

7:39 am

lfoxton

More
MAIN:lfoxton:20080619233907
updated 1 file
MAIN

FINAL FIX for 2.1 windows installer updater!

The required filed Alter21Integration.java (Alter21Integration$OrgDTO.class) was not included so that script was failing on inception, this has been fixed.

Ready for final 2.1 tag.