Fisheye on lams/lams_central/web/author2.jsp https://code.lamsfoundation.org/fisheye/changelog/lams/lams_central/web/author2.jsp Recent activity in "lams" under directory /lams_central/web/author2.jsp lams (MAIN): LDEV-3115: Alter Export menu and the way sequences and images are downloaded.... Mon, 02 Jun 2014 09:27:16 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140602072716 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140602072716 Marcin Cieslak committed MAIN:marcin:20140602072716 on branch MAIN in lams LDEV-3115: Alter Export menu and the way sequences and images are downloaded.

Refactorisation, major changes to code structure.

Added comments.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-2, +26) | History | Source | Diff
· /lams_central/web/author2.jsp (-741, +0) | History | Source | Diff
· /lams_central/web/authoring/authoring.jsp (-0, +761) | History | Source
· /lams_central/web/authoring/svgGenerator.jsp (-0, +64) | History | Source
· /lams_central/web/css/authoring.css (-1, +26) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-749, +826) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-206, +242) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-1703, +2089) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-286, +321) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-693, +428) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-1426, +1480) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Externalise labels from Javascript to JSP file (preparation for externalising to .properties file). Tue, 27 May 2014 13:54:41 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140527115441 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140527115441 Marcin Cieslak committed MAIN:marcin:20140527115441 on branch MAIN in lams LDEV-3115: Externalise labels from Javascript to JSP file (preparation for externalising to .properties file).

· /lams_central/web/author2.jsp (-0, +108) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-13, +12) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-1, +1) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-26, +27) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-1, +1) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-20, +18) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-73, +80) | History | Source | Diff
]]> lams (MAIN): LDEV-2701: Add gate description. Mon, 26 May 2014 12:11:53 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140526101153 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140526101153 Marcin Cieslak committed MAIN:marcin:20140526101153 on branch MAIN in lams LDEV-2701: Add gate description.

· /lams_central/web/author2.jsp (-0, +8) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-1, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-3, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-1, +5) | History | Source | Diff
· /lams_learning/web/gate/conditionGateContent.jsp (-1, +4) | History | Source | Diff
· /lams_learning/web/gate/permissionGateContent.jsp (-1, +5) | History | Source | Diff
· /lams_learning/web/gate/scheduleGateContent.jsp (-0, +3) | History | Source | Diff
· /lams_learning/web/gate/synchGateContent.jsp (-0, +3) | History | Source | Diff
· /lams_monitoring/web/gate/gateInfo.jsp (-1, +2) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Support for tool output based branching and gates. Mon, 26 May 2014 11:13:51 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140526091351 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140526091351 Marcin Cieslak committed MAIN:marcin:20140526091351 on branch MAIN in lams LDEV-3115: Support for tool output based branching and gates.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-2, +2) | History | Source | Diff
· /lams_central/web/author2.jsp (-4, +30) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-4, +24) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-11, +70) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-93, +309) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Partial support for tool output based branching. Tue, 20 May 2014 11:40:46 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140520094046 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140520094046 Marcin Cieslak committed MAIN:marcin:20140520094046 on branch MAIN in lams LDEV-3115: Partial support for tool output based branching.

· /lams_build/lib/lams/lams-central.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-9, +9) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-6, +3) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (-6, +5) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-7, +28) | History | Source | Diff
· /lams_central/web/author2.jsp (-18, +57) | History | Source | Diff
· /lams_central/web/css/authoring.css (-7, +51) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-36, +49) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-22, +65) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-96, +617) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add exporting as SVG image. Mon, 12 May 2014 14:11:26 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140512121126 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140512121126 Marcin Cieslak committed MAIN:marcin:20140512121126 on branch MAIN in lams LDEV-3115: Add exporting as SVG image.

· /lams_central/web/author2.jsp (-2, +9) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +9) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-44, +131) | History | Source | Diff
· /lams_central/web/includes/javascript/canvg/canvg.js (-0, +6) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add exporting as PNG image. Thu, 08 May 2014 14:07:26 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140508120726 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140508120726 Marcin Cieslak committed MAIN:marcin:20140508120726 on branch MAIN in lams LDEV-3115: Add exporting as PNG image.

