Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5425 Remove "End of activity" notebook from *all* tools

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

  1. … 337 more files in changeset.
LDEV-5398 Allow adding QB collections on the fly in other parts of authoring

  1. … 10 more files in changeset.
LDEV-5324 Do not call missing function on validation success

  1. … 3 more files in changeset.
LDEV-5291 Allow filtering question in QB search by presence in LD

  1. … 11 more files in changeset.
LDEV-5250 Remove Pedagogical Planner integration with core LAMS

  1. … 67 more files in changeset.
LDEV-5229 Make previous changes to tools consistent

  1. … 31 more files in changeset.
LDEV-5229 Authoring popovers for Q&A

  1. … 2 more files in changeset.
LDEV-5200 Remove obsolete icons

  1. … 111 more files in changeset.
LDEV-5209 Allow seeing other leaders' answers in Q&A

  1. … 3 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-5114 Add "Add as new version" button to Q&A

  1. … 2 more files in changeset.
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. … 51 more files in changeset.
LDEV-5050 Control if question is required from Q&A authoring

  1. … 1 more file in changeset.
LDEV-5014 Add spinner while QB panel loads in authoring

  1. … 3 more files in changeset.
LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

  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-4968 Add CSRF Guard token to remove question request in Q&A tool

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

# lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

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

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McController.java

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

  1. … 92 more files in changeset.
LDEV-4932 Adding CSRF for QA authoring

- Add/edit questions

- remove questions

- Add and remove conditions

  1. … 3 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

  1. … 41 more files in changeset.
LDEV-4932 Secure save tool authoring with CSRF Guard

  1. … 42 more files in changeset.
LDEV-4841 Set QB question content folder ID for new Q&A questions

  1. … 2 more files in changeset.
LDEV-4863 Q&A authoring to look more like Assessment essay authoring

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

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

  1. … 2 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. … 12 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 390 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 503 more files in changeset.