authoringGeneral.js

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5200 Fix branching arranging in authoring

Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

  1. … 10 more files in changeset.
LDEV-5397 Use custom activity icons in progress bar

  1. … 3 more files in changeset.
LDEV-5397 Learner profile picture opens picture upload, not all profile settings

  1. … 3 more files in changeset.
LDEV-5200 Fix arranging activities in author with support activities present

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

LDEV-5342 Show LD last modified date also in Save As dialog

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

  1. … 35 more files in changeset.
LDEV-5342 Add last modified date at bottom of Open dialog in Authoring

  1. … 3 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/conf/language/lams/ApplicationResources.properties

  1. … 3 more files in changeset.
LDEV-3115 Make sure that activity selection box is not in LD SVG

LDEV-5081 Merge changes made for monitor in LDEV-5083

  1. … 36 more files in changeset.
LDEV-5083 Improve flow of Live Edit

  1. … 4 more files in changeset.
LDEV-5292 Sync RAT activities questions in TBL sequences

  1. … 13 more files in changeset.
LDEV-5283 Improve UX for Remove button at properties dialog

  1. … 2 more files in changeset.
LDEV-5283 Add Remove button on properties box in authoring

  1. … 5 more files in changeset.
LDEV-5200 Increase size of empty Optional and Support activities

With tiny default size they can get easily hidden under a tool activity,

causing validation errors.

LDEV-5277 Confirm with user closing unsaved LD in LTI LAMS authoring

Also automatically refresh LTI content selection page on authoring close

  1. … 2 more files in changeset.
LDEV-3555 Detect read-onlyness of LD in correct way

LDEV-3555 Detect read-onlyness of LD in correct way

LDEV-5254 Detect Live Edit from LD property and not existence of Gate

LDEV-3555 Do not create LD thumbnail with incorrect read-only colouring

LDEV-4126 Fix recently used LDs logic on save

LDEV-4120 Prevent cut&paste folder into itself

  1. … 1 more file in changeset.
LDEV-5200 Fix positioning of Gate and Branching activities

  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.0' into v4.5

Conflicts:

lams_central/web/authoring/authoring.jsp

  1. … 8 more files in changeset.
LDEV-5219 Introduce stop-at-preceding-activity flag for some gates

  1. … 9 more files in changeset.
LDEV-5200 Rearrange activities of pre-redesign LDs

Keep authoring 4.5 patch on top for future users' upgrades.

  1. … 2 more files in changeset.
LDEV-5200 Move branching from top menu to activity toolbar

  1. … 4 more files in changeset.
LDEV-5200 Move optional activity from top menu to activity toolbar

  1. … 4 more files in changeset.