lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4875' into LDEV-4745

LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -6
    • +6
    /lams_central/web/css/qb-question.scss
    • -24
    • +26
    /lams_central/web/includes/javascript/qb-option.js
    • -0
    • +231
    /lams_central/web/qb/authoring/addVsa.jsp
    • -0
    • +23
    /lams_central/web/qb/authoring/vsaOption.jsp
    • -4
    • +14
    /lams_central/web/qb/qbQuestionDetails.jsp
  1. … 61 more files in changeset.
LKC-221 Fill Scratchie and Assessment with WA questions

LKC-221 Fill MCQ with RAT questions.

LKC-215 Display WA logs on QB stats page

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

LDEV-4872 McSession to save users as Set instead of List

LDEV-4872 McSession to save users as Set instead of List

LDEV-4871 Fix query string building when requesting a print page

LKC-215 Modify question review flow

Merge branch 'master' into develop

LDEV-4869 Show error message in case lesson does not exist

LDEV-4869 Prevent authentication of LTI learners with blank lessonId

Also show relevant warning message.

Merge branch 'master' into develop

Merge branch 'LDEV-4869'

LDEV-4869 Add urn:lti:instrole:ims/lis/Instructor to LTI default instructor roles

LDEV-4869 Add default lesson settings for LTI tool consumers

* Also move all integrations jsps to /integration/ folder

    • -0
    • +38
    /lams_admin/web/integration/extLessonForm.jsp
    • -0
    • +126
    /lams_admin/web/integration/ltiConsumer.jsp
    • -0
    • +88
    /lams_admin/web/integration/ltiConsumerList.jsp
    • -0
    • +72
    /lams_admin/web/integration/serverlist.jsp
    • -0
    • +136
    /lams_admin/web/integration/servermaintain.jsp
    • -112
    • +0
    /lams_admin/web/lti/ltiConsumer.jsp
    • -88
    • +0
    /lams_admin/web/lti/ltiConsumerList.jsp
    • -172
    • +0
    /lams_admin/web/servermaintain.jsp
LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

LDEV-4869 Take into account blank lsid parameter

Merge branch 'master' into develop

Merge branch 'LDEV-4870'

LDEV-4870 add instructor to lesson's staff when he logs in using LTI

* Also refactor LoginRequestDispatcher.java: move its methods to

LoginRequestServlet and its constants to a new IntegrationConstants

class.

LKC-215 Allow creating new QB questions from within WA

We need new question UID after it got created.

LDEV-4868 Fix Scratchie so it can show more than one question

* Also fix confidence levels feature in Scratchie

LKC-215 Importing questions from QB to WA

Merge branch 'LDEV-4842' into LDEV-4745

LDEV-4842 Show the same random questions on learning and results pages

LDEV-4863 Q&A authoring to look more like Assessment essay authoring

    • -1
    • +1
    /lams_central/web/css/qb-question.scss
LDEV-4865 Show question description in monitor