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

# Conflicts:

# lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

# lams_learning/web/presenceChat.jsp

# lams_monitoring/web/gate/gateStatus.jsp

# lams_tool_assessment/web/pages/learning/parts/allquestions.jsp

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

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

# lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dto/MessageDTO.java

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

  1. … 34 more files in changeset.
LDEV-5436 Project-wide user sorting by last then first name

  1. … 150 more files in changeset.
LDEV-5397 make rule more spicific otherwise it affects change portrait dialog

LDEV-5397 remove .table-responsive as it creates horizaontal scrollbar in certain cases on FF

  1. … 7 more files in changeset.
LDEV-5397 make sure all buttons have proper "type" attribute

  1. … 24 more files in changeset.
LDEV-5397 redesign "choose branch page". add modal confirmation dialog

* add onhover effect to choose group page

  1. … 1 more file in changeset.
LDEV-5397 standartize the way modal-dialogs look like

  1. … 1 more file in changeset.
LDEV-5397 bootstrap5 Grouping, Branching, Optional activities

  1. … 12 more files in changeset.
LDEV-5213 Use version-dependent imports for LAMS JS files

  1. … 338 more files in changeset.
LDEV-4718 Fix plugin race condition by manually disabling buttons

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

  1. … 198 more files in changeset.
LDEV-4874 Restrict displaying names for students that are not within student's group

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

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

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

  1. … 315 more files in changeset.
LDEV-4718 Block group confirm modal from closing when choice is made

LDEV-4440 Fixed TBL template in Authoring. Tweaks to gates, branch

  1. … 29 more files in changeset.
LDEV-4440 Portrait fix

  1. … 8 more files in changeset.
LDEV-4440 Grouping fixes

  1. … 11 more files in changeset.
LDEV-4440 Learning server start

  1. … 25 more files in changeset.
LDEV-4440 Learning

  1. … 55 more files in changeset.
LDEV-4507 Use DTOs instead of entities as page attributes

It seems that using entities as page attributes outside a transaction

causes undesired effect. Portrait tag fetches data from DB and existing

entities, including group participants, get flushed from session. It

overwrites changes made by learners being added to a group.

  1. … 5 more files in changeset.
LDEV-4435 Portraits displayed for View Learners grouping option

LDEV-3427: Confirmation for student selection grouping

  1. … 1 more file in changeset.
LDEV-3724: updating LAMS Learning to bootstrap

  1. … 15 more files in changeset.
LDEV-3535: WildFly's JSP parser is more strict about case than JBoss'. Update HEAD too for compatibility.

  1. … 1 more file in changeset.
LDEV-3535: WildFly's JSP parser is more strict about case than JBoss'. Update HEAD too for compatibility.

  1. … 1 more file in changeset.
LDEV-2054: Added a column name containing group members.

  1. … 3 more files in changeset.
LDEV-2054: Added support for “viewStudentsBeforeSelection” option.

  1. … 10 more files in changeset.
LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

  1. … 32 more files in changeset.