lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4731, LDEV-4761 Create users and orgs via integrated server

Provisioned users will authenticate through Azure using SAML. They need

to go through an integrated server, so they need to be already

provisioned as external users.

Merge branch 'LDEV-4767' into develop

LDEV-4767 Add login and logout event logs

LDEV-4759 Authoring and monitoring tabs working

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/TabBody.tag
    • -36
    • +27
    /lams_admin/web/WEB-INF/tags/Tabs.tag
    • -1
    • +1
    /lams_admin/web/policies/userConsents.jsp
    • -4
    • +17
    /lams_central/conf/scss/_lams_variables.scss
  1. … 301 more files in changeset.
LDEV-4765 Add sorting of the question answers

Also some other improvements.

    • -0
    • +3
    /lams_central/web/includes/javascript/Sortable.js
LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

    • -8
    • +12
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +0
    /lams_central/web/authoring/authoring.jsp
    • -2
    • +2
    /lams_central/web/css/bootstrap-tour.min.css
    • -0
    • +188
    /lams_central/web/css/theme.bootstrap_4.css
    • -18
    • +18
    /lams_monitoring/web/css/_tblmonitor_base.scss
  1. … 3 more files in changeset.
Merge branch 'develop' into LDEV-4759

LDEV-4651 Scheduled lesson with rescheduled gate can start now

Merge remote-tracking branch 'origin/master' into develop

Merge branch 'LDEV-4763'

LDEV-4763 Process LD annotations when importing a LD

Merge LDEV-4759, LDEV-4760, LDEV-4764 into develop

LDEV-4764 Labels use standard font-weight overriding Bootstrap change

    • -4
    • +4
    /lams_central/web/css/_learner_base.scss
LDEV-4760 Fixed spacing in authoring criteria entry panel

    • -0
    • +8
    /lams_central/web/css/_learner_base.scss
  1. … 18 more files in changeset.
LDEV-4651 Scheduled gate in scheduled lesson can be viewed/rescheduled.

Merge remote-tracking branch 'origin/master' into develop

LDEV-4696 Reintroduce a failsafe for missing branch activities set

There are normal situations where the collection is null. It needs to be

checked before attempting to add something.

LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

    • -38
    • +30
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -45
    • +48
    /lams_central/conf/scss/_lams_variables.scss
    • -118
    • +2
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -114
    • +119
    /lams_central/conf/scss/_mixins.scss
    • -0
    • +66
    /lams_central/conf/scss/material-kit.scss
    • -0
    • +53
    /lams_central/conf/scss/material-kit/_alerts.scss
    • -0
    • +43
    /lams_central/conf/scss/material-kit/_badges.scss
    • -0
    • +228
    /lams_central/conf/scss/material-kit/_buttons.scss
    • -0
    • +327
    /lams_central/conf/scss/material-kit/_cards.scss
    • -0
    • +95
    /lams_central/conf/scss/material-kit/_carousel.scss
  1. … 249 more files in changeset.
Merge ordered branching LDEV-4587 into develop

    • -0
    • +6
    /lams_central/web/authoring/authoring.jsp
    • -0
    • +5
    /lams_central/web/css/_authoring_base.scss
    • -0
    • +1
    /lams_central/web/css/_progressBar_base.scss
  1. … 9 more files in changeset.
LDEV-4765 introducing new question authoring UI

    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
QB_UI introducing new question authoring UI

    • -0
    • +363
    /lams_central/web/ckeditor/plugins/confighelper/plugin.js
Merge remote-tracking branch 'origin/master' into develop

LDEV-4721 Fix version filter method names

Merge remote-tracking branch 'origin/master' into develop

Merge branch 'LDEV-4757'

LDEV-4757 Fix group overwriting with same UIID

Groups' UIIDs were not taken into account when calculating max UIID for

opened LD. Sometimes an existing UIID got generated and it overwrote an

existing group.

Also adjust new group naming.

LDEV-4746 Introduce QB service and DAO

LDEV-4746 Move QB entities to another package

  1. … 5 more files in changeset.
Merge remote-tracking branch 'origin/master' into develop

Merge branch 'LDEV-4758'