Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-5397 Redesign page with group results to make it similar to the page where learner chooses a group

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 Enhanced mobile experience

  1. … 10 more files in changeset.
LDEV-5397 button not spelled properly

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 Improve offcanvas progress bar + various other fixes as mentioned in the JIRA's comment

* Improved offcanvas progress bar:

icon for not completed activity should a hollow square, not a full one;

gate icons: hourglass icons replaced with locks;

support for long activity names;

tooltips on icon hover explaining what it means, for example “current activity”;

improved CSS

* Teams table should have maximum width and/or highlight on hover

* “Burning questions” button should have standard size (not small) and have the same primary colour as “Justification” button

* In burning questions summary the title does not have sufficient contrast

* In Chat the font should have standard and not reduced size

* In Daco there is an empty alert

* In Task List (and Share Resources) button to complete an item should say something like “Mark as completed” or “Complete” instead of “Completed”

* Admin pages: restored background colour to ghostly white

  1. … 15 more files 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-5219 Use versioned JS import for gate check JS file

  1. … 55 more files in changeset.
LDEV-5219 Check gate after Grouping activity

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-4440 Learning notebook

  1. … 6 more files in changeset.
LDEV-4440 Learning notebook

  1. … 2 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-4472 Fix Javascript error on accessing a Grouping activity

Since <i name="ui-${user.userId}" class="fa fa-xs

fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp<c:out

value="${user.lastName}" /> was removed in one of the previous commits,

this peace of Javascript also needs to be taken care of.

LDEV-4423 Additional portrait entries

  1. … 10 more files in changeset.
LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

  1. … 44 more files in changeset.
LDEV-4367 Skins can be created

The SASS files are now configured to allow a new variable file to be

set up with different colours and for users to be able to switch

between skins.

  1. … 156 more files in changeset.
LDEV-3915: Updating core learner screens like gates and groups to suit sliding div based progress bar.

  1. … 6 more files 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.