Fisheye on lams-github/

lams-github (v4.7): LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

fmalikoff — Wed, 24 Nov 2010 15:11:01 +0100

fmalikoff committed 1fe9e94 on branch v4.7, v4.8 in lams-github

LDEV-2611 Added import filter to remove the old isOptional field and correctly add the required field.

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaImportContentVersionFilter.java

(-0, +6)

| History

| Source

| Diff

lams-github (v4.7): Merging changes from 2.3 release branch for LDEV-2524.

fmalikoff — Mon, 01 Nov 2010 13:27:45 +0100

fmalikoff committed 4c93651 on branch v4.7, v4.8 in lams-github

Merging changes from 2.3 release branch for LDEV-2524.

· /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaContent.hbm.xml

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/conf/hibernate/mappings/org/lamsfoundation/lams/tool/qa/QaQueContent.hbm.xml

(-0, +10)

| History

| Source

| Diff

· /lams_tool_laqa/db/sql/create_lams_tool_qa.sql

(-0, +1)

| History

| Source

| Diff

· /lams_tool_laqa/db/sql/updatescripts/updateTo20101022.sql

(-0, +9)

| History

| Source

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java

(-21, +4)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralMonitoringDTO.java

(-15, +0)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaAppConstants.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaCondition.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaConditionDTO.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaGeneralAuthoringDTO.java

(-17, +1)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQueContent.java

(-26, +22)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaQuestionContentDTO.java

(-1, +32)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java

(-11, +0)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/AuthoringUtil.java

(-102, +43)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java

(-11, +6)

| History

| Source

| Diff

… 15 more files in changeset.

lams-github (v4.7): Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

fmalikoff — Mon, 01 Nov 2010 13:19:23 +0100

fmalikoff committed 2ef36cb on branch v4.7, v4.8 in lams-github

Merging changes from 2.3 release branch. Working on bugs LDEV-2524, LDEV-2578, LDEV-2581

· /lams_tool_laqa/build.properties	(-1, +1)	\| History	\| Source	\| Diff
· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningAction.java	(-32, +96)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1662: Fixing up the advanced options in monitoring so that they look correct in RTL locales.

fmalikoff — Mon, 14 Jul 2008 05:58:47 +0200

fmalikoff committed 069403f on branch v4.7, v4.8 in lams-github

LDEV-1662: Fixing up the advanced options in monitoring so that they look correct in RTL locales.

· /lams_tool_task/conf/language/lams/ApplicationResources.properties	(-6, +6)	\| History	\| Source	\| Diff
· /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(-6, +6)	\| History	\| Source	\| Diff
· /lams_tool_task/web/pages/monitoring/summary.jsp	(-8, +14)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1662: Adding new style to support the advanced options

fmalikoff — Mon, 14 Jul 2008 05:33:40 +0200

fmalikoff committed 09d7d04 on branch v4.7, v4.8 in lams-github

LDEV-1662: Adding new style to support the advanced options

· /lams_tool_task/web/pages/monitoring/summary.jsp

(-12, +14)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1662: Entries for On and Off were not internationalised.

fmalikoff — Mon, 14 Jul 2008 05:32:06 +0200

fmalikoff committed 756d208 on branch v4.7, v4.8 in lams-github

LDEV-1662: Entries for On and Off were not internationalised.

· /lams_tool_task/conf/language/lams/ApplicationResources.properties	(-1, +2)	\| History	\| Source	\| Diff
· /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1662: Adding a new section to each monitoring summary screen, to show the advanced options.

fmalikoff — Mon, 14 Jul 2008 05:30:39 +0200

fmalikoff committed 5e08bb6 on branch v4.7, v4.8 in lams-github

LDEV-1662: Adding a new section to each monitoring summary screen, to show the advanced options.

· /lams_central/web/css/defaultHTML.css

(-0, +12)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1208: Preview's special define later screen to update the Flash progress bar.

fmalikoff — Wed, 25 Jun 2008 08:40:33 +0200

fmalikoff committed b2616ff on branch v4.7, v4.8 in lams-github

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

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/previewDefineLater.jsp	(-0, +6)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1217: Check the length of the description so that it doesn't trigger a database error.

fmalikoff — Wed, 25 Jun 2008 06:33:50 +0200

fmalikoff committed c42af5a on branch v4.7, v4.8 in lams-github

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

· /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/form/LearnerForm.java	(-0, +2)	\| History	\| Source	\| Diff
· /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): Updating project property for the correct version

fmalikoff — Tue, 24 Jun 2008 06:12:22 +0200

fmalikoff committed bdb5e92 on branch v4.7, v4.8 in lams-github

Updating project property for the correct version

· /lams_build/common.properties

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1833: Was throwing exception if asked for the tool output for a user that has not answered the questions. Now retur...

fmalikoff — Wed, 18 Jun 2008 04:01:42 +0200

fmalikoff committed 94fbfe9 on branch v4.7, v4.8 in lams-github

