Fisheye on lams/lams_flash/src/common/flash

lams (MAIN): LDEV-2560: WorkspaceDialog

Ernie Ghiglione — Thu, 22 Mar 2012 05:33:11 +0100

Ernie Ghiglione committed MAIN:ernieg:20120322043311 on branch MAIN in lams

LDEV-2560: WorkspaceDialog

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as

(-1174, +1182)

| History

| Source

| Diff

lams (lams2_3_release): LDEV-2768: fixed encoding issue when creating new folders

Ernie Ghiglione — Thu, 05 Jan 2012 16:53:41 +0100

Ernie Ghiglione committed lams2_3_release:ernieg:20120105155341 on branch lams2_3_release in lams

LDEV-2768: fixed encoding issue when creating new folders

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as

(-1, +1)

| History

| Source

| Diff

lams (lams2_3_release): LDEV-2559: escaping the new name

Ernie Ghiglione — Fri, 23 Dec 2011 17:33:10 +0100

Ernie Ghiglione committed lams2_3_release:ernieg:20111223163310 on branch lams2_3_release in lams

LDEV-2559: escaping the new name

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as

(-1, +1)

| History

| Source

| Diff

lams (lams2_3_release): LDEV-2557: several typos and errors now corrected

Ernie Ghiglione — Fri, 23 Dec 2011 15:24:25 +0100

Ernie Ghiglione committed lams2_3_release:ernieg:20111223142425 on branch lams2_3_release in lams

LDEV-2557: several typos and errors now corrected

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as

(-1167, +1176)

| History

| Source

| Diff

lams (MAIN): LDEV-2557 Added author information for a Learning Design to Workspace dialog in Author.

mseaton — Thu, 29 Apr 2010 23:55:37 +0200

mseaton committed MAIN:mseaton:20100429215537 on branch MAIN in lams

LDEV-2557 Added author information for a Learning Design to Workspace dialog in Author.

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as

(-0, +7)

| History

| Source

| Diff

lams (MAIN): LDEV-2556 Setting theme style of ToolTip.

mseaton — Thu, 29 Apr 2010 04:24:23 +0200

mseaton committed MAIN:mseaton:20100429022423 on branch MAIN in lams

LDEV-2556 Setting theme style of ToolTip.

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/CanvasBranchView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Header.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Reference.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerIndexView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LearnerTabView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/MonitorGateView.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerActivity.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ToolTip.as	(-8, +41)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2507 Use common create date time str for room name (Learner and Monitor spawn IM window).

mseaton — Thu, 15 Apr 2010 16:14:43 +0200

mseaton committed MAIN:mseaton:20100415141443 on branch MAIN in lams

LDEV-2507 Use common create date time str for room name (Learner and Monitor spawn IM window).

· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/MonitorController.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/Sequence.as	(-1, +5)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2177 Fixed IE using cached version of workspace tree by making each request unique by appending the current time in...

dcarlier — Fri, 20 Mar 2009 04:12:57 +0100

dcarlier committed MAIN:dcarlier:20090320031257 on branch MAIN in lams

LDEV-2177 Fixed IE using cached version of workspace tree by making each request unique by appending the current time in milliseconds to the request that gets the folder's contents

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as	(-1, +3)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-1782 Complex boxes now closing properly on progress update

dcarlier — Fri, 13 Mar 2009 06:11:50 +0100

dcarlier committed MAIN:dcarlier:20090313051150 on branch MAIN in lams

LDEV-1782 Complex boxes now closing properly on progress update

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(-6, +12)	\| History	\| Source	\| Diff
· /lams_learning/web/lams_learner.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring_library.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-1841 Fixed haywire issue

dcarlier — Thu, 12 Mar 2009 07:14:35 +0100

dcarlier committed MAIN:dcarlier:20090312061435 on branch MAIN in lams

LDEV-1841 Fixed haywire issue

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/LearnerComplexActivity.as	(-3, +10)	\| History	\| Source	\| Diff
· /lams_learning/web/lams_learner.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring_library.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2153 Changed order of cancel, save buttons in workspace dialog, disabled save on click