· /lams_central/web/author2.jsp (-0, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-1, +14) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-0, +61) | History | Source | Diff
· /lams_central/web/includes/javascript/canvg/StackBlur.js (-0, +611) | History | Source
· /lams_central/web/includes/javascript/canvg/canvg.js (-0, +2841) | History | Source
· /lams_central/web/includes/javascript/canvg/rgbcolor.js (-0, +288) | History | Source
]]> lams (MAIN): LDEV-3115: Allow unifinished branches.... Thu, 24 Apr 2014 12:34:47 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140424103447 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140424103447 Marcin Cieslak committed MAIN:marcin:20140424103447 on branch MAIN in lams LDEV-3115: Allow unifinished branches.

Validation of groupings not being used in a sequence.

Remove grouping references when transition is removed.

Recently Used Sequences (LD access) full functionality.

Detect LDs being overwritten by manually providing an existing title.

Change how Parallel Activities are detected and described in Flashless Authoring in LD Importer.

Multiple CSS changes and bug fixes.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-1, +2) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-6, +20) | History | Source | Diff
· /lams_central/web/author2.jsp (-1, +6) | History | Source | Diff
· /lams_central/web/css/authoring.css (-3, +10) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-0, +28) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-82, +166) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-4, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-8, +7) | History | Source | Diff
· /lams_common/conf/language/lams/ApplicationResources.properties (-1, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.java (-2, +11) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/ValidationErrorDTO.java (-1, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java (-8, +23) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (-4, +14) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java (-5, +20) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (-3, +13) | History | Source | Diff
]]> lams (MAIN): LDEV-3115, LDEV-3215: Grouping for Floating activities. Improve grouping detection for plain Tool activities.... Mon, 21 Apr 2014 11:57:43 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140421095743 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140421095743 Marcin Cieslak committed MAIN:marcin:20140421095743 on branch MAIN in lams LDEV-3115, LDEV-3215: Grouping for Floating activities. Improve grouping detection for plain Tool activities.

Last LD access list front end partial implementation.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-1, +19) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (-1, +6) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-9, +18) | History | Source | Diff
· /lams_central/web/author2.jsp (-3, +5) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +10) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-11, +13) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-7, +30) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-19, +44) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml (-2, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.java (-1, +12) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILearningDesignDAO.java (-2, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java (-8, +9) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Support for Optional Sequences (Learner's Choice Branching).... Thu, 17 Apr 2014 15:59:23 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140417135923 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140417135923 Marcin Cieslak committed MAIN:marcin:20140417135923 on branch MAIN in lams LDEV-3115: Support for Optional Sequences (Learner's Choice Branching).

Allow Parallel activities inside Optiona/Floating activities.

Minor bug fixes.

· /lams_central/web/author2.jsp (-0, +17) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-26, +36) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-5, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-4, +13) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-1, +9) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-20, +61) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (-5, +7) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Put property dialog next to selected activity.... Wed, 16 Apr 2014 17:22:13 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140416152213 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140416152213 Marcin Cieslak committed MAIN:marcin:20140416152213 on branch MAIN in lams LDEV-3115: Put property dialog next to selected activity.

Separate tool ID and learning library ID as they are not always the same.

· /lams_central/web/author2.jsp (-1, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-9, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-11, +12) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-1, +21) | History | Source | Diff
]]> lams (MAIN): LDEV-3207: Expand toolbar when description panels gets expanded. Tue, 15 Apr 2014 13:59:33 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140415115933 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140415115933 Marcin Cieslak committed MAIN:marcin:20140415115933 on branch MAIN in lams LDEV-3207: Expand toolbar when description panels gets expanded.

· /lams_central/web/author2.jsp (-1, +1) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-0, +2) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-0, +11) | History | Source | Diff
]]> lams (MAIN): LDEV-3207: Fix authoring URL for activities loaded with existing LD.... Mon, 14 Apr 2014 16:40:40 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140414144040 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140414144040 Marcin Cieslak committed MAIN:marcin:20140414144040 on branch MAIN in lams LDEV-3207: Fix authoring URL for activities loaded with existing LD.

Layout adjustments: template font, scrollbars management.

Adjust size when user drops an activity next to canvas border.