LDEV-1833: Was throwing exception if asked for the tool output for a user that has not answered the questions. Now returns null.

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/MCOutputFactory.java

(-13, +24)

| History

| Source

| Diff

lams-github (v4.7): Updating scripts to call deploy.xml, rather than deploy.properties

fmalikoff — Tue, 17 Jun 2008 12:59:40 +0200

fmalikoff committed cb5bbc4 on branch v4.7, v4.8 in lams-github

Updating scripts to call deploy.xml, rather than deploy.properties

· /lams_build/deploy-tool/deploy.bat	(-1, +2)	\| History	\| Source	\| Diff
· /lams_build/deploy-tool/deploy.sh	(-3, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): Version updated for 2.1 release

fmalikoff — Tue, 17 Jun 2008 09:52:58 +0200

fmalikoff committed caf2762 on branch v4.7, v4.8 in lams-github

Version updated for 2.1 release

· /lams_tool_nb/build.properties

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher ...

fmalikoff — Mon, 16 Jun 2008 04:54:27 +0200

fmalikoff committed 21c2c54 on branch v4.7, v4.8 in lams-github

LDEV-1825: When we copy a learning design, make sure any grouping details and associated mappings attached to a teacher chosen branching or a define later grouped branching are not copied. If we don't do this, we encounter problems when run a design that has been attached to a lesson. Otherwise we either throw an exception (as the grouping doesn't exist) or we use the groupings that were used in the previous lesson and they may not be wanted.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-13, +27)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java	(-0, +8)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java	(-1, +10)	\| History	\| Source	\| Diff

lams-github (v4.7): LI-161: Correcting constructors

fmalikoff — Tue, 10 Jun 2008 10:30:56 +0200

fmalikoff committed 1b1bf93 on branch v4.7, v4.8 in lams-github

LI-161: Correcting constructors

· /lams_tool_deploy/test/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfigTest.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_deploy/test/java/org/.../tool/deploy/libraryActivity/DeployLibraryConfigTest.java	(-2, +2)	\| History	\| Source	\| Diff
· /lams_tool_deploy/test/java/org/.../tool/deploy/libraryActivity/LibraryDBDeployTaskTest.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LI-161: Replacing / in windows paths to \ to make all the paths consistent.

fmalikoff — Tue, 10 Jun 2008 09:48:46 +0200

fmalikoff committed 849a1b6 on branch v4.7, v4.8 in lams-github

LI-161: Replacing / in windows paths to \ to make all the paths consistent.

· /lams_build/deploy-tool/lib/lams-tool-deploy.jar	(binary)	\| History	\| Source	\| Diff
· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java	(-0, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): LI-161: Added a new build task deploy-tools-for-upgrader that only run the tool deploy part, and not the combined activi...

fmalikoff — Tue, 10 Jun 2008 09:01:38 +0200

fmalikoff committed 9c94f78 on branch v4.7, v4.8 in lams-github

LI-161: Added a new build task deploy-tools-for-upgrader that only run the tool deploy part, and not the combined activities.

· /lams_build/build.xml

(-0, +4)

| History

| Source

| Diff

lams-github (v4.7): LI-161: Generate special version of deploy.xml for tools that has a generic parameter in the place of the drive paths. T...

fmalikoff — Tue, 10 Jun 2008 08:48:52 +0200

fmalikoff committed b053f71 on branch v4.7, v4.8 in lams-github

LI-161: Generate special version of deploy.xml for tools that has a generic parameter in the place of the drive paths. This is turned on in common.properties (generate for installer) in lams_build. Only use this option if you are writing an installer/updater.

· /lams_build/deploy-tool/lib/lams-tool-deploy.jar	(binary)	\| History	\| Source	\| Diff
· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/libraryActivity/DeployLibrary.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LI-161: Generate special version of deploy.xml for tools that has a generic parameter in the place of the drive paths. T...

fmalikoff — Tue, 10 Jun 2008 08:16:51 +0200

fmalikoff committed 9d57b27 on branch v4.7, v4.8 in lams-github

· /lams_build/build.xml

(-0, +12)

| History

| Source

| Diff

· /lams_build/common.properties

(-0, +3)

| History

| Source

| Diff

· /lams_build/deploy-tool/lib/lams-tool-deploy.jar

(binary)

| History

| Source

| Diff

· /lams_tool_chat/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/CreateToolPackageTask.java

(-1, +4)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/Deploy.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployConfig.java

(-1, +24)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/lams/tool/deploy/DeployToolConfig.java

(-9, +52)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/.../tool/deploy/libraryActivity/CreateLibraryPackageTask.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_deploy/src/java/org/lamsfoundation/.../tool/deploy/libraryActivity/DeployLibraryConfig.java

(-4, +11)

| History

| Source

| Diff

· /lams_tool_forum/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_lamc/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_laqa/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/build.xml

(-0, +1)

| History

| Source

| Diff

· /lams_tool_nb/build.xml

(-0, +1)

| History

| Source

| Diff

… 7 more files in changeset.