dcarlier — Mon, 02 Mar 2009 07:18:36 +0100

dcarlier committed MAIN:dcarlier:20090302061836 on branch MAIN in lams

LDEV-2153 Changed order of cancel, save buttons in workspace dialog, disabled save on click

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/lams_authoring.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-8, +18)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2085 Added "Arrange Activities" feature in author to arrange connected activities neatly on the canvas. Tools->Arra...

dcarlier — Fri, 27 Feb 2009 06:00:43 +0100

dcarlier committed MAIN:dcarlier:20090227050043 on branch MAIN in lams

LDEV-2085 Added "Arrange Activities" feature in author to arrange connected activities neatly on the canvas. Tools->Arrange Activities

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(-0, +4)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as	(-0, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as	(-0, +3)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as	(-1, +39)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(-1, +57)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(-1, +10)	\| History	\| Source	\| Diff

lams (lams2_2): LDEV-2060 Preview button disabled until preview window loaded (with loading cursor icon while it loads)

dcarlier — Thu, 19 Feb 2009 00:46:46 +0100

dcarlier committed lams2_2:dcarlier:20090218234646 on branch lams2_2 in lams

LDEV-2060 Preview button disabled until preview window loaded (with loading cursor icon while it loads)

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as	(-0, +2)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tb/ToolbarController.as	(-0, +2)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjState.as	(-8, +8)	\| History	\| Source	\| Diff

lams (lams2_2): LDEV-2078 Merge for 2.2.1

mseaton — Tue, 17 Feb 2009 05:03:32 +0100

mseaton committed lams2_2:mseaton:20090217040332 on branch lams2_2 in lams

LDEV-2078 Merge for 2.2.1

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-3, +5)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-2, +3)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2078 Updated reserved characters, improved printed string in alert.

mseaton — Mon, 09 Feb 2009 08:58:22 +0100

mseaton committed MAIN:mseaton:20090209075822 on branch MAIN in lams

LDEV-2078 Updated reserved characters, improved printed string in alert.

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-3, +3)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-1, +1)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2120 Fixed export button not being enabled, added i18n for import from community button

dcarlier — Mon, 09 Feb 2009 06:08:32 +0100

dcarlier committed MAIN:dcarlier:20090209050832 on branch MAIN in lams

LDEV-2120 Fixed export button not being enabled, added i18n for import from community button

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ui/LFMenuBar.as	(-2, +2)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2117 Support activity container now set to read only in live edit if one of the child activities has been attempted...

dcarlier — Sat, 07 Feb 2009 10:25:03 +0100

dcarlier committed MAIN:dcarlier:20090207092503 on branch MAIN in lams

LDEV-2117 Support activity container now set to read only in live edit if one of the child activities has been attempted to prevent deletion of parent container after child has been attempted. Also fixed compile error involving ObjState class

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as	(-1, +1)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as	(-0, +11)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/ObjState.as	(-9, +9)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2117 Added flash support in author, learner and monitor for support activites.

dcarlier — Fri, 06 Feb 2009 05:21:12 +0100

dcarlier committed MAIN:dcarlier:20090206042112 on branch MAIN in lams

LDEV-2117 Added flash support in author, learner and monitor for support activites.

· /lams_central/web/lams_authoring.swf

(binary)

| History

| Source

| Diff

· /lams_central/web/lams_authoring_library.swf

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_authoring.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_learner.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_monitoring_v1.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as

(-3, +7)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as

(-4, +53)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as

(-1, +46)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/Canvas.as

(-7, +41)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasController.as

(-33, +100)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasHelper.as

(-1, +5)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasModel.as

(-2, +27)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasReferenceActivity.as

(-0, +346)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasSuperModel.as

(-3, +13)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasView.as

(-0, +5)

| History

| Source

| Diff

… 21 more files in changeset.

