lams_tool_imscc

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.
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 copy-tags

    • -67
    • +0
    ./web/WEB-INF/tags/NotebookReedit.tag
    • -71
    • +10
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 154 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -21
    • +1
    ./web/pages/itemreview/instructionsnav.jsp
  1. … 505 more files in changeset.
LDEV-5433 Squash DB patches and update versions

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

  1. … 38 more files in changeset.
LDEV-5397 Updating labels

  1. … 84 more files in changeset.
LDEV-5397 copy-tags

    • -11
    • +10
    ./web/WEB-INF/tags/LeaderDisplay.tag
    • -133
    • +163
    ./web/WEB-INF/tags/PageLearner.tag
  1. … 154 more files in changeset.
LDEV-5345 Adding and modifying labels based on changes for bootstrap 5

  1. … 240 more files in changeset.
LDEV-5345 Adding and updating latest translations

  1. … 42 more files in changeset.
LDEV-5397 copy-tags

  1. … 62 more files in changeset.
LDEV-5397 Reintroduce websocket library to Page tag

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

  1. … 79 more files in changeset.
LDEV-5397 copy-tags

    • -15
    • +12
    ./web/WEB-INF/tags/NotebookReedit.tag
  1. … 123 more files in changeset.
LDEV-5397 copy-tags

    • -36
    • +60
    ./web/WEB-INF/tags/PageLearner.tag
  1. … 87 more files in changeset.
LDEV-5397 copy-tags

    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 275 more files in changeset.
LDEV-5414 Reattach message handlers to websocket after reconnect

  1. … 76 more files in changeset.
LDEV-5414 Refactor and improve resilience of websockets thorough LAMS

    • -1
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -4
    • +5
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
  1. … 127 more files in changeset.
LDEV-5397 Switch to server side redirects

  1. … 20 more files in changeset.
LDEV-5397 spread changes to tags across all projects

    • -0
    • +553
    ./web/WEB-INF/tags/StyledRating5.tag
  1. … 150 more files in changeset.
LDEV-5397 switch to using updated DefineLater.tag

    • -17
    • +20
    ./web/WEB-INF/tags/DefineLater.tag
    • -16
    • +1
    ./web/pages/learning/definelater.jsp
  1. … 93 more files in changeset.
LDEV-5397 Propagade changes done to LAMS tags to all projects

    • -0
    • +230
    ./web/WEB-INF/tags/Rating5.tag
  1. … 310 more files in changeset.
LDEV-5397 Migrate old Bootstrap3 class names into Bootstrap5 in *all* tools' learning

* Did this following 2 guides:

https://getbootstrap.com/docs/4.1/migration/

https://getbootstrap.com/docs/5.2/migration/

* Apart from changing class names, also performed other updates required in aforementioned guides.

For instance, checkboxes, radios, selects have now proper Bootstrap5 structure; removed "media" objects.

* Replaced some outdated LAMS class names

    • -3
    • +3
    ./web/pages/itemreview/instructionsnav.jsp
  1. … 102 more files in changeset.
LDEV-5397 propagate tag changes to all tools

    • -1
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
    • -4
    • +5
    ./web/WEB-INF/tags/AuthoringRatingCriteria.tag
    • -0
    • +70
    ./web/WEB-INF/tags/NotebookReedit.tag
  1. … 345 more files in changeset.
LDEV-5397 Boostrap 5 bundle already has got Popper included

    • -13
    • +12
    ./web/WEB-INF/tags/PageLearner.tag
  1. … 33 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 64 more files in changeset.
LDEV-5397 add icons to finish and refresh buttons

  1. … 66 more files in changeset.
LDEV-5397 make SubmissionDeadline.tag call checkNextGateActivity()

    • -2
    • +4
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 32 more files in changeset.
LDEV-5397 remove obsolete jsps

  1. … 10 more files in changeset.
LDEV-5397 introduce submissionDeadline.tag

* switched to using this tag in all tools

* fixed a few existing issues with submissionDeadline feature in Vote and MCQ tools

    • -0
    • +117
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 80 more files in changeset.