authoring

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into develop

Conflicts:

lams_central/web/includes/javascript/authoring/authoringActivity.js

  1. … 2 more files in changeset.
LDEV-4887 Adding id, classes to make automated testing faster

  1. … 4 more files in changeset.
LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

  1. … 7 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in LD authoring to bootstrap

  1. … 6 more files in changeset.
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

  1. … 7 more files in changeset.
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

  1. … 2 more files in changeset.
LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

  1. … 3 more files in changeset.
LDEV-4829 Error msg and text improvements, supports mark entry

  1. … 9 more files in changeset.
LDEV-4829 Wording tweaks and tool tips added to templates

  1. … 5 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 89 more files in changeset.
LDEV-4829 QTI Import window appears centered on screen.

LDEV-4829 Fixed incompatibility between x-editable and jquery-validation

LDEV-4829 Application Exercise functionality completed, can edit titles

  1. … 11 more files in changeset.
LDEV-4829 Multiple App Exercises with multiple Questions, QTI import

    • -0
    • +57
    ./template/tbl/appex.jsp
  1. … 6 more files in changeset.
LDEV-4829 Activities removable in build, RAT and AE have QTI Import

    • -0
    • +29
    ./template/tool/assessmentQTI.jsp
    • -0
    • +22
    ./template/tool/mcquestionQTI.jsp
  1. … 9 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

  1. … 2 more files in changeset.
LDEV-4792 Rewrite authoring spinners from jQuery UI to plain HTML 5

  1. … 1 more file in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 388 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 502 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 314 more files in changeset.
LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

  1. … 17 more files in changeset.
Merge ordered branching LDEV-4587 into develop

  1. … 23 more files in changeset.
LDEV-4754 Mapping div no longer visible when authoring screen scrolled.

LDEV-4726 Restoring division line lost when licenses were updated.

LDEV-4726 Licenses updated to Creative Commons 4.0

  1. … 20 more files in changeset.
LDEV-4391 Prevent double clicking on Save As and Import buttons

Even though Save button in Save As dialog does not seem to get spinning

arrows, it gets disabled straight away and double submit does not

happen. The arrows never get a chance to get rendered as code

responsible for saving works quickly and calls reset() method on the

button.

  1. … 2 more files in changeset.
LDEV-4714 Add "loading" status to some buttons to prevent double click

  1. … 2 more files in changeset.
LDEV-4714 Load Bootstrap faster so spinning arrows appear ASAP

LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

  1. … 10 more files in changeset.
LDEV-4440 <input> tag can't have a closing tag in HTML

Also change <input type="submit"></input> into <button>, as otherwise

button's label is displayed incorrectly

  1. … 14 more files in changeset.