lams (MAIN): LDEV-2107 Added public folder to workspace to enable saving designs/files to a shared public folder resource (across the...

mseaton — Tue, 03 Feb 2009 06:47:41 +0100

mseaton committed MAIN:mseaton:20090203054741 on branch MAIN in lams

LDEV-2107 Added public folder to workspace to enable saving designs/files to a shared public folder resource (across the server).

· /lams_central/conf/language/lams/ApplicationResources.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/conf/language/lams/ApplicationResources_en_AU.properties	(-2, +2)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java	(-2, +12)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java	(-1, +28)	\| History	\| Source	\| Diff
· /lams_central/src/java/org/lamsfoundation/lams/workspace/web/WorkspaceAction.java	(-2, +6)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_lams_users.sql	(-4, +8)	\| History	\| Source	\| Diff
· /lams_common/db/sql/insert_types_data.sql	(-1, +2)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/WorkspaceFolder.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java	(-1, +9)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/Workspace.as	(-0, +4)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceController.as	(-3, +21)	\| History	\| Source	\| Diff

lams (lams2_2): LDEV-2097 LDEV-2078 Merge to 2.2.1 branch

mseaton — Mon, 02 Feb 2009 06:08:38 +0100

mseaton committed lams2_2:mseaton:20090202050838 on branch lams2_2 in lams

LDEV-2097 LDEV-2078 Merge to 2.2.1 branch

· /lams_flash/src/central/flash/lams_authoring.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as	(-2, +30)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-0, +8)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-10, +58)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2078 Restrict reserved characters (URI) in sequence title.

mseaton — Thu, 29 Jan 2009 06:04:42 +0100

mseaton committed MAIN:mseaton:20090129050442 on branch MAIN in lams

LDEV-2078 Restrict reserved characters (URI) in sequence title.

· /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-0, +8)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-0, +16)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2097 Added last modified date to workspace in author and sequence step in wizard.

mseaton — Thu, 29 Jan 2009 03:26:49 +0100

mseaton committed MAIN:mseaton:20090129022649 on branch MAIN in lams

LDEV-2097 Added last modified date to workspace in author and sequence step in wizard.

· /lams_central/conf/flashxml/lams/authoring/en_AU_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/flashxml/lams/authoring/en_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/flashxml/lams/wizard/en_AU_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/conf/flashxml/lams/wizard/en_dictionary.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/workspace/dto/FolderContentDTO.java	(-1, +21)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/lam_addseq_wiz.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/lams_authoring.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardSequenceView.as	(-2, +30)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/ws/WorkspaceDialog.as	(-10, +42)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_wizard.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_wizard_library.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2026 Proper solution for bad encoding integrated. The problem lay in the fact that strings were not urlEncoded when...

paulg — Thu, 27 Nov 2008 02:26:29 +0100

paulg committed MAIN:paulg:20081127012629 on branch MAIN in lams

LDEV-2026 Proper solution for bad encoding integrated. The problem lay in the fact that strings were not urlEncoded when passed from Flash to Javascript. Url encoding and decoding are now taken care of both in on the Flash-side and JS-side.

NOTE: When a Flash movie is being run in IE, urlEncoding seems to be automatic. Therefore, if Flash is being run in IE, no urlEncoding is done on the Flash-side. For all other browsers urlEncoding is done.

· /lams_flash/src/central/flash/lams_learner.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/main2.as	(-1, +13)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/preloader.fla	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as	(-5, +14)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-22, +22)	\| History	\| Source	\| Diff
· /lams_learning/web/controlFrame.jsp	(-5, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/lams_learner.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): Fixes Smack throwing exceptions...

paulg — Mon, 24 Nov 2008 23:20:28 +0100

paulg committed MAIN:paulg:20081124222028 on branch MAIN in lams

Fixes Smack throwing exceptions

The problem was being caused by the PresenceServlet calling Smack in order to create a new room which already existed.

Example: shaun has 5 lessons, each with their chatrooms which are named using the lessonId ie 1,2,3...

