lams_tool_task

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

    • -2
    • +2
    ./web/pages/learning/parts/commentlist.jsp
    • -3
    • +2
    ./web/pages/learning/parts/filelist.jsp
    • -2
    • +2
    ./web/pages/learning/parts/itemlist.jsp
  1. … 147 more files in changeset.
LDEV-5397 Updating labels Greek, Japanese, German, English

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

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

    • -11
    • +0
    ./web/pages/learning/parts/notebook.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 make sure all buttons have proper "type" attribute

    • -2
    • +2
    ./web/pages/learning/parts/addtask.jsp
  1. … 23 more files in changeset.
LDEV-5397 Updating labels

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

    • -4
    • +6
    ./web/pages/learning/parts/itemlist.jsp
  1. … 6 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 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

    • -1
    • +2
    ./web/pages/learning/parts/itemlist.jsp
  1. … 14 more files in changeset.
LDEV-5345 Adding and modifying labels based on changes for bootstrap 5

  1. … 239 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 import bootstrap5.scss into components.scss

* Subsequently import components.scss into components-learner.scss

* It will allow using bootstrap5 CSS rules in components CSS classes

    • -3
    • +1
    ./web/pages/learning/parts/addtask.jsp
  1. … 49 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. … 78 more files in changeset.
LDEV-5397 copy-tags

    • -15
    • +12
    ./web/WEB-INF/tags/NotebookReedit.tag
  1. … 123 more files in changeset.
LDEV-5397 bootstrap5 related improvements and fixes

    • -1
    • +1
    ./web/pages/learning/parts/commentlist.jsp
  1. … 27 more files in changeset.
LDEV-5397 redesign comments UI

    • -2
    • +1
    ./web/pages/learning/parts/addtask.jsp
    • -2
    • +1
    ./web/pages/learning/parts/commentlist.jsp
    • -3
    • +3
    ./web/pages/learning/parts/itemlist.jsp
  1. … 14 more files in changeset.
LDEV-5397 bootstrap5 Tasklist tool

    • -123
    • +86
    ./web/pages/learning/learning.jsp
    • -27
    • +44
    ./web/pages/learning/parts/addtask.jsp
    • -41
    • +36
    ./web/pages/learning/parts/commentlist.jsp
    • -14
    • +21
    ./web/pages/learning/parts/filelist.jsp
    • -42
    • +39
    ./web/pages/learning/parts/itemdetails.jsp
    • -34
    • +37
    ./web/pages/learning/parts/itemlist.jsp
    • -57
    • +7
    ./web/pages/learning/parts/notebook.jsp
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. … 131 more files in changeset.
LDEV-5397 switch to portrait5.js

    • -1
    • +1
    ./web/pages/learning/parts/commentlist.jsp
  1. … 4 more files in changeset.
LDEV-5397 Switch to server side redirects

  1. … 20 more files in changeset.