lams-github (v4.7): LDEV-1819: Initialise branching activities properly after a live edit

fmalikoff — Tue, 10 Jun 2008 03:24:02 +0200

fmalikoff committed 57589d9 on branch v4.7, v4.8 in lams-github

LDEV-1819: Initialise branching activities properly after a live edit

· /lams_build/lib/lams/lams-monitoring.jar	(binary)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-4, +5)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java	(-0, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java	(-25, +37)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1818: Adding validation to check that a tool based branch always has at least one condition

fmalikoff — Sun, 08 Jun 2008 07:20:22 +0200

fmalikoff committed dff974e on branch v4.7, v4.8 in lams-github

LDEV-1818: Adding validation to check that a tool based branch always has at least one condition

· /lams_common/conf/language/lams/ApplicationResources.properties	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolBranchingActivity.java	(-1, +13)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

fmalikoff — Sun, 08 Jun 2008 07:16:44 +0200

fmalikoff committed 79277b0 on branch v4.7, v4.8 in lams-github

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

· /lams_learning/web/previewDefineLater.jsp

(-0, +10)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1820: Less than wasn't working as the BranchCondition was expecting start value to be 0, and it was null. Now accep...

fmalikoff — Fri, 06 Jun 2008 08:17:17 +0200

fmalikoff committed 09c0d59 on branch v4.7, v4.8 in lams-github

LDEV-1820: Less than wasn't working as the BranchCondition was expecting start value to be 0, and it was null. Now accepts null.

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchCondition.java

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

fmalikoff — Fri, 06 Jun 2008 05:40:22 +0200

fmalikoff committed abda8c9 on branch v4.7, v4.8 in lams-github

LDEV-1817: Fixing up message on preview define later screen to be appropriate for branching.

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties	(-0, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping a...

fmalikoff — Fri, 06 Jun 2008 05:31:51 +0200

fmalikoff committed 8bc8d17 on branch v4.7, v4.8 in lams-github

LDEV-1817: Define later branching was breaking Preview. Now the preview hack allows it to be used with Random Grouping and this required regetting the grouping at one point to avoid a CGLIB class cast exception (hack on hack). Bleah.

The chosen grouping now works as I clear the number of groups before creating a group (and then allocating to a branch), otherwise I could run into the max number of branches test. Another hack.

· /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java	(-5, +3)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-7, +26)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	(-0, +2)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1804: Tool urls on the Optional Activity page were missing the tool part - all there was was the lams part.

fmalikoff — Wed, 04 Jun 2008 06:29:46 +0200

fmalikoff committed f4e88d0 on branch v4.7, v4.8 in lams-github

LDEV-1804: Tool urls on the Optional Activity page were missing the tool part - all there was was the lams part.

· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

(-2, +7)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1753: Ajax based selection screens in monitoring were not indicating to the user if any exceptions thrown on the se...

fmalikoff — Tue, 03 Jun 2008 04:36:03 +0200

fmalikoff committed 5822fa3 on branch v4.7, v4.8 in lams-github

LDEV-1753: Ajax based selection screens in monitoring were not indicating to the user if any exceptions thrown on the server. Added some javascript to check if the return value from the server was the general struts error message. If it is, it extracts the message and displays that in an alert box.

· /lams_central/web/error.jsp	(-0, +2)	\| History	\| Source	\| Diff
· /lams_central/web/includes/javascript/error.js	(-0, +18)	\| History	\| Source
· /lams_monitoring/web/branching/chosenSelection.jsp	(-0, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/branching/groupedSelection.jsp	(-1, +8)	\| History	\| Source	\| Diff
· /lams_monitoring/web/grouping/chosenGrouping.jsp	(-1, +10)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-1763: Hiding the "Branching" and "Branch Blah" levels when the learner is in a branch.

fmalikoff — Tue, 03 Jun 2008 02:42:14 +0200

fmalikoff committed bd895f7 on branch v4.7, v4.8 in lams-github

LDEV-1763: Hiding the "Branching" and "Branch Blah" levels when the learner is in a branch.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java

(-7, +23)

| History

| Source

| Diff

lams-github (v4.7): LDEV-1786: On very rare occasions, we've had Hibernate try to save the branching entries before saving the branching act...

fmalikoff — Mon, 02 Jun 2008 08:25:55 +0200

fmalikoff committed 6f8b165 on branch v4.7, v4.8 in lams-github

LDEV-1786: On very rare occasions, we've had Hibernate try to save the branching entries before saving the branching activity which throws an exception as the branch_activity_id is null. So force any branching activities to save first.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

(-0, +9)

| History

| Source

| Diff

lams-github (v4.7): Tweaking some wording

fmalikoff — Fri, 30 May 2008 09:53:17 +0200

fmalikoff committed fc143da on branch v4.7, v4.8 in lams-github

Tweaking some wording

· /lams_tool_task/conf/language/lams/ApplicationResources.properties	(-6, +8)	\| History	\| Source	\| Diff
· /lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties	(-6, +6)	\| History	\| Source	\| Diff