Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into v4.0

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp

  1. … 3 more files in changeset.
LDEV-5078 Fix i18n labels in Arrow tag

  1. … 52 more files in changeset.
LDEV-5050 Control if question is required from Q&A authoring

  1. … 3 more files in changeset.
LDEV-4841 Migrate Q&A tool to QB

  1. … 44 more files in changeset.
LDEV-4840 Refine import QB questions feature

  1. … 4 more files in changeset.
LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

  1. … 14 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 391 more files in changeset.
LDEV-4440 Q&A learning & monitoring fixes

  1. … 3 more files in changeset.
LDEV-4440 Shared resource authoring & Q&A

  1. … 23 more files in changeset.
LDEV-4440 Sared resources - authoring - work in progress

  1. … 33 more files in changeset.
LDEV-3785: small ui changes

  1. … 1 more file in changeset.
LDEV-4015 * fixed Feedback that haven't been recorded * Removed completely redundant QaGeneralAuthoringDTO.java and replaced its occurrences in jsps with formBean

  1. … 8 more files in changeset.
LDEV-4015 * fixed Feedback that haven't been recorded * Removed completely redundant QaGeneralAuthoringDTO.java and replaced its occurrences in jsps with formBean

  1. … 9 more files in changeset.
LDEV-3785: Update Q&A Author to Bootstrap. Clean up.

  1. … 27 more files in changeset.
LDEV-3095: Revert incorrect fix. Try to mute cross-domain iframe access errors, as requested by a client.

  1. … 25 more files in changeset.
LDEV-3095: Revert incorrect fix. Try to mute cross-domain iframe access errors, as requested by a client.

  1. … 26 more files in changeset.
LDEV-3095: Check if the current window is the one containing given methods. It may happen for some clients.

  1. … 27 more files in changeset.
LDEV-3095: Check if the current window is the one containing given methods. It may happen for some clients.

  1. … 27 more files in changeset.
LDEV-3460: Remove references to obsolete CSS files. Re-introduce necessary images.

  1. … 13 more files in changeset.
LDEV-3460: Remove references to obsolete CSS files. Re-introduce necessary images.

  1. … 13 more files in changeset.
LDEV-3236 Ability to change, add, remove Q&A questions even after student have reached it

  1. … 53 more files in changeset.
LDEV-3197 Q&A monitor redesign

  1. … 34 more files in changeset.
LDEV-3095: Display item list in top or parent window, but never in current.

  1. … 37 more files in changeset.
LDEV-3095: Display item list in top or parent window, but never in current.

LDEV-3070: Use window.parent if required in Tools. Make single activity lesson wizard optional, set in sysadmin menu.

  1. … 59 more files in changeset.
LDEV-3070: Add single activity lessons wizard, first implementation iteration. Some changes were not committed as they interfere with old index page design.

  1. … 123 more files in changeset.
updated mcq, qa, vote for RTL

  1. … 71 more files in changeset.
Fix for Where is lock when finished?

  1. … 5 more files in changeset.
Added cellspacing=0 to table using alternative-color

  1. … 26 more files in changeset.
Cleaned up jsp pages.

  1. … 7 more files in changeset.