· /lams_central/web/author2.jsp (-2, +3) | History | Source | Diff
· /lams_central/web/main.jsp (-1, +1) | History | Source | Diff
· /lams_central/web/css/authoring.css (-16, +14) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-1, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-11, +26) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-0, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-3, +3) | History | Source | Diff
]]> lams (MAIN): LDEV-3207: Add Import and Export buttons.... Fri, 11 Apr 2014 11:33:37 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140411093337 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140411093337 Marcin Cieslak committed MAIN:marcin:20140411093337 on branch MAIN in lams LDEV-3207: Add Import and Export buttons.

Fix Arrange button.

· /lams_central/web/author2.jsp (-3, +12) | History | Source | Diff
· /lams_central/web/main.jsp (-1, +1) | History | Source | Diff
· /lams_central/web/css/authoring.css (-2, +2) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-5, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-3, +33) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-18, +48) | History | Source | Diff
]]> lams (MAIN): LDEV-3207: Add Preview button.... Thu, 10 Apr 2014 13:14:04 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140410111404 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140410111404 Marcin Cieslak committed MAIN:marcin:20140410111404 on branch MAIN in lams LDEV-3207: Add Preview button.

Move title and description to the top bar.

· /lams_central/web/author2.jsp (-50, +41) | History | Source | Diff
· /lams_central/web/main.jsp (-1, +1) | History | Source | Diff
· /lams_central/web/css/authoring.css (-50, +34) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-0, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-0, +4) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-5, +24) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-1, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-2, +67) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-0, +14) | History | Source | Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (-5, +15) | History | Source | Diff
]]> lams (MAIN): LDEV-3207: Add support for Schedule Gate based on activity completion.... Tue, 08 Apr 2014 13:33:20 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140408113320 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140408113320 Marcin Cieslak committed MAIN:marcin:20140408113320 on branch MAIN in lams LDEV-3207: Add support for Schedule Gate based on activity completion.

Fix bugs in Flashless Authoring LD save.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-10, +15) | History | Source | Diff
· /lams_central/web/author2.jsp (-2, +24) | History | Source | Diff
· /lams_central/web/css/authoring.css (-0, +4) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-1, +10) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-1, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-3, +47) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (-0, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040025.sql (binary) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java (-16, +24) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (-1, +12) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java (-1, +7) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/GateActivityStrategy.java (-36, +32) | History | Source | Diff
· /lams_common/src/java/org/.../lams/learningdesign/strategy/ScheduleGateActivityStrategy.java (-28, +66) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (-1, +2) | History | Source | Diff
… 11 more files in changeset.
]]> lams (MAIN): LDEV-3115: Annotations saving/loading.... Fri, 04 Apr 2014 14:34:30 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140404123430 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140404123430 Marcin Cieslak committed MAIN:marcin:20140404123430 on branch MAIN in lams LDEV-3115: Annotations saving/loading.

DB structures for recently used LDs list.

Duplicates of SVG icons with name pattern recognised by Flashless Authoring.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-1, +48) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-9, +8) | History | Source | Diff
· /lams_central/web/author2.jsp (-0, +10) | History | Source | Diff
· /lams_central/web/includes/javascript/jquery.simple-color.js (-0, +1) | History | Source
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-6, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-7, +12) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-8, +73) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-2, +27) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/LearningDesign.hbm.xml (-0, +6) | History | Source | Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/learningdesign/LearningDesignAccess.hbm.xml (-0, +20) | History | Source
· /lams_common/conf/hibernate/mappings/.../lams/learningdesign/LearningDesignAnnotation.hbm.xml (-0, +30) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040024.sql (binary) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java (-1, +12) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesignAccess.java (-0, +100) | History | Source
… 14 more files in changeset.
]]> lams (MAIN): LDEV-3115: Support for Parallel Activities. Wed, 02 Apr 2014 12:14:23 +0200 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140402101423 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140402101423 Marcin Cieslak committed MAIN:marcin:20140402101423 on branch MAIN in lams LDEV-3115: Support for Parallel Activities.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-2, +2) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java (-3, +3) | History | Source | Diff
· /lams_central/web/author2.jsp (-2, +25) | History | Source | Diff
· /lams_central/web/css/authoring.css (-2, +2) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-1, +55) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-3, +8) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-17, +77) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-3, +7) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-1, +1) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-8, +57) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ILearningDesignService.java (-2, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (-19, +27) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (-1, +10) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add Optional and Floating activities. Thu, 06 Mar 2014 13:31:37 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140306123137 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140306123137 Marcin Cieslak committed MAIN:marcin:20140306123137 on branch MAIN in lams LDEV-3115: Add Optional and Floating activities.

· /lams_central/web/author2.jsp (-1, +45) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-41, +239) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-75, +108) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-14, +21) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-11, +30) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-11, +114) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-2, +63) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add annotation regions and labels. Tue, 04 Mar 2014 11:22:15 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140304102215 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140304102215 Marcin Cieslak committed MAIN:marcin:20140304102215 on branch MAIN in lams LDEV-3115: Add annotation regions and labels.

