Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
LDEV-4836 Fix autopatch script

  1. … 1 more file in changeset.
LDEV-4836 Properly assign collections

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

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

  1. … 75 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. … 6 more files in changeset.
LDEV-4834 Show Learning Outcomes in single QB collection view

  1. … 3 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

  1. … 49 more files in changeset.
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

  1. … 8 more files in changeset.
LDEV-4828 Make service methods' names more simple

"Qb" part everywhere does not introduce anything helpful

  1. … 10 more files in changeset.
LDEV-4828 Add subgrid with previous versions in QB collection view

  1. … 4 more files in changeset.
LDEV-4828 Rewrite QB collections to use question ID instead of uid

  1. … 7 more files in changeset.
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

  1. … 6 more files in changeset.
LDEV-4828 Prevent public collection's name from being changed

  1. … 1 more file in changeset.
LDEV-4829 Marks for iRA, tRa and AE go to Gradebook

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

  1. … 7 more files in changeset.
LDEV-4829 Error msg and text improvements, supports mark entry

  1. … 9 more files in changeset.
LDEV-3997 Try to fetch user name from lis_person_name_full parameter

LDEV-4833 Move import/export questions in XML format feature to QB

  1. … 7 more files in changeset.
LDEV-4826 Hide "Export QTI" button if this feature is OFF in sysadmin

  1. … 1 more file in changeset.
LDEV-4828 Show total number of questions in jqGrid properly

LDEV-4832 Add new version of question to the appropriate collection

  1. … 1 more file in changeset.
LDEV-4826 Add upload/download QTI feature to collection page

  1. … 2 more files in changeset.
LDEV-4828 Display question type and version information

  1. … 2 more files in changeset.
LDEV-4828 Add edit question button

  1. … 1 more file in changeset.
LDEV-4828 Toggle questions transfer and collection creation in sysadmin

  1. … 6 more files in changeset.
LDEV-4828 Allow changing collection name

  1. … 2 more files in changeset.
LDEV-4828 Show usage in lessons on single collection page

  1. … 6 more files in changeset.
LDEV-4828 Strip HTML tags from collection name for jqGrid

LDEV-4828 Split collection view into list and single collection views

  1. … 7 more files in changeset.