lams_central

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'v4.8' into LDEV-5424

# Conflicts:

# lams_admin/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/WEB-INF/tags/PageLearner.tag

# lams_central/web/includes/javascript/rating5.js

# lams_gradebook/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/WEB-INF/tags/PageLearner.tag

# lams_learning/web/css/components-learner.scss

# lams_monitoring/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/WEB-INF/tags/PageLearner.tag

# lams_tool_assessment/web/pages/learning/results/essay.jsp

# lams_tool_assessment/web/pages/monitoring/monitoring.jsp

# lams_tool_assessment/web/pages/monitoring/parts/advanceoptions.jsp

# lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

# lams_tool_assessment/web/pages/monitoring/statisticpart.jsp

# lams_tool_chat/web/WEB-INF/tags/PageLearner.tag

# lams_tool_daco/web/WEB-INF/tags/PageLearner.tag

# lams_tool_doku/web/WEB-INF/tags/PageLearner.tag

# lams_tool_forum/web/WEB-INF/tags/PageLearner.tag

# lams_tool_gmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/WEB-INF/tags/PageLearner.tag

# lams_tool_images/web/pages/learning/parts/commentsarea.jsp

# lams_tool_imscc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_lamc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_laqa/web/WEB-INF/tags/PageLearner.tag

# lams_tool_larsrc/web/WEB-INF/tags/PageLearner.tag

# lams_tool_leader/web/WEB-INF/tags/PageLearner.tag

# lams_tool_mindmap/web/WEB-INF/tags/PageLearner.tag

# lams_tool_nb/web/WEB-INF/tags/PageLearner.tag

# lams_tool_notebook/web/WEB-INF/tags/PageLearner.tag

# lams_tool_pixlr/web/WEB-INF/tags/PageLearner.tag

# lams_tool_preview/web/WEB-INF/tags/PageLearner.tag

# lams_tool_sbmt/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scratchie/web/WEB-INF/tags/PageLearner.tag

# lams_tool_scribe/web/WEB-INF/tags/PageLearner.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/PageLearner.tag

# lams_tool_survey/web/WEB-INF/tags/PageLearner.tag

# lams_tool_task/web/WEB-INF/tags/PageLearner.tag

# lams_tool_vote/web/WEB-INF/tags/PageLearner.tag

# lams_tool_whiteboard/web/WEB-INF/tags/PageLearner.tag

# lams_tool_wiki/web/WEB-INF/tags/PageLearner.tag

# lams_tool_zoom/web/WEB-INF/tags/PageLearner.tag

# lams_www/web/WEB-INF/tags/PageLearner.tag

  1. … 13 more files in changeset.
LDEV-5200 Fix branching arranging in authoring

LDEV-5445 proper support for mode="teacher" (which is open learning interface from monitoring)

* Hide PageLearner's header if mode="teacher"

  1. … 52 more files in changeset.
LDEV-3115 Fix group creation on LD save in authoring

LDEV-3115 Fix group removal on LD save in authoring

It seems that Hibernate does not like having entities violating unique keys in one collection. Even for a while and even though afterward the collection contains only unique entities.

  1. … 1 more file in changeset.
LAI-11 Add AI PBL wizard

Refactor code of other AI wizards.

    • -0
    • +57
    ./web/templates/pbl/aiPblAnalysisContentTemplate.html
    • -0
    • +21
    ./web/templates/pbl/aiPblAnalysisDocumentTemplate.html
    • -0
    • +15
    ./web/templates/pbl/aiPblDiscussionContentTemplate.html
    • -0
    • +13
    ./web/templates/pbl/aiPblDiscussionDocumentTemplate.html
    • -0
    • +14
    ./web/templates/pbl/aiPblIntroductionTemplate.html
    • -0
    • +8
    ./web/templates/pbl/aiPblProblemTemplate.html
    • -0
    • +9
    ./web/templates/pbl/aiPblReportTemplate.html
    • -0
    • +23
    ./web/templates/pbl/aiPblResearchTemplate.html
  1. … 2 more files in changeset.
LDEV-5424 tag's title attribute is no longer required

    • -4
    • +7
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 6 more files in changeset.
LDEV-5424 bootstrap5 Assessment's monitoring

    • -12
    • +35
    ./web/WEB-INF/tags/PageMonitor.tag
    • -1
    • +27
    ./web/css/free.ui.jqgrid.custom.scss
  1. … 26 more files in changeset.
LDEV-5440 Further code upgrade to conform new WF libraries

  1. … 54 more files in changeset.
LDEV-5440 Update Hibernate queries with new syntax

Get rid of deprecated Long and Integer constructors.

  1. … 82 more files in changeset.
LDEV-5440 Use WF 31 Final instead of Beta

  1. … 69 more files in changeset.
LDEV-5446 Ensure that UUIDs are unique but retained on import

  1. … 4 more files in changeset.
LDEV-3997 Change comments for easier application of customisation

LDEV-3997 Use custom context label as primary source of course name

Following ticket LKC-178

LDEV-5424 boostrap5 VSA allocation page

    • -20
    • +25
    ./web/qb/vsa/vsaQuestionAllocate.jsp
LDEV-5424 remove scriptlets as they are not permitted inside tags (PageMonitor.tag)

  1. … 3 more files in changeset.
LDEV-5424 pull up from components-learner.scss

  1. … 1 more file in changeset.
LDEV-4853 Fix Add Lesson button when choosing recent LD

    • -1
    • +1
    ./web/includes/javascript/addLesson.js
LDEV-5424 copy-tags

    • -6
    • +41
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 189 more files in changeset.
LDEV-5424 rename Page5.tag->PageAdmin.tag

    • -0
    • +84
    ./web/WEB-INF/tags/PageAdmin.tag
  1. … 67 more files in changeset.
LDEV-5424 pull up content into RestrictedUsageAccordian.tag

    • -14
    • +12
    ./web/WEB-INF/tags/RestrictedUsageAccordian.tag
  1. … 3 more files in changeset.
LDEV-5424 fix the problem with ability to refreshParentMonitoringWindow() after Edit in monitor is done

    • -8
    • +10
    ./web/includes/javascript/common.js
  1. … 1 more file in changeset.
LDEV-5424 boostrap5 Forum's monitoring

    • -12
    • +12
    ./web/WEB-INF/tags/AdvancedAccordian.tag
    • -0
    • +146
    ./web/WEB-INF/tags/PageMonitor.tag
  1. … 18 more files in changeset.
LDEV-5424 pull up from components-learner.scss to components.scss

  1. … 1 more file in changeset.
LDEV-3997 "show design image" by default in LTI 1.1

LDEV-5424 drop .nav-link's color

LDEV-5424 introduce PageMonitor.tag

    • -0
    • +65
    ./web/css/components-monitoring.scss
  1. … 8 more files in changeset.
LDEV-5443 Add "start in monitor" option to integrations

  1. … 4 more files in changeset.
LDEV-5442 fix issues with star rating widget

  1. … 2 more files in changeset.
LDEV-5442 rename rating5.js -> rating.js

    • -0
    • +345
    ./web/includes/javascript/rating.js
    • -345
    • +0
    ./web/includes/javascript/rating5.js
  1. … 22 more files in changeset.