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.

  1. … 87 more files in changeset.
Merge branch 'master' into develop

LDEV-4788 All learning outcomes are now global

  1. … 21 more files in changeset.
LDEV-4786 Allow creating learning outcomes on the fly

  1. … 63 more files in changeset.
LDEV-4759 Restyle File Upload widget, cleaned up comments in CSS files

  1. … 34 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. … 43 more files in changeset.
LDEV-4759 Tablesorter, Learner Progress Bar tweaked

  1. … 120 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 50 more files in changeset.
LDEV-4759 Togglebutton and checkbox css functional

  1. … 81 more files in changeset.
LDEV-4759 DateTimePicker and Accordians updated

    • -9
    • +9
    ./tags/AuthoringRatingAllStyleCriteria.tag
  1. … 386 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

  1. … 43 more files in changeset.
LDEV-4759 Main page functional

  1. … 35 more files in changeset.
LDEV-4759 Panels are now cards.

  1. … 502 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4731' into LDEV-4731

LDEV-4759 Authoring and monitoring tabs working

  1. … 311 more files in changeset.
LDEV-4760 Fixed spacing in authoring criteria entry panel

    • -2
    • +4
    ./tags/AuthoringRatingAllStyleCriteria.tag
  1. … 32 more files in changeset.
LDEv-4759 Material Kit for Bootstrap 4 files installed into lams_central

  1. … 262 more files in changeset.
LDEV-4735 Fix an URL in learning outcomes in authoring

  1. … 31 more files in changeset.
LDEV-4731 Initial implementation of enrolments parser

  1. … 1 more file in changeset.
LDEV-4705 Remove references to Group Admin role from web.xml

  1. … 30 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

  1. … 10 more files in changeset.
LDEV-4710 Add config setting to enable "Forgot your password?" option

Also if people try to get to the login page by going to the URL

directly, we display a 404 error message.

  1. … 5 more files in changeset.
LDEV-4669 Switch to using placeholder attribute

Also stop copying tags to lams_tool_bbb

  1. … 33 more files in changeset.
LDEV-4691 Fix file uploads

MultipartFilter was introduced for LAMS servlets to work with Spring

MVC. It appears that for WildFly 14 it is not required anymore.

Furthermore, without it will not work without extra configuration. It

was removed.

Also a controller method was rewritten to Spring MVC style.

  1. … 1 more file 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. … 14 more files in changeset.
LDEV-4440 Fix comments feature

  1. … 36 more files in changeset.
LDEV-4440 also look for comments and workspace controllers

LDEV-4440 Switch servlets to using autowired service beans

Besides, RegisterAction was renamed to RegisterServlet. And one

remaining constant was moved from AuthoringConstants to CentralConstants

with subsequent removal of AuthoringConstants.java.

  1. … 29 more files in changeset.
LDEV-4440 Fix Spring MVC related issues with signup pages

  1. … 10 more files in changeset.