Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_learning/web/includes/javascript/learnerPage.js

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

# lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java

# lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/DacoServiceImpl.java

# lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

# lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

# lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/CommonCartridgeServiceImpl.java

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

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

# lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

# lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

# lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/service/NoticeboardService.java

# lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java

# lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/service/PixlrService.java

# lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

# lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

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

# lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/service/ScribeService.java

# lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java

# lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java

# lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java

# lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

# lams_tool_whiteboard/src/java/org/lamsfoundation/lams/tool/whiteboard/service/WhiteboardService.java

# lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/service/WikiService.java

# lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java

  1. … 34 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 509 more files in changeset.
LDEV-5363 Make RAT questions sync optional

  1. … 12 more files in changeset.
LDEV-5433 Squash DB patches and update versions

  1. … 103 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

  1. … 38 more files in changeset.
LDEV-5401 Fix timer not starting on multiple learners entering activity

  1. … 3 more files in changeset.
LDEV-5397 Switch to server side redirects

  1. … 20 more files in changeset.
LDEV-5410 fix exception on trying to submit notebook after SubmissionDeadline date is set

LDEV-5401 Add learner-triggered absolute timer to other tools

  1. … 35 more files in changeset.
LDEV-5401 Add learner-triggered absolute time limit authoring and learning

  1. … 16 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

  1. … 10 more files in changeset.
LDEV-5121 Allow choosing QB collection in TBL wizard

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

LDEV-5385 Allow real numbers in Scratchie marks

  1. … 1 more file in changeset.
LDEV-5361 Add "require all answers" setting to Scratchie

  1. … 3 more files in changeset.
LKC-221 Set question mark when replacing question from QA

  1. … 1 more file in changeset.
LDEV-5200, LKC-106 Make question numbering consistent between views

  1. … 1 more file in changeset.
LDEV-5347 Add Flux update to Burning Questions tab

Also indicate when there are no burning questions yet.

  1. … 3 more files in changeset.
LDEV-5332 Update QB option for VSA when correct option changes

LDEV-5332 Add VSA support to Question Results table

In Scratchie VSA answers were not linked to corresponding QB options,

making it impossible to count correct answer. From now on if answer is

correct, it will get linked to its QB option. Old VSA lessons though

will not yield good Question Results table.

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

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

Conflicts:

lams_admin/web/policies/policyTable.jsp

  1. … 4 more files in changeset.
LDEV-4875 Try harder to identify correct option for VSAs

LDEV-5083 Refresh burning questions count badges along with answers

  1. … 2 more files in changeset.
LDEV-5328 Squash DB patches and update versions

  1. … 144 more files in changeset.
LDEV-5083 Add burning questions count badges next to question in tRAT

  1. … 2 more files in changeset.
LDEV-5083 Remove old monitoring bits where possible

In activity monitoring we need to leave old design until it gets

rewritten.

  1. … 59 more files in changeset.
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

  1. … 2 more files in changeset.
LDEV-5083 Show Burning Question nav button only if they are enabled

  1. … 3 more files in changeset.
LDEV-4928 While exporting skip empty VSA options