Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LAI-9 Fix broken links to MCQ question generator

  1. … 1 more file in changeset.
LDEV-5436 Project-wide user sorting by last then first name

    • -3
    • +2
    ./monitoring/parts/masterDetailLoadUp.jsp
  1. … 146 more files in changeset.
LDEV-5397 Enhanced mobile experience

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

LDEV-5359 Allow up to 50 questions per page or section

Following ICL-9

LDEV-5420 Add questions print button to Scratchie

  1. … 3 more files in changeset.
LDEV-5420 Move print page to Central for other modules to use

Also add meaningful title which will be also used as file name when printing to PDF.

  1. … 4 more files in changeset.
LDEV-5420 Add print questions page

    • -0
    • +104
    ./authoring/printQuestions.jsp
  1. … 1 more file in changeset.
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

    • -31
    • +0
    ./monitoring/parts/advanceoptions.jsp
  1. … 33 more files in changeset.
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

    • -31
    • +0
    ./monitoring/parts/advanceoptions.jsp
  1. … 33 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -31
    • +0
    ./monitoring/parts/advanceoptions.jsp
  1. … 513 more files in changeset.
LDEV-5363 Make RAT questions sync optional

  1. … 11 more files in changeset.
LDEV-5397 move CSS rule outside of <c:if> tag

Revert "LDEV-5397 cancel out opacity when revealing results in assessment"

This reverts commit 1298dedc3fa80a3c1c495d58d17caaeee8e81c7f.

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

# Conflicts:

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

# lams_tool_assessment/web/pages/learning/learning.jsp

  1. … 3 more files in changeset.
LDEV-5397 cancel out opacity when revealing results in assessment

LDEV-5401 Display individual extensions in time limit widget

    • -2
    • +2
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +1
    ./tblmonitoring/iraAssessmentStudentChoices.jsp
  1. … 4 more files in changeset.
LDEV-5432 Confirm with learner whether he wants to submit answers

  1. … 1 more file in changeset.
LDEV-5397 remove opacity set for disabled input's labels (only for results page)

  1. … 1 more file in changeset.
LDEV-5430 Allow shuffling all questions' answers in Assessment

    • -2
    • +19
    ./monitoring/parts/advanceoptions.jsp
  1. … 5 more files in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 make required item label more prominent

  1. … 5 more files in changeset.
LDEV-5397 solve the problem with additional scrollbar in Brave browser

    • -1
    • +1
    ./learning/results/historyresponses.jsp
    • -30
    • +28
    ./learning/results/matchingpairs.jsp
    • -89
    • +87
    ./learning/results/multiplechoice.jsp
    • -60
    • +58
    ./learning/results/truefalse.jsp
LDEV-5373 Make side headers sticky at teams' choices table

This patch applies it in AE tab in main monitoring UI

    • -4
    • +10
    ./tblmonitoring/assessmentStudentChoices.jsp
    • -5
    • +5
    ./tblmonitoring/assessmentStudentChoicesTable.jsp
LDEV-5397 minor CSS fixes

  1. … 1 more file in changeset.
LDEV-5397 fix initialization of buttons when Assessment is shown in TBL's iRAT tab

    • -2
    • +3
    ./monitoring/parts/discloseAnswers5.jsp
LDEV-5397 fix assessment monitoring by feeding it old bootstrap3 learning jsps

    • -0
    • +340
    ./learning/resultsbootstrap3/allquestions.jsp
    • -0
    • +114
    ./learning/resultsbootstrap3/essay.jsp
    • -0
    • +90
    ./learning/resultsbootstrap3/markhedging.jsp
    • -0
    • +50
    ./learning/resultsbootstrap3/matchingpairs.jsp
    • -0
    • +131
    ./learning/resultsbootstrap3/multiplechoice.jsp
    • -0
    • +34
    ./learning/resultsbootstrap3/numerical.jsp
    • -0
    • +41
    ./learning/resultsbootstrap3/ordering.jsp
    • -0
    • +89
    ./learning/resultsbootstrap3/truefalse.jsp
    • -0
    • +36
    ./learning/resultsbootstrap3/vsa.jsp
    • -1
    • +1
    ./monitoring/parts/discloseAnswers5.jsp
  1. … 1 more file in changeset.
LDEV-5397 show warnings and nofications before activity's instructions

  1. … 14 more files in changeset.
LDEV-5397 switch from lams:errors to lams:errors5

  1. … 14 more files in changeset.
Merge v4.7 into LDEV-5397

  1. … 79 more files in changeset.