Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
    • -0
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 86 more files in changeset.
LDEV-4786 Removing mapping does not remove outcome

Also limit outcome editing to sysadmin only.

    • -1
    • +3
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4788 All learning outcomes are now global

    • -6
    • +0
    ./language/lams/ApplicationResources.properties
    • -6
    • +6
    ./language/lams/ApplicationResources_el_GR.properties
    • -6
    • +6
    ./language/lams/ApplicationResources_en_AU.properties
    • -6
    • +6
    ./language/lams/ApplicationResources_es_ES.properties
  1. … 18 more files in changeset.
LDEV-4787 Fix incorrect spacing when copying activities in authoring

    • -1
    • +1
    ./language/lams/ApplicationResources.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./language/lams/ApplicationResources_no_NO.properties
  1. … 1 more file in changeset.
LDEV-4777 Further development of QB search feature

* Search QB interface is now available in Q&A tool, but questions of

this type (Essay) can only be added via DB for now

    • -0
    • +9
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 14 more files in changeset.
LDEV-4759 Autocomplete restyling, started Assessment updates

  1. … 43 more files in changeset.
LDEV-4759 Fixing responsive behaviour on front page and tabs.

  1. … 41 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 121 more files in changeset.
LDEV-4759 Improved styling for accordians

  1. … 3 more files in changeset.
LDEV-4759 Main page restyled.

    • -10
    • +12
    ./scss/_lams_variables_purple.scss
  1. … 8 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

    • -840
    • +0
    ./scss/_bootstrap-variables.scss
    • -10
    • +15
    ./scss/material-kit/_checkboxes.scss
    • -9
    • +14
    ./scss/material-kit/_togglebutton.scss
  1. … 79 more files in changeset.
LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ko_KR.properties
  1. … 11 more files in changeset.
LDEV-4771 Remove close activity authoring confirmation screen

The JSP that controls the close action stays as it works differently in

various environments (authoring, monitoring, IE). It is just run

immediately instead of waiting for button click.

    • -1
    • +0
    ./language/lams/ApplicationResources.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ar_JO.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_cs_CZ.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_cy_GB.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_da_DK.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_de_DE.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_el_GR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_en_AU.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_es_MX.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_fr_FR.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_id_ID.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_it_IT.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ja_JP.properties
    • -1
    • +0
    ./language/lams/ApplicationResources_ko_KR.properties
  1. … 11 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 42 more files in changeset.
LDEV-4769 Updating Greek

    • -2
    • +91
    ./language/lams/ApplicationResources_el_GR.properties
LDEV-4759 Main page functional

    • -36
    • +34
    ./scss/_lams_variables_purple.scss
  1. … 34 more files in changeset.
LDEV-4759 Choice of colour schemes blue or purple

    • -2
    • +115
    ./scss/_lams_variables_purple.scss
    • -0
    • +67
    ./scss/material-kit-blue-primary.scss
    • -0
    • +39
    ./scss/material-kit/_variables-blue.scss
    • -0
    • +11
    ./scss/material-kit/variables/_brand-blue.scss
  1. … 4 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 506 more files in changeset.
LDEV-4759 Authoring and monitoring tabs working

  1. … 314 more files in changeset.
LDEV-4759 Upgraded bootstrap-tour, dialogs opening at appropriate size

  1. … 17 more files in changeset.
LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

    • -118
    • +2
    ./scss/_lams_variables_purple.scss
    • -0
    • +66
    ./scss/material-kit.scss
    • -0
    • +53
    ./scss/material-kit/_alerts.scss
    • -0
    • +43
    ./scss/material-kit/_badges.scss
    • -0
    • +228
    ./scss/material-kit/_buttons.scss
    • -0
    • +327
    ./scss/material-kit/_cards.scss
    • -0
    • +95
    ./scss/material-kit/_carousel.scss
    • -0
    • +201
    ./scss/material-kit/_checkboxes.scss
    • -0
    • +66
    ./scss/material-kit/_core-bootstrap.scss
    • -0
    • +10
    ./scss/material-kit/_custom-forms.scss
    • -0
    • +121
    ./scss/material-kit/_drawer.scss
    • -0
    • +205
    ./scss/material-kit/_dropdown.scss
    • -0
    • +164
    ./scss/material-kit/_example-pages.scss
  1. … 249 more files in changeset.
Merge ordered branching LDEV-4587 into develop

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 23 more files in changeset.
LDEV-4755 Scan when importing LDs

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 3 more files in changeset.
LDEV-4510 Adding lables for TBL template

    • -2
    • +49
    ./language/lams/ApplicationResources.properties
    • -2
    • +49
    ./language/lams/ApplicationResources_en_AU.properties
LDEV-4739 updating labels for central

Updating Greek, English and Español

    • -109
    • +48
    ./language/lams/ApplicationResources.properties
    • -9
    • +19
    ./language/lams/ApplicationResources_el_GR.properties
    • -61
    • +48
    ./language/lams/ApplicationResources_en_AU.properties
    • -9
    • +48
    ./language/lams/ApplicationResources_es_ES.properties
LDEV-4726 Licenses updated to Creative Commons 4.0

    • -0
    • +3
    ./language/lams/ApplicationResources.properties
  1. … 20 more files in changeset.
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/web/ForgotPasswordServlet.java

lams_central/web/forgotPassword.jsp

lams_central/web/forgotPasswordChange.jsp

lams_central/web/forgotPasswordProc.jsp

lams_tool_assessment/web/pages/learning/results.jsp

    • -2
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 10 more files in changeset.
LDEV-4711 Show only generic message when resetting passwords

    • -2
    • +3
    ./language/lams/ApplicationResources_en_AU.properties
  1. … 4 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/web/WEB-INF/struts-config.xml

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

    • -1
    • +43
    ./language/lams/ApplicationResources.properties
  1. … 14 more files in changeset.
LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

    • -0
    • +1
    ./language/lams/ApplicationResources.properties
  1. … 10 more files in changeset.