Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5015 Allow answer justification for AE question for TBL template

  1. … 1 more file in changeset.
LDEV-5050 Make all TBL template questions required

  1. … 7 more files in changeset.
LDEV-5050 Move "is required" attribute from QB question to tools

  1. … 28 more files in changeset.
LDEV-5015 Allow disclose answers only for AEs, not for iRA assessment

LDEV-5015 Tune TBL template iRA Assessment options

LKC-222 Simplify authorization flow for Workflow Automation

Learners need to already exist in the organisation. Staff gets synced

and added.

  1. … 2 more files in changeset.
LKC-222 Add course and lesson roles to user on WA access

  1. … 4 more files in changeset.
LDEV-5041 Add lesson service utility method

  1. … 5 more files in changeset.
LDEV-5036 Do not prematurely map resource ID to a LAMS lesson

LDEV-5025 Allow Assessment other groups' answer rating and commenting

  1. … 11 more files in changeset.
LDEV-5024 Fix layout issues in TBL template

  1. … 2 more files in changeset.
LDEV-5024 Import QB questions to AE in TBL template

  1. … 5 more files in changeset.
LDEV-5024 Import question from QB to TBL template wizard

  1. … 2 more files in changeset.
LDEV-4997 Renormalize line endings with git

  1. … 418 more files in changeset.
LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

  1. … 8 more files in changeset.
Merge remote-tracking branch 'origin/v4.0' into v5.0

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

lams_common/src/java/org/lamsfoundation/lams/util/CommonConstants.java

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

  1. … 29 more files in changeset.
LDEV-5015 Replace MCQ with Assessment as iRA in TBL template

  1. … 1 more file in changeset.
SP-4 Allow some roles to be missing from a merged enrolment file

SP-4 Allow mixing different roles in a single file

LDEV-4999 Fix monitor role detection when updating learner mark

  1. … 461 more files in changeset.
SP-4 Fix an entity processing bug

SP-4 In every mode inform that processing finished successfuly

SP-4 Add group manager processing

LDEV-5003 Change the way subcourses are grouped

LDEV-5003 Detect subcourses correctly

LDEV-5003 Load all necessary objects in one go instead of one by one

  1. … 6 more files in changeset.
LDEV-4995 Improvements to the index page

* Fix offcanvas bar search and organisation tablesorter markup in case

of big amount of available organisations

* Optimise DB queries

* Introduce hasContributeActivities Lesson's flag

* Show "fa-spin" when loading an organisation

  1. … 19 more files in changeset.
LDEV-4997 Introduce Etherpad as a JSP tag

  1. … 10 more files in changeset.
LDEV-4995 Improvements to the index page

* Fix favorite organisations markup

* Fix cards height

* Email notifications buttons moved under "Three dots" menu

* Hide reorder buttons for any order other than "Default" one

* Reintroduce chart labels

  1. … 5 more files in changeset.
LDEV-4949 import questions from Word files

  1. … 15 more files in changeset.