· /lams_central/web/author2.jsp (-0, +39) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-29, +61) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringDecoration.js (-0, +202) | History | Source
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-3, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-11, +196) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-12, +80) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-0, +62) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Allow branch naming. Allow empty branches. Make transition a constructable object. Mulitple adjustments and f... Wed, 26 Feb 2014 13:42:28 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140226124228 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140226124228 Marcin Cieslak committed MAIN:marcin:20140226124228 on branch MAIN in lams LDEV-3115: Allow branch naming. Allow empty branches. Make transition a constructable object. Mulitple adjustments and fixes.

· /lams_central/web/author2.jsp (-1, +14) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-99, +151) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-5, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-22, +42) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-57, +87) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-12, +46) | History | Source | Diff
]]> lams (MAIN): LDEV-2437: Use CKEditor for Learning Design description. Mon, 17 Feb 2014 12:16:56 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140217111656 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20140217111656 Marcin Cieslak committed MAIN:marcin:20140217111656 on branch MAIN in lams LDEV-2437: Use CKEditor for Learning Design description.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-2, +3) | History | Source | Diff
· /lams_central/web/author2.jsp (-12, +12) | History | Source | Diff
· /lams_central/web/css/authoring.css (-6, +1) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-5, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-13, +19) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Allow saving of LDs consisting of simple Tool activities.... Tue, 03 Dec 2013 21:29:53 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131203202953 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131203202953 Marcin Cieslak committed MAIN:marcin:20131203202953 on branch MAIN in lams LDEV-3115: Allow saving of LDs consisting of simple Tool activities.

Fixes to JSON parsing.

Activity colouring based on categories.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-185, +104) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-5, +26) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java (-12, +16) | History | Source | Diff
· /lams_central/web/author2.jsp (-18, +4) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-20, +28) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-29, +144) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-7, +20) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-8, +0) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (-1, +2) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (-5, +13) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (-8, +1) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/JsonUtil.java (-0, +71) | History | Source
]]> lams (MAIN): LDEV-3115: Save LD preparations. Adapt ObjectExtractor so it reads from JSON.... Fri, 29 Nov 2013 14:32:52 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131129133252 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131129133252 Marcin Cieslak committed MAIN:marcin:20131129133252 on branch MAIN in lams LDEV-3115: Save LD preparations. Adapt ObjectExtractor so it reads from JSON.

Add "Save" and "Save as" buttons. Allow choosing where to save the LD, along with some validation. Partial LD serialization.

· /lams_central/src/java/org/lamsfoundation/lams/authoring/IObjectExtractor.java (-7, +14) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java (-129, +1245) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (-6, +63) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java (-3, +9) | History | Source | Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java (-2, +19) | History | Source | Diff
· /lams_central/web/author2.jsp (-2, +16) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +18) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-3, +3) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-31, +146) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-2, +35) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/util/AuthoringJsonTags.java (-0, +207) | History | Source
]]> lams (MAIN): LDEV-3115: Allow loading and remembering groups to branches mappings.... Tue, 26 Nov 2013 18:30:00 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131126173000 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131126173000 Marcin Cieslak committed MAIN:marcin:20131126173000 on branch MAIN in lams LDEV-3115: Allow loading and remembering groups to branches mappings.

