Clone
 

fiona malikoff <fiona.malikoff@gmail.com> in lams-github

LDEV-4886 Addition of ids and similar to support automated testing

Merge branch 'v4.0' into LDEV-4886

Merge branch 'v4.0' into LDEV-4886

    • -4
    • +4
    /lams_central/web/passwordChangeContent.jsp
LDEV-4886 Automated tests for v4.0

    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +2
    /lams_central/web/passwordChangeOkContent.jsp
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -1
    • +1
    /lams_monitoring/web/gate/gateInfo.jsp
    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
  1. … 5 more files in changeset.
LDEV-4931 Adding ids to support Admin tests

    • -1
    • +1
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +2
    /lams_central/web/passwordChangeOkContent.jsp
    • -2
    • +2
    /lams_central/web/profile/editprofile.jsp
    • -1
    • +1
    /lams_central/web/profile/portrait.jsp
LDEV-4911 Added ids to support automated testing

    • -1
    • +1
    /lams_learning/web/gate/gateDescription.jsp
    • -2
    • +2
    /lams_monitoring/web/gate/gateInfo.jsp
Merge branch 'master' into LDEV-4886

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4922 Email results are generated for comment only rating activity

LDEV-4887 QTI import done within TBL template

LDEV-4911 Adding ides to test monitor starting new lesson

    • -1
    • +1
    /lams_monitoring/web/gate/gateStatus.jsp
Merge branch 'master' into LDEV-4886

Merge branch 'master' into develop

# Conflicts:

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

Merge branch 'LDEV-4907' Password change correctly audited

LDEV-4907 Password changes corrected in audit

LDEV-4911 Create structure for monitoring learning

LDEV-4887 Adding id, classes to make automated testing faster

    • -1
    • +1
    /lams_central/web/authoring/authoring.jsp
Merge branch 'master' into develop

LDEV-4877 Bootstrap tourist replaced tour for Bootstrap 3.4.1

    • -22
    • +0
    /lams_central/web/css/bootstrap-tour.min.css
    • -0
    • +25
    /lams_central/web/css/bootstrap-tourist.min.css
    • -32
    • +42
    /lams_monitoring/web/monitorTour.jsp
Merge branch 'master' into develop

LDEV-4837 Removing white line that appears on iPad partway down dialog

    • -1
    • +0
    /lams_central/web/css/_learner_base.scss
LDEV-4829 Supports multiple response app ex, improved font on TRA chart

Merge branch 'master' into develop

    • -5
    • +15
    /lams_central/web/css/_authoring_base.scss
LDEV-4829 Cosmetic button changes, Assessment questions not numbered

    • -5
    • +15
    /lams_central/web/css/_authoring_base.scss
LDEV-4829 Marks for iRA, tRa and AE go to Gradebook

LDEV-4829 Deletion of unwanted RAT and Application Exercises supported.

LDEV-4829 Error msg and text improvements, supports mark entry

Merge branch 'master' into develop

LDEV-4829 Pictures in Questions in QTI File import successfully