lams-github

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

Conflicts:

lams_build/3rdParty.userlibraries

    • -11
    • +13
    /lams_build/3rdParty.userlibraries
LDEV-5083 Add missing web resources

    • -0
    • +6
    /lams_central/web/css/bootstrap-select.min5.css
    • -1
    • +1
    /lams_central/web/css/bootstrap4.min.css
    • -0
    • +61
    /lams_central/web/css/components-responsive.css
    • -0
    • +124
    /lams_central/web/css/free.ui.jqgrid.custom.css
    • -0
    • +184
    /lams_central/web/css/jquery.tablesorter.custom.css
    • -0
    • +1
    /lams_central/web/images/components/arrow.svg
    • -0
    • +3
    /lams_central/web/images/components/arrow2.svg
    • -0
    • +6
    /lams_central/web/images/components/assess-icon.svg
    • -0
    • +10
    /lams_central/web/images/components/assess-icon1.svg
    • -0
    • +3
    /lams_central/web/images/components/assess-icon2.svg
    • -0
    • +3
    /lams_central/web/images/components/assess-icon3.svg
    • -0
    • +3
    /lams_central/web/images/components/assess-icon4.svg
    • -0
    • +3
    /lams_central/web/images/components/assess-icon5.svg
    • -0
    • +3
    /lams_central/web/images/components/assess-icon6.svg
    • -0
    • +4
    /lams_central/web/images/components/assess-icon7.svg
  1. … 18 more files in changeset.
LDEV-5277 On demand use email as LAMS login during registration

LDEV-5277 Enforce usage of prefix in user creation as per configuration

LDEV-5294 Minor UI improvement

Minor UI improvement following changes done for LDEV-5298

    • -1
    • +1
    /lams_learning/web/optionsActivity.jsp
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.

    • -0
    • +1
    /lams_admin/web/import/importGroups.jsp
    • -0
    • +1
    /lams_admin/web/import/importexcel.jsp
    • -0
    • +4
    /lams_central/web/css/uppy.custom.css
    • -0
    • +2
    /lams_central/web/qb/importQuestionsXml.jsp
    • -0
    • +1
    /lams_central/web/toolcontent/import.jsp
    • -0
    • +1
    /lams_tool_forum/web/jsps/learning/create.jsp
    • -0
    • +1
    /lams_tool_forum/web/jsps/learning/edit.jsp
    • -0
    • +1
    /lams_tool_forum/web/jsps/learning/reply.jsp
  1. … 3 more files in changeset.
Merge branch 'LDEV-5298' into v4.6

LDEV-5298 Make Add button more obvious

Merge branch 'LDEV-5297' into v4.6

LDEV-5297 Do not include time zone in calculating duration of item

LDEV-5296 Improve CSS of embedded images and files

LDEV-5219 Change gate check flow in Peer Review

Criteria like mark hedging need to be validated before going to next

step, which can be finishing the activity. Current "check gate" JS code

does not allow it. Once the finish button is clicked, a check is made

and learner gets pushed to the next activity and whether his/her results

were saved or not.

Now we display results screen even if "show own ratings" or "show

ratings given to other learners" options are off. This allows to do

validation and store last criterion in DB. It also allows to show redo

questions button if this feature is on.

If there is no summary nor redo button, the results page automatically

attempts to go to next activity. If it succeeds, learner does not even

notice the blank results screen. If after Peer Activity there is a

closed gate, the learner will see single button and a message.

LDEV-5296 adding additional images and media previews

Merge branch 'LDEV-5296' into v4.6

LDEV-5296 Embed images and PDFs directly in Share Resources page

Merge branch 'LDEV-5295' into v4.6

LDEV-5295 Filter out non-learners from Gradebook

LDEV-4434 Remove debugging information

LDEV-5294 minor UI improvements

Merge branch 'LDEV-5292' into v4.6

LDEV-5293 Add support for QTI 2.2 import

LDEV-5294: minor UI improvements

LDEV-5290 Improve detection of multiple tabs being open on autosave

    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_doku/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
    • -1
    • +1
    /lams_tool_laqa/web/WEB-INF/tags/Page.tag
  1. … 18 more files in changeset.
LDEV-4271 Improve layout of "answers may be disclosed" info panel

LDEV-5292 Fix exception when activity is getting saved for first time

LDEV-5292 Sync RAT activities questions in TBL sequences

Merge branch 'LDEV-5291' into v4.6

LDEV-4769 Updating English, Norwegian, Greek, Spanish

LDEV-5291 Allow filtering question in QB search by presence in LD

LDEV-5287 increase the default max length for group_concat

Otherwise some long strings cannot be concatenated.

See

https://dev.mysql.com/doc/refman/8.0/en/server-system-variables.html#sysvar_group_concat_max_len