lams_tool_scratchie

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5440 Refactor packages of imported classes

  1. … 470 more files in changeset.
LDEV-5440 Rewrite config files and library references

  1. … 941 more files in changeset.
LDEV-5397 add placeholder to reduce blicking of the lesson name after transition page

  1. … 33 more files in changeset.
Merge branch 'LDEV-5397' into v4.8

# Conflicts:

# lams_tool_whiteboard/web/pages/learning/learning.jsp

LDEV-5397 Enhanced mobile experience

  1. … 35 more files in changeset.
LDEV-5397 Enhanced mobile experience

  1. … 31 more files in changeset.
LDEV-5397 fix expanding/collapsing icons

LDEV-5437 prevent questions and instructions to be copy/paste or print

    • -0
    • +11
    ./web/includes/css/scratchie-learning.scss
LDEV-5437 prevent questions and instructions to be copy/paste or print

    • -0
    • +11
    ./web/includes/css/scratchie-learning.scss
LDEV-5397 Fix scratchies not being revealed for non-leaders

    • -3
    • +12
    ./web/pages/learning/scratchies.jsp
LDEV-5397 copy-tags

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

  1. … 147 more files in changeset.
LDEV-5397 fix portraits sources

  1. … 1 more file in changeset.
LDEV-5397 Enhanced mobile experience

    • -3
    • +21
    ./web/includes/css/scratchie-learning.scss
  1. … 7 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

  1. … 30 more files in changeset.
LDEV-5420 Add questions print button to Scratchie

    • -94
    • +91
    ./web/pages/authoring/authoring.jsp
  1. … 1 more file in changeset.
LDEV-5397 copy-tags

  1. … 31 more files in changeset.
LDEV-5397 round scratchies

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

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

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

    • -14
    • +3
    ./web/pages/learning/questionlist.jsp
  1. … 505 more files in changeset.
LDEV-5363 Make RAT questions sync optional

    • -1
    • +3
    ./web/pages/authoring/parts/itemlist.jsp
  1. … 8 more files in changeset.
LDEV-5433 Squash DB patches and update versions

    • -1
    • +2
    ./db/sql/create_lams_tool_scratchie.sql
  1. … 101 more files in changeset.
LDEV-5397 fix inability to double click when such option is ON

LDEV-5401 Display individual extensions in time limit widget

    • -2
    • +2
    ./web/pages/monitoring/studentChoices5.jsp
  1. … 5 more files in changeset.
LDEV-5431 Reset activity completion on force uncomplete in Monitor

  1. … 38 more files in changeset.
LDEV-5397 improve burning questions' CSS at the results page

    • -28
    • +42
    ./web/pages/learning/results.jsp