lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5315 Refresh lesson & sequence tab in monitoring after gate toggle

    • -0
    • +7
    /lams_monitoring/web/gate/gateStatus.jsp
LDEV-5273 Fix allocation of answers being prefixed with "null"

LDEV-4366 Fix Kumalive role detection

    • -1
    • +1
    /lams_learning/web/kumalive/kumalive.jsp
LDEV-213 Do not hardcode IGPS URL

LDEV-4792 Fix optional activity and branching min/max spinners

LDEV-4020 Use prop() instead of attr() in authoring JS code

Newer jQuery version operate with prop(). Using attr() allowed for

example multiple branches to be marked as the default one.

LDEV-5928 Change labels to reflect file submission as 2 step process

LDEV-5081 Make "regular monitoring" button show old monitoring UI

LDEV-5081 Reintroduce old monitoring code to compare with new one

Merge remote-tracking branch 'origin/v4.6' into LDEV-5081

LDEV-4949 Fix stripped of non-break whitespace

LDEV-5309 Fix removing units from numerical question

delete-orphan setting in QbQuestion units causes problems when importing

QbQuestion from XML. JPA does not recognise the collection parent and

fails on save. Another approach to removing units had to be found.

Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

LDEV-5081 Restyle Free jqGrid according to changes made for monitoring

    • -7
    • +14
    /lams_central/web/css/free.ui.jqgrid.custom.css
LDEV-5083 Reintroduce Popper needed for date time picker

    • -0
    • +6
    /lams_central/web/includes/javascript/popper.min.js
Merge remote-tracking branch 'origin/LDEV-5083' into LDEV-5081

LDEV-5081 Merge changes made for monitor in LDEV-5083

    • -23
    • +29
    /lams_build/3rdParty.userlibraries
    • -0
    • +29
    /lams_central/web/css/free.ui.jqgrid.custom.css
    • -1847
    • +1410
    /lams_common/db/sql/create_lams_11_tables.sql
    • -5
    • +3
    /lams_common/db/sql/insert_lams_config_data.sql
    • -4
    • +4
    /lams_common/db/sql/insert_types_data.sql
  1. … 22 more files in changeset.
LDEV-5083 Reintroduce changes for Live Edit

    • -0
    • +1
    /lams_central/web/authoring/authoring.jsp
Merge remote-tracking branch 'origin/v4.6' into LDEV-5083

Conflicts:

lams_build/3rdParty.userlibraries

lams_central/web/authoring/svgGenerator.jsp

LDEV-4769 Updating English, Chinese Simplified

Merge branch 'LDEV-5314' into v4.6

LDEV-5314 Skip exclamation mark if some learners are grouped

Ticket LDEV-3225 introduced a rule that all learners need to be grouped

for a grouping activity to be considered complete. We need to relax this

approach as it produces unnecessary confusion. Now if there are at least

2 groups with learners in them the grouping is considered complete.

Merge branch 'LDEV-5298' into LDEV-5314

LDEV-5298 Make label for Upload Complete more clear

Merge branch 'LDEV-5311' into v4.6

Merge branch 'LDEV-5307' into v4.6

Merge branch 'LDEV-5306' into v4.6

LDEV-5311 Add server URL to change password email

LDEV-5311 When sending emails always run user import in separate thread

LDEV-4769 Updating Chinese Traditional

    • -16
    • +27
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_zh_CN.properties