Add Zoom Out button for presentation purposes.

Add Canvas and Description tabs.

Add a tip when user clicks Transition button.

Multiple minor fixes.

· /lams_central/web/author2.jsp (-21, +48) | History | Source | Diff
· /lams_central/web/css/authoring.css (-4, +57) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-5, +9) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-6, +59) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-1, +22) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-40, +70) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Fill "input" dropdown in branching properties.... Wed, 20 Nov 2013 17:33:25 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131120163325 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131120163325 Marcin Cieslak committed MAIN:marcin:20131120163325 on branch MAIN in lams LDEV-3115: Fill "input" dropdown in branching properties.

Load branching grouping from stored LD.

Add "Match Groups to Branches" dialog.

· /lams_build/lib/lams/lams.jar (binary) | History | Source | Diff
· /lams_central/web/author2.jsp (-1, +38) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +47) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-300, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-121, +40) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-2, +40) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringProperty.js (-0, +554) | History | Source
· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignService.java (-1, +3) | History | Source | Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/dto/ToolDTO.java (-1, +10) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Allow branching in the same row when rearranging activities, if it is not too long.... Tue, 19 Nov 2013 17:56:23 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131119165623 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131119165623 Marcin Cieslak committed MAIN:marcin:20131119165623 on branch MAIN in lams LDEV-3115: Allow branching in the same row when rearranging activities, if it is not too long.

Add partial branching properties dialog.

Add "transition" button.

Several bug fixes and adjustments.

· /lams_central/web/author2.jsp (-11, +63) | History | Source | Diff
· /lams_central/web/css/authoring.css (-1, +6) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-56, +168) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-35, +18) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-13, +8) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-23, +54) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Layout adjustments for Chrome and IE.... Mon, 18 Nov 2013 18:57:14 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131118175714 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131118175714 Marcin Cieslak committed MAIN:marcin:20131118175714 on branch MAIN in lams LDEV-3115: Layout adjustments for Chrome and IE.

Enable jQuery draggable on iPad.

· /lams_central/web/author2.jsp (-0, +1) | History | Source | Diff
· /lams_central/web/css/authoring.css (-5, +5) | History | Source | Diff
· /lams_central/web/includes/javascript/jquery.ui.touch-punch.js (-0, +11) | History | Source
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-4, +12) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-1, +1) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-1, +2) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add more properties for Grouping activities. Make them show/hide/change when needed.... Fri, 15 Nov 2013 16:58:40 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131115155840 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131115155840 Marcin Cieslak committed MAIN:marcin:20131115155840 on branch MAIN in lams LDEV-3115: Add more properties for Grouping activities. Make them show/hide/change when needed.

Set properties correctly when loading LDs.

Fix arranging activities on canvas when loading complex branching activities.

· /lams_central/web/author2.jsp (-3, +64) | History | Source | Diff
· /lams_central/web/css/authoring.css (-2, +14) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-24, +137) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-47, +149) | History | Source | Diff
]]> lams (MAIN): LDEV-3115: Add copy & paste for activities.... Thu, 14 Nov 2013 14:11:43 +0100 Marcin Cieslak https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131114131143 https://code.lamsfoundation.org/fisheye/changelog/lams?cs=MAIN%3Amarcin%3A20131114131143 Marcin Cieslak committed MAIN:marcin:20131114131143 on branch MAIN in lams LDEV-3115: Add copy & paste for activities.

Ensure HTML IDs are unique within the document.

Add properties to Tool and Gate activities.

Remove info dialog from static HTML and create it dynamically via jQuery.

Initialise folder and LD tree just once and only load contents when dialog is opened.

Allow loading LDs with branches. Make canvas rearrange/resize after a load.

Fix translating coordinates from events to Raphael paper.

Mulitple minor adjustments and bug fixes.

· /lams_central/web/author2.jsp (-14, +60) | History | Source | Diff
· /lams_central/web/css/authoring.css (-19, +30) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringActivity.js (-44, +78) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringGeneral.js (-43, +234) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringHandler.js (-7, +8) | History | Source | Diff
· /lams_central/web/includes/javascript/authoring/authoringMenu.js (-53, +83) | History | Source | Diff
]]>