lams_tool_lamc

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5436 Project-wide user sorting by last then first name

  1. … 149 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

    • -276
    • +177
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -265
    • +249
    ./conf/language/lams/ApplicationResources_zh_CN.properties
  1. … 29 more files in changeset.
LDEV-5397 copy-tags

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

LDEV-5425 fix button availability after removal of notebook feature

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

    • -29
    • +0
    ./web/authoring/AdvancedContent.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 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

    • -1
    • +1
    ./web/learning/CombinedAnswersContent.jsp
  1. … 5 more files in changeset.
LDEV-5386 Fix broken IntelliJ path variables

  1. … 3 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-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. … 15 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 reintroduce alert icons

* respect close button option

  1. … 1 more file in changeset.
LDEV-5397 show question descriptions inside card-body instead of card-header

    • -6
    • +6
    ./web/learning/CombinedAnswersContent.jsp
  1. … 11 more files in changeset.
LDEV-5397 show confidence levels' labels horizontally

    • -2
    • +2
    ./web/learning/CombinedAnswersContent.jsp
  1. … 3 more files in changeset.
LDEV-5397 copy-tags

    • -1
    • +1
    ./web/WEB-INF/tags/SubmissionDeadline.tag
  1. … 275 more files in changeset.
LDEV-5397 replace "container-lg" with custom "container-main" class

so it will be easier switching between container's classes in the future if needed

  1. … 22 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 spread changes to tags across all projects

  1. … 151 more files in changeset.
LDEV-5397 bootstrap5 MCQ tool

    • -0
    • +553
    ./web/WEB-INF/tags/StyledRating5.tag
    • -38
    • +17
    ./web/learning/AnswersContent.jsp
    • -84
    • +83
    ./web/learning/CombinedAnswersContent.jsp
    • -22
    • +0
    ./web/learning/SimpleLearnerError.jsp
    • -76
    • +77
    ./web/learning/SingleQuestionAnswersContent.jsp
    • -242
    • +174
    ./web/learning/ViewAnswers.jsp
  1. … 3 more files in changeset.