lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Improve contrast

    • -10
    • +10
    /lams_central/web/css/components.scss
LDEV-5397 Improved contrast

    • -7
    • +8
    /lams_central/conf/scss/_lams_variables.scss
Merge branch 'v4.8' of https://github.com/lamsfoundation/lams into v4.8

LDEV-5397 round scratchies

LDEV-5420 Add print questions page

    • -0
    • +104
    /lams_tool_assessment/web/pages/authoring/printQuestions.jsp
Merge remote-tracking branch 'origin/v4.7' into v4.8

# Conflicts:

# lams_common/db/sql/insert_lams_config_data.sql

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

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

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

    • -6
    • +2
    /lams_common/db/sql/insert_lams_config_data.sql
LDEV-5397 Updating labels MCQ

LDEV-5397 Updating labels

Merge branch 'LDEV-5425' into v4.8

LDEV-5425 fix button availability after removal of notebook feature

    • -12
    • +10
    /lams_tool_vote/web/learning/AllNominations.jsp
    • -34
    • +34
    /lams_tool_vote/web/learning/AnswersContent.jsp
LDEV-5433 Fix Share Resources DB schema after squashing SQL patches

    • -6
    • +4
    /lams_tool_larsrc/db/sql/create_lams_tool_rsrc.sql
LDEV-4534 Fix error for missing Bootstrap 3 Popover module

We never use x-editable with popovers, always inline.

Plus we probably need to use something else as the last version was released 9 years ago and it does not support Boostrap 5.

Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# 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

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. … 20 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. … 20 more files in changeset.
Merge branch 'LDEV-5425' into LDEV-5397

LDEV-5425 copy-tags

    • -107
    • +0
    /lams_admin/web/WEB-INF/tags/Notebook.tag
    • -67
    • +0
    /lams_admin/web/WEB-INF/tags/NotebookReedit.tag
    • -8
    • +0
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -107
    • +0
    /lams_gradebook/web/WEB-INF/tags/Notebook.tag
    • -8
    • +0
    /lams_gradebook/web/WEB-INF/tlds/lams/lams.tld
    • -107
    • +0
    /lams_learning/web/WEB-INF/tags/Notebook.tag
    • -8
    • +0
    /lams_learning/web/WEB-INF/tlds/lams/lams.tld
    • -107
    • +0
    /lams_monitoring/web/WEB-INF/tags/Notebook.tag
  1. … 144 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

    • -67
    • +0
    /lams_central/web/WEB-INF/tags/NotebookReedit.tag
    • -8
    • +0
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
  1. … 505 more files in changeset.
Merge branch 'LDEV-5363' into v4.7

LDEV-5363 Make RAT questions sync optional

LDEV-5397 Allow jumping to incomplete activity in Preview mode

Also open Preview in separate tab

LDEV-5433 Squash DB patches and update versions

    • -1388
    • +1540
    /lams_common/db/sql/create_lams_11_tables.sql
    • -116
    • +128
    /lams_common/db/sql/create_quartz_table.sql
    • -7
    • +3
    /lams_common/db/sql/insert_lams_config_data.sql
    • -1
    • +2
    /lams_common/db/sql/insert_lams_users.sql
    • -11
    • +12
    /lams_common/db/sql/insert_types_data.sql
  1. … 93 more files in changeset.
LDEV-5430 Do not shuffle questions nor answers in learner results

LDEV-4657 Prevent errors when scrolling Mindmap on Chrome

They had to do with wheel events being registered as passive

LDEV-5397 use the same icons for gates as for all other activities

LDEV-5397 fix inability to double click when such option is ON

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.

LDEV-5431 Do not remove from groups and leaders on "Keep content"

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