Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge learning outcomes LDEV-4644 into lams31

  1. … 14 more files in changeset.
LDEV-4440 LAMS Central learning link fixed

  1. … 27 more files in changeset.
LDEV-4440 Central minor fixes

  1. … 29 more files in changeset.
LDEV-4440 Central migration

  1. … 52 more files in changeset.
LDEV-3322: resucitating selenium tests

Readapting the old lams_test to LAMS 3.x

  1. … 3 more files in changeset.
LDEV-4644 Add/edit learning outcome

  1. … 13 more files in changeset.
LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

  1. … 19 more files in changeset.
LDEV-4366 Initial implementation of Kumalive reports

Latest free jqGrid is used as the one present in lams_central is

outdated and standard jqGrid became commercial.

Use bootstrap theme with Font Awesome icons.

Rewrite XML code used in Gradebook to feed jqGrid into JSON.

  1. … 14 more files in changeset.
Merge remote-tracking branch 'origin/master' into LDEV-4366

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

  1. … 3 more files in changeset.
LDEV-4374 Hide search widget if there is less than 10 courses

If the number of active courses that user has access to is less

than 10 - we don't display search widget.

  1. … 1 more file in changeset.
LDEV-4395 Sizing tweaks

  1. … 33 more files in changeset.
LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

  1. … 53 more files in changeset.
LDEV-4366 Introduce rubrics to Kumalive

  1. … 29 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-4366 Prototype Kumalive front and back ends

  1. … 18 more files in changeset.
LDEV-4314 i18lized "Search for courses..." label

LDEV-3962 Added border-radius property

  1. … 3 more files in changeset.
LDEV-3962 *In case of a mobile device (when offcanvas bar occupies entire screen) when user selects another group - close offcanvas. this is to let user see what this organisation contains * Fixed the issue with refreshing of main.jsp. As previously when user refreshes the page after changing the organisation - it fell back to showing the old one * as a side fix - prevent offcanvas bar from always being open on refreshing the page

  1. … 1 more file in changeset.
LDEV-3962 Similar changes done to Open Lesson dialog as previously done to Open/Save sequence in authoring * ability to save sequences on pressing the Enter button when title input is focused * focus title input field in case this element is visible in the current viewport (to avoid unwanted scrolling) * ability to start lessons on double click * prevent sequences from being deselected on any subsequent clicks

* Make 'Tour' word to appear after icon in order to be consistent with the rest of the buttons

* Make #notificationsPendingCount to be less prominent in case there are no messages. And assign it 'btn-primary' class when there are some messages available

  1. … 4 more files in changeset.
LDEV-3962 * Remove "Refresh" button

LDEV-4216: Tour has been internationalized and a few tweaks to the layout done to look better on an iPad.

  1. … 3 more files in changeset.
LDEV-4216: Creating a short tour for the main page. Using classes to tie the tour entries to the source elements.

  1. … 8 more files in changeset.
Correcting the "for javascript" labels added recently, to avoid LDEV-3453

  1. … 1 more file in changeset.
LDEV-4144: Showing a growl style message for the timezone warning when the user logins in.

  1. … 4 more files in changeset.
LDEV-4144: Timezone warning message debugging removed and I18N'd.

  1. … 2 more files in changeset.
LDEV-4144: Timezone warning message for when LAMS timezone does not match device timezone. Checked in for testing by team members.

LDEV-4138 Make showEmailDialog() be accessible from integrations pages

  1. … 2 more files in changeset.
LDEV-3962 Entire offcanvas menu button is now clickable and not just an image inside

  1. … 1 more file in changeset.
LDEV-3714: Remove archived courses list from the profile tab on the home page.

  1. … 5 more files in changeset.
LDEV-3962 Altered CSS rules: * color of notificationsPendingCount is aligned with other buttons color

  1. … 1 more file in changeset.