· /lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java	(-1, +12)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java	(-2, +9)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as	(-2, +4)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as	(-1, +30)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as	(-7, +3)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as	(-1, +22)	\| History	\| Source	\| Diff
· /lams_learning/web/lams_learner.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_wizard.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_wizard_library.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2036 Grouping now showing in viewMode (src typo)...

paulg — Mon, 24 Nov 2008 01:11:19 +0100

paulg committed MAIN:paulg:20081124001119 on branch MAIN in lams

LDEV-2036 Grouping now showing in viewMode (src typo)

LDEV-2026 Flashless presence showing all characters perfect (html), in Flash latin accents are removed to ensure that they display correctly (mx2004 issue?)

LDEV-2025 Flash presence now displaying OK in IE6

LDEV-2040 New checkboxes were not being skinned

· /lams_central/conf/flashxml/lams/defaultTheme.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/css/defaultHTML_learner.css

(-0, +6)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lam_addseq_wiz.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_learner.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_monitoring_v1.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Presence.as

(-3, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/tabviews/LessonTabView.as

(-13, +38)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as

(-18, +16)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardLessonDetailsView.as

(-0, +3)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/steps/WizardOrganisationView.as

(-0, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flex/BranchManager/.project

(-0, +5)

| History

| Source

| Diff

· /lams_flash/src/central/flex/BranchManager/src/BranchManager.mxml

(-4, +4)

| History

| Source

| Diff

· /lams_flash/src/central/flex/GroupManager/src/GroupManager.mxml

(-4, +4)

| History

| Source

| Diff

· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/StringUtils.as

(-0, +46)

| History

| Source

| Diff

· /lams_learning/web/lams_learner.swf

(binary)

| History

| Source

| Diff

… 15 more files in changeset.

lams (MAIN): LDEV-1260 Local live edit now added to wizard, added dbUpdate for this as well...

paulg — Thu, 13 Nov 2008 06:18:15 +0100

paulg committed MAIN:paulg:20081113051815 on branch MAIN in lams

LDEV-1260 Local live edit now added to wizard, added dbUpdate for this as well

LDEV-1968 Several instances of one same lesson can now be started from the wizard module

Presence is back up and working, JHB needed to be recompiled with jdk 1.5 instead of 1.6

· /lams_build/lib/jabber/JabberHTTPBind-1.1.1.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/flashxml/lams/defaultTheme.xml

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java

(-2, +5)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-3, +3)

| History

| Source

| Diff

· /lams_common/db/sql/create_lams_11_tables.sql

(-0, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch0013_updateFrom21.sql

(-0, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-10, +30)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java

(-1, +18)

| History

| Source

| Diff

· /lams_common/test/java/org/lamsfoundation/lams/lesson/LessonDataAccessTestCase.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/test/java/org/lamsfoundation/lams/lesson/service/TestLessonService.java

(-2, +2)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lam_addseq_wiz.fla

(binary)

| History

| Source

| Diff

… 23 more files in changeset.

lams (MAIN): LDEV-1949 Added support for condition (tool-output) based gates

dcarlier — Wed, 29 Oct 2008 05:11:52 +0100

dcarlier committed MAIN:dcarlier:20081029041152 on branch MAIN in lams

LDEV-1949 Added support for condition (tool-output) based gates

· /lams_central/web/lams_authoring.swf

(binary)

| History

| Source

| Diff

· /lams_central/web/lams_authoring_library.swf

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_authoring.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as

(-2, +8)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ActivityEntry.as

(-0, +55)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as

(-0, +2)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as

(-21, +8)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as

(-18, +52)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as

(-5, +14)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivityEntry.as

(-0, +48)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateConditionMatchingDialog.as

(-0, +284)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputBranchActivityEntry.as

(-6, +3)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputCondition.as

(-4, +19)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolOutputGateActivityEntry.as

(-0, +85)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/br/BranchMappingDialog.as

(-1, +1)

| History

| Source

| Diff

… 7 more files in changeset.

lams (MAIN): LDEV-1948 Added View competence mappings to context menu, and fixed it so that it only appears in author/monitor when a ...

dcarlier — Mon, 27 Oct 2008 07:04:22 +0100

dcarlier committed MAIN:dcarlier:20081027060422 on branch MAIN in lams

LDEV-1948 Added View competence mappings to context menu, and fixed it so that it only appears in author/monitor when a tool activity is selected

· /lams_central/web/lams_authoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_central/web/lams_authoring_library.swf	(binary)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as	(-4, +11)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/PropertyInspectorControls.as	(-3, +10)	\| History	\| Source	\| Diff
· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/Monitor.as	(-3, +8)	\| History	\| Source	\| Diff
· /lams_flash/src/common/flash/org/lamsfoundation/lams/common/util/CustomContextMenu.as	(-9, +25)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring.swf	(binary)	\| History	\| Source	\| Diff
· /lams_monitoring/web/lams_monitoring_library.swf	(binary)	\| History	\| Source	\| Diff

lams (MAIN): Changed all .as files from binary to ascii in order to use diff tool correctly in Eclipse

paulg — Tue, 21 Oct 2008 05:08:58 +0200

paulg committed MAIN:paulg:20081021030858 on branch MAIN in lams

Changed all .as files from binary to ascii in order to use diff tool correctly in Eclipse

· /lams_flash/src/central/flash/LoadQue.as

(-238, +238)

| History

| Source

| Diff

· /lams_flash/src/central/flash/main.as

(-104, +104)

| History

| Source

| Diff

· /lams_flash/src/central/flash/main2.as

(-98, +98)

| History

| Source

| Diff

· /lams_flash/src/central/flash/main_addseq.as

(-57, +57)

| History

| Source

| Diff

· /lams_flash/src/central/flash/main_monitoring.as

(-65, +65)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Activity.as

(-802, +802)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Application.as

(-804, +804)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Branch.as

(-105, +105)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchActivityEntry.as

(-0, +0)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/BranchingActivity.as

(-174, +174)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ComplexActivity.as

(-184, +184)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as

(-1662, +1662)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GateActivity.as

(-220, +220)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/Group.as

(-31, +31)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/GroupBranchActivityEntry.as

(-18, +18)

| History

| Source

| Diff

… 185 more files in changeset.

lams (MAIN): LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners...

paulg — Thu, 16 Oct 2008 08:23:15 +0200

paulg committed MAIN:paulg:20081016062315 on branch MAIN in lams

LDEV-1907 Show a plus sign "+" in the activity if it contains more than 10 learners

LDEV-1469 Progress Bar - rotate green triangles

LDEV-1929 Implement presence in learner (Flash and non-flash)

= TODO:

+ must refactor to use xmpp service to create users with admin account

+ fix IE to catch flashvars sent from javascript

+ find workaround to not commenting out sasl in jsjac lib

LDEV-1783 Improve the error message when a user tries to select an activity inside an optional activity/sequence via the progress bar

· /lams_flash/src/central/flash/lam_addseq_wiz.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_learner.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/lams_monitoring_v1.fla

(binary)

| History

| Source

| Diff

· /lams_flash/src/central/flash/main2.as

(-7, +34)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasActivity.as

(-2, +6)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasOptionalActivity.as

(-3, +7)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/cv/CanvasParallelActivity.as

(-1, +5)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Application.as

(-27, +63)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/PresenceXIFF.as

(-0, +710)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/Scratchpad.as

(-6, +6)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/Lesson.as

(-8, +16)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonModel.as

(-13, +139)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/learner/ls/LessonView.as

(-0, +8)

| History

| Source

| Diff

· /lams_flash/src/central/flash/org/lamsfoundation/lams/monitoring/mv/PlusIcon.as

(-0, +79)

| History

| Source

· /lams_flash/src/central/flash/org/lamsfoundation/lams/wizard/Wizard.as

(-1, +6)

| History

| Source

| Diff

… 8 more files in changeset.