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. … 5 more files in changeset.
LDEV-4897 Update Gradebook, Kumalive, and archived emails to use new Excel exporting methods

    • -1
    • +10
    ./lamsfoundation/lams/util/excel/ExcelRow.java
  1. … 10 more files in changeset.
LDEV-4897 Update Scratchie and MCQ to use new Excel exporting methods

    • -5
    • +5
    ./lamsfoundation/lams/util/excel/ExcelCell.java
    • -1
    • +24
    ./lamsfoundation/lams/util/excel/ExcelRow.java
    • -4
    • +4
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
  1. … 12 more files in changeset.
LDEV-4858 Take care about percentages

    • -0
    • +7
    ./lamsfoundation/lams/util/excel/ExcelRow.java
    • -84
    • +32
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
LDEV-4897 Introduce ExcelRow and ExcelSheet classes

* Update Daco and Assessment to use new classes

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

    • -134
    • +0
    ./lamsfoundation/lams/util/ExcelCell.java
    • -463
    • +0
    ./lamsfoundation/lams/util/ExcelUtil.java
    • -0
    • +134
    ./lamsfoundation/lams/util/excel/ExcelCell.java
    • -0
    • +56
    ./lamsfoundation/lams/util/excel/ExcelRow.java
    • -0
    • +38
    ./lamsfoundation/lams/util/excel/ExcelSheet.java
    • -0
    • +482
    ./lamsfoundation/lams/util/excel/ExcelUtil.java
  1. … 25 more files in changeset.
LDEV-4858 Set marks and other numeric values as numbers

    • -4
    • +3
    ./lamsfoundation/lams/util/ExcelCell.java
    • -17
    • +29
    ./lamsfoundation/lams/util/ExcelUtil.java
LDEV-4858 Set marks and other numeric values as numbers

    • -56
    • +58
    ./lamsfoundation/lams/util/ExcelUtil.java
LDEV-4859 Include time with dates

    • -11
    • +20
    ./lamsfoundation/lams/util/ExcelCell.java
    • -13
    • +64
    ./lamsfoundation/lams/util/ExcelUtil.java
  1. … 3 more files in changeset.
LDEV-4884 QB UUID processing in QTI import in TBL template in authoring

    • -1
    • +1
    ./lamsfoundation/lams/rest/RestTags.java
  1. … 9 more files in changeset.
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.

    • -0
    • +19
    ./lamsfoundation/lams/dbupdates/patch20191023.sql
  1. … 1 more file in changeset.
LDEV-4745 Fix authoring templates for new QB structure

    • -7
    • +7
    ./lamsfoundation/lams/util/JsonUtil.java
  1. … 3 more files in changeset.
LDEV-4884 UUIDs in QTI export/import in QB

    • -13
    • +21
    ./lamsfoundation/lams/questions/QuestionParser.java
  1. … 2 more files in changeset.
LDEV-4881 Remove notebook entries from DB on lesson removal

  1. … 3 more files in changeset.
LDEV-4836 Set QB question content folder ID for new MCQ questions

Also add a default content folder ID to template activities during

migration.

  1. … 6 more files in changeset.
Merge branch 'master' into develop

Conflicts:

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GroupingController.java

  1. … 4 more files in changeset.
LDEV-4874 Restrict displaying names for students that are not within student's group

    • -0
    • +10
    ./lamsfoundation/lams/dbupdates/patch20191010.sql
  1. … 6 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4845

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/qb/service/IQbService.java

lams_common/src/java/org/lamsfoundation/lams/qb/service/QbService.java

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

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

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

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

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20191009.sql
  1. … 4 more files in changeset.
LDEV-4875 Recalculate all assessments and scratchies after answer allocation into group

    • -0
    • +10
    ./lamsfoundation/lams/tool/service/ICommonScratchieService.java
  1. … 11 more files in changeset.
LDEV-4875 Add VSA question type to Assessment and Scratchie

    • -0
    • +14
    ./lamsfoundation/lams/dbupdates/patch20190913.sql
    • -0
    • +19
    ./lamsfoundation/lams/tool/service/ICommonAssessmentService.java
  1. … 67 more files in changeset.
LKC-221 Fill Scratchie and Assessment with WA questions

  1. … 5 more files in changeset.
LKC-221 Fill MCQ with RAT questions.

    • -0
    • +19
    ./lamsfoundation/lams/tool/service/IQbToolService.java
  1. … 2 more files in changeset.
LDEV-4869 Add urn:lti:instrole:ims/lis/Instructor to LTI default instructor roles

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.

    • -0
    • +71
    ./lamsfoundation/lams/integration/util/IntegrationConstants.java
  1. … 9 more files in changeset.
Merge branch 'LDEV-4841' into LDEV-4745

    • -19
    • +116
    ./lamsfoundation/lams/dbupdates/patch20190722.sql
  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 Add users to course prior to cloning the lesson

  1. … 2 more files in changeset.
LDEV-4589 Lower log levels, as involved situations are not necessarily errors