lams_gradebook

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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

    • -5
    • +31
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 93 more files in changeset.
LDEV-4828 Paging and search in QB collections jqGrid

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

    • -3
    • +10
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 35 more files in changeset.
LDEV-4813 Use tables only if a condition is provided

If tables are used and no condition which uses them is provided, a full

outer join is run. It takes ages to complete on a large instance.

Merge remote-tracking branch 'origin/master' into develop

LKC-179 Descent into branching when displaying activities in gradebook

LKC-179 Change activity soring in gradebook to reflect sequence in LD

LDEV-4609 Prevent NPE when an activity progress was not found in archive

LDEV-4786 Adjust outcome CSS in authoring. Confirm outcome removal.

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

    • -2
    • +18
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  1. … 62 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.

    • -14
    • +16
    ./web/gradebookCourseLearner.jsp
    • -16
    • +26
    ./web/gradebookCourseMonitor.jsp
    • -16
    • +14
    ./web/includes/css/gradebook.scss
  1. … 45 more files in changeset.
LDEV-4776 Let monitors see course gradebook for their lessons

Group manager sees all lessons in a course. Monitor sees only ones he is

a monitor in.

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

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

    • -5
    • +5
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -8
    • +6
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 386 more files in changeset.
LDEV-4774 Fix role check for subcourse gradebook

  1. … 1 more file in changeset.
LDEV-4759 Tour and portrait pop ups appear correctly.

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

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

  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-4678 Push some util methods to the service layer

Certain static util methods (mainly from LearningWebUtil.java) expect

service beans as a parameter. It was changed by pushing those methods to

the appropriate service layer.

  1. … 29 more files in changeset.
LDEV-4748 Remove obsolete changeStyle.js

  1. … 48 more files in changeset.
LDEV-4730 Updating labels for Gradebook

Updating English, Spanish, Norwegian and Greek.