lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4759 Main page functional

    • -36
    • +34
    /lams_central/conf/scss/_lams_variables.scss
    • -36
    • +34
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -212
    • +228
    /lams_central/web/css/_main_base.scss
  1. … 21 more files in changeset.
LDEV-4767 LDEV-4755 adding labels

Adding labels for use login/out logs and anti virus config

LDEV-4759 Choice of colour schemes blue or purple

    • -5
    • +17
    /lams_central/conf/scss/_lams_variables.scss
    • -2
    • +115
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -0
    • +67
    /lams_central/conf/scss/material-kit-blue-primary.scss
    • -0
    • +11
    /lams_central/conf/scss/material-kit/variables/_brand-blue.scss
    • -0
    • +12490
    /lams_central/web/css/material-kit-blue-primary.css
    • -1
    • +1
    /lams_central/web/css/purple_learner.scss
LDEV-4765 Apply new UI to other question types

    • -0
    • +18
    /lams_tool_assessment/web/common/authoringQuestionHeader.jsp
    • -0
    • +136
    /lams_tool_assessment/web/includes/javascript/authoring-options.js
  1. … 9 more files in changeset.
LDEV-4759 Panels are now cards.

    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Alert.tag
    • -36
    • +18
    /lams_admin/web/WEB-INF/tags/Page.tag
  1. … 492 more files in changeset.
LDEV-4746 Inform author of detected question changes

In MC authoring if a new question or version gets added, the author gets

a pop up displayed.

Further steps are detection of minor changes (update and not create a

new version) and allowing author to choose whether changes are minor or

should lead to new version.

Merge branch 'LDEV-4767' into develop

LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

LDEV-4767 Add IP to login event

LDEV-4731 Adjust parser code for current code state on master

Merge remote-tracking branch 'origin/LDEV-4731' into LDEV-4731

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.