stats.jsp

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

  1. … 3 more files in changeset.
LDEV-5404 Escaping funny characters that break js

  1. … 40 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 8 more files in changeset.
LDEV-4832 Secure access to editing QB question

WEB-006

  1. … 1 more file in changeset.
LDEV-5329 Remove obsolete configuration items

  1. … 13 more files in changeset.
LKC-215 Do not show edit buttons if QB question comes from WA

LDEV-5261 Fix popovers in QB and Assessment question stats

  1. … 2 more files in changeset.
LDEV-4825 Introduce item analysis tooltips in QB

  1. … 1 more file in changeset.
LDEV-4825 Introduce RAG colouring for item analysis in other places

  1. … 2 more files in changeset.
LDEV-5059 Add missing labels for Question Bank

  1. … 3 more files in changeset.
LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4932 Add CSRF to QB bank calls

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

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 19 more files in changeset.
LDEV-4848 Remove an unnecessary label

LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEV-4844 Allow manual QB question merging

  1. … 5 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. … 9 more files in changeset.
LDEV-4875 Fixes for VSA feature

  1. … 22 more files in changeset.
LKC-215 Modify question review flow

LDEV-4848 Internationalise labels in Question Bank

  1. … 3 more files in changeset.
LDEV-4827, LDEV-4844 Prevent question merging if admin setting if OFF

  1. … 1 more file in changeset.
LDEv-4844 Allow manual QB question merging

  1. … 5 more files in changeset.
LDEV-4782 Sort lessons by organisation. Include only active lessons.

  1. … 1 more file in changeset.
LDEV-4782 Add a link to open lesson monitor on QB stats page

Merge branch 'LDEV-4834' into LDEV-4745

Conflicts:

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

lams_central/web/qb/collection.jsp

lams_central/web/qb/stats.jsp

lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java

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/conf/language/lams/ApplicationResources_en_AU.properties

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

  1. … 10 more files in changeset.
Merge branch 'LDEV-4745' into LDEV-4836

  1. … 7 more files in changeset.
LDEV-4836 Change authoring to accommodate importing questions from QB

  1. … 76 more files in changeset.
LDEV-4834 Check if user can manage a QB question

If an user does not have access to a question, i.e. it is not in any

collection he/she sees, then prevent him/her from editing the question's

collections and learning outcomes.

  1. … 7 more files in changeset.
LDEV-4828, LDEV-4834 Move management sections to bottom of stats page