Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4834 Use panel-less LO widget in QB question authoring

    • -10
    • +33
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 69 more files in changeset.
LDEV-4834 Initial implementation of Learning Outcomes in Question Bank

    • -10
    • +19
    ./WEB-INF/tags/OutcomeAuthor.tag
  1. … 50 more files in changeset.
Merge branch 'develop' into LDEV-4759

# Conflicts:

# lams_central/web/authoring/template/tool/mcquestion.jsp

# lams_central/web/authoringConfirm.jsp

# lams_central/web/css/_learner_base.scss

# lams_central/web/profile/editprofile.jsp

# lams_learning/web/optionsActivity.jsp

# lams_monitoring/web/monitor.jsp

# lams_monitoring/web/tblmonitor/sequence.jsp

# lams_monitoring/web/tblmonitor/teams.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/common/monitoringheader.jsp

# lams_tool_preview/web/pages/monitoring/criteria.jsp

# lams_tool_preview/web/pages/monitoring/reflections.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/tra.jsp

# lams_tool_task/web/common/monitorheader.jsp

  1. … 93 more files in changeset.
LDEV-4819 Allow disabling Learning Outcome quick add in sysadmin

  1. … 35 more files in changeset.
LKC-179 Change activity soring in gradebook to reflect sequence in LD

  1. … 2 more files in changeset.
LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

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

  1. … 63 more files in changeset.
LDEV-4440 Fix URL to gradebook previous attempts

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. … 118 more files in changeset.
LDEV-4759 Gradebook and jqGrid restyled.

  1. … 45 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
    ./WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag
    • -8
    • +6
    ./WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 386 more files in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

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

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

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

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

    • -2
    • +4
    ./WEB-INF/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-4748 Remove obsolete changeStyle.js

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

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

  1. … 30 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.
Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

  1. … 17 more files in changeset.
LDEV-4609 Adjust columns for previous attempts in monitor activity view

  1. … 2 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. … 14 more files in changeset.
Merge remote-tracking branch 'origin/LDEV-4609'

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java

lams_gradebook/web/gradebookMonitor.jsp

  1. … 2 more files in changeset.
LDEV-4684 Remove time taken search in gradebook