Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5198 Fix a bug in bootstrap tabs plugin

  1. … 2 more files in changeset.
LDEV-5198 Upgrade CKEditor to version 4.16.0

  1. … 169 more files in changeset.
LDEV-5155 Introduce rubrics rating style

  1. … 2 more files in changeset.
LDEV-5192, LDEV-5155 Only Peer Review starts maximised in authoring

Most tools' authoring screen is not tailored for a wider pop up. In LAMS

5 we should have all authoring content rewritten, but for now we need to

stick to the old size. Only Peer Review needs a wider pop up as it can

have rubrics ratings.

LDEV-5192 Open activity authoring initially maximised

If we set the now wider activity authoring pop up as the default size,

maximise button does not make sense, it will do nothing. So instead we

leave the standard pop up size but open it in maximised state. This way

teachers can return to standard size if they want to take a look at

authoring canvase in the background.

LDEV-5157 Add various useful addons to CodeMirror

    • -0
    • +114
    ./codemirror/addon/comment/continuecomment.js
    • -0
    • +201
    ./codemirror/addon/edit/closebrackets.js
    • -0
    • +160
    ./codemirror/addon/edit/matchbrackets.js
    • -0
    • +40
    ./codemirror/addon/runmode/colorize.js
    • -0
    • +333
    ./codemirror/addon/runmode/runmode-standalone.js
    • -0
    • +152
    ./codemirror/addon/scroll/simplescrollbars.js
    • -0
    • +72
    ./codemirror/addon/selection/active-line.js
  1. … 2 more files in changeset.
LDEV-5157 Restructure CodeMirror sources to make room for addons

    • -0
    • +9800
    ./codemirror/codemirror.js
    • -0
    • +935
    ./codemirror/mode/clike.js
    • -0
    • +942
    ./codemirror/mode/javascript.js
    • -0
    • +399
    ./codemirror/mode/python.js
  1. … 1 more file in changeset.
LDEV-5157 Add code syntax highlighting to learner UI

    • -0
    • +9800
    ./codemirror.js
    • -0
    • +935
    ./codemirror_mode_clike.js
    • -0
    • +942
    ./codemirror_mode_javascript.js
    • -0
    • +399
    ./codemirror_mode_python.js
  1. … 6 more files in changeset.
LDEV-4372 Fix tooltips in progress bar and bootstrap

  1. … 34 more files in changeset.
LDEV-5177 Adding link button to default learner CKeditor config

LDEV-5144 Introduce doKu as AE in TBL monitoring

  1. … 8 more files in changeset.
LDEV-5167 Improved implementation

Rather than adding as a multiple options, use a plugin as a background selector

  1. … 12 more files in changeset.
LDEV-4909 Allow grouping not connected to parallel support activity

LDEV-3115 Remove grouping/input references on activity remove

    • -10
    • +12
    ./authoring/authoringActivity.js
LDEV-4909 Allow grouping not being connected to support activity

LDEV-3115 Check range conditions correctly

  1. … 2 more files in changeset.
LDEV-5103 Make Authoring dialog wider to accommodate QB button

LDEV-5139 Fix parameter passing when opening Notifications dialog

Merge remote-tracking branch 'origin/v4.0' into LDEV-5016

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/web/QuestionsController.java

lams_central/web/qb/collection.jsp

lams_central/web/questions/questionFile.jsp

lams_common/db/sql/create_lams_11_tables.sql

lams_common/db/sql/insert_lams_config_data.sql

lams_common/db/sql/insert_types_data.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200129.sql

lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java

lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/db/sql/create_lams_tool_assessment.sql

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/WEB-INF/tags/CKEditor.tag

lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

    • -27
    • +44
    ./authoring/authoringActivity.js
  1. … 27 more files in changeset.
LDEV-5113 Introduce manual grading tool output

  1. … 4 more files in changeset.
LDEV-5101 Allow applying new question version to other activities in LD

  1. … 13 more files in changeset.
LDEV-5103 Add Question Bank button to authoring

  1. … 1 more file in changeset.
LDEV-5200 Add CSS style to SVG file so LD thumbnail displays correctly

  1. … 4 more files in changeset.
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

  1. … 4 more files in changeset.
LDEV-5016 Add CSS style to SVG file so LD thumbnail displays correctly

  1. … 4 more files in changeset.
LKC-216 Remove obsolete test code

LDEV-5095 Add latest chart.js to the project

We already use an old version of this library in other places in LAMS.

LDEV-5083 Add latest version of chart.js

Existing version used in other places in LAMS stays unchanged for now.

  1. … 1 more file in changeset.
LDEV-5080 Upgrade Boostrap Select to the latest version 1.13.14

    • -0
    • +9
    ./bootstrap-select.min5.js
  1. … 1 more file in changeset.
LDEV-5016 Update bootstrap to the latest version 4.5.2

  1. … 1 more file in changeset.