Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java

# lams_tool_assessment/web/pages/monitoring/parts/masterDetailLoadUp.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/summary.jsp

# lams_tool_daco/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_daco/web/pages/monitoring/listRecords.jsp

# lams_tool_forum/web/jsps/monitoring/updatemarks.jsp

# lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

# lams_tool_images/web/pages/monitoring/imagesummary.jsp

# lams_tool_laqa/web/monitoring/PrintAnswers.jsp

# lams_tool_larsrc/web/pages/monitoring/userlist.jsp

# lams_tool_leader/web/pages/monitoring/changeLeaderDialog5.jsp

# lams_tool_leader/web/pages/monitoring/manageLeaders.jsp

# lams_tool_leader/web/pages/monitoring/summary.jsp

# lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

# lams_tool_preview/web/pages/monitoring/rubricspart.jsp

# lams_tool_sbmt/web/monitoring/mark/fileinfo.jsp

  1. … 30 more files in changeset.
LDEV-5456 fix updating image's properties directly from tool's monitoring

  1. … 1 more file in changeset.
LDEV-5424 boostrap5 Image Gallery's monitoring

  1. … 3 more files in changeset.
LDEV-5424 switch to bootstrap5 versions of JS files

  1. … 27 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

  1. … 22 more files in changeset.
LDEV-5442 make monitoring use new starability widget

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

  1. … 150 more files in changeset.
LDEV-5425 Remove "End of activity" notebook from *all* tools

  1. … 517 more files in changeset.
LDEV-4917 Add Italian to Uppy i18n in Image gallery

  1. … 5 more files in changeset.
LDEV-5404 Escaping funny characters that break js

- Image gallery

  1. … 10 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 337 more files in changeset.
Revert "LDEV-5357 Use UUIDs for file downloads"

This reverts commit 2de8f805211b6433aff4efd6fa9275a1b9933033.

  1. … 55 more files in changeset.
LDEV-5357 Use UUIDs for file downloads

  1. … 55 more files in changeset.
LDEV-5298 Improve Uppy and Submit Files UI

Uppy font globally is smaller.

In Submit Files the upload area is thinner and has a distinct

background. The upload button matches its colour.

Fix Uppy language detection in Submit Files.

  1. … 17 more files in changeset.
LDEV-5213 Replace volatile JS imports with their non-cached version

  1. … 93 more files in changeset.
LDEV-5193 Use case-insensitive extension checking for Uppy upload

Also use built-in Uppy extension check where possible.

  1. … 16 more files in changeset.
LDEV-5188 Remove obsolete attributes from TabBody tag

  1. … 83 more files in changeset.
LDEV-4917 Add error pop up on attempt of uploading incorrect file

  1. … 10 more files in changeset.
LDEV-4917 Add Uppy uploads to Image Gallery learning and monitoring

  1. … 6 more files in changeset.
LDEV-4932 Passing CSRF token as a post rather than get

  1. … 41 more files in changeset.
LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

  1. … 109 more files in changeset.
LDEV-4932 Add CSRF prevention for monitor Image gallery

CSRF prevention for Monitor actions:

- toogle visibility

- add image

- edit image properties

  1. … 7 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

  1. … 388 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 504 more files in changeset.
LDEV-4440 removed debugger from jsp file

LDEV-4440 Scratchie autosave fix

  1. … 62 more files in changeset.
Merge Asia's Image Gallery

  1. … 73 more files in changeset.
LDEV-4440 Fixed upload and remove methods

  1. … 12 more files in changeset.
LDEV-4440 Authoring migration in progress

  1. … 17 more files in changeset.
LDEV-4440 Started Images Gallery migration to Spring

  1. … 45 more files in changeset.