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

Conflicts:

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/conf/language/lams/ApplicationResources_el_GR.properties

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

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

  1. … 6 more files in changeset.
LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

* Move existing ExcelCell and ExcelUtils to .util.excel package

  1. … 32 more files in changeset.
LDEV-4896 Add groupings to the course instead of subcourse

Merge branch 'master' into develop

  1. … 1 more file in changeset.
LDEV-4879 Create lesson in subgroups at one go

  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-4892 Log all request parameters coming to LoginRequestLtiServlet

LDEV-4884 Make QB UUID processing easier

Also allow setting QB UUID on import and not generate it always when a

question gets saved into DB.

  1. … 4 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/qb/SearchQBController.java

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

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

  1. … 8 more files in changeset.
LDEV-4884 UUIDs in QTI export/import in QB

  1. … 4 more files in changeset.
LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

  1. … 2 more files in changeset.
LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

  1. … 2 more files in changeset.
LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

  1. … 5 more files in changeset.
LDEV-4875 Portrait tag to use double quotes for src parameter

LDEV-4875 Add VSA question type to Assessment and Scratchie

  1. … 73 more files in changeset.
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.

LDEV-4869 Take into account blank lsid parameter

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.

  1. … 3 more files in changeset.
LKC-215 Allow creating new QB questions from within WA

We need new question UID after it got created.

LKC-215 Importing questions from QB to WA

  1. … 1 more file in changeset.
LDEV-4589 Add users to course prior to cloning the lesson

  1. … 2 more files in changeset.
LDEV-4589 Add users to course prior to cloning the lesson

  1. … 2 more files in changeset.
LDEV-4589 Pass lsId parameter as Long

  1. … 2 more files in changeset.
LDEV-4589 Pass lsId parameter as Long

  1. … 2 more files in changeset.
LDEV-4589 Add proper label to lineitem

LDEV-4589 Add proper label to lineitem

LDEV-4589 Adjust LTI Deep Linking & Membership services for Blackboard

  1. … 2 more files in changeset.
LDEV-4853 Rewrite YUI folder tree in Add Lesson dialog to bootstrap

Initial YUI clean up.

Fix minor issues.

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

  1. … 6 more files in changeset.