Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4828 Appadmins can (un)share any QB collection

  1. … 1 more file in changeset.
LDEV-5426 Switch from custom time zones to built-in Java ones

    • -15
    • +12
    ./controller/SignupController.java
  1. … 39 more files in changeset.
LDEV-4828 Fix exception on QB question NULL name

SP-9 Add access control

LAI-7 Send consistent question format back to AI

For LAMS needs we use Question class, but AI should be fed with existing RAT questions using the same format we expect from it.

  1. … 2 more files in changeset.
SP-9 Add learner view

  1. … 2 more files in changeset.
LAI-5 Tell AI not to repeat AEs and RAT questions when "generating more"

  1. … 1 more file in changeset.
LAI-5 Add OpenAI MCQ generation to Question Bank collection screen

  1. … 2 more files in changeset.
SP-9 Add course teamwork table

  1. … 1 more file in changeset.
SP-9 Add basic classes and entry point on index page

  1. … 4 more files in changeset.
LAI-6 Allow generating more questions with same prompt as before

  1. … 2 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

# Conflicts:

# idea_project/.idea/runConfigurations/WildFly.xml

# lams_tool_assessment/lams_tool_assessment.eml

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

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

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

    • -27
    • +36
    ./qb/QbCollectionController.java
  1. … 10 more files in changeset.
LDEV-5398 Prevent creating QB collections with duplicate name

  1. … 1 more file in changeset.
LDEV-5398 Check if creating QB collections is allowed

  1. … 2 more files in changeset.
LDEV-5398 Allow creating new QB collections on the fly

    • -27
    • +24
    ./qb/QbCollectionController.java
  1. … 2 more files in changeset.
LAI-1 Make OpenAI-generated MCQ questions editable

  1. … 1 more file in changeset.
LDEV-5375 Add OpenAI question import to Assessment

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

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

  1. … 5 more files in changeset.
LDEV-4832 Allow LD location based editing of QB questions

A user is allowed to edit a question if it is used in a learning design

which is in user's private folder, public folder or a course folder

where the user is a monitor.

  1. … 4 more files in changeset.
LDEV-4832 Allow editing of QB questions and collections by sysadmin

LDEV-4832 Allow editing of questions in shared QB collections

  1. … 5 more files in changeset.
LDEV-5368 Add upload image plugin to CKEditor

  1. … 53 more files in changeset.
LDEV-4828 Allow admins to access any QB collection and question

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

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

  1. … 44 more files in changeset.
LDEV-5358 Always sort groups by name, case insensitive

  1. … 8 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-5357 Use UUIDs for file downloads

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

WEB-006

  1. … 1 more file in changeset.
LDEV-4828 Secure access to other monitors' collections

WEB-001

    • -72
    • +122
    ./qb/QbCollectionController.java
  1. … 1 more file in changeset.
Merge remote-tracking branch 'origin/v4.6' into v4.7

  1. … 8 more files in changeset.