Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge branch 'LDEV-4366'

  1. … 4 more files in changeset.
LDEV-4434 Monitor and Gradebook uses of jqgrid upgraded.

  1. … 14 more files in changeset.
LDEV-4439 Fix a typo in optional activity properties init code

LDEV-4432 Add new CKEditor plugin for working with Bootsrap snippets

  1. … 11 more files in changeset.
LDEV-4432 Create plugin that will handle editing of Bootsrap panels

The name of the plugin is 'bootpanel' and it allows editing some of

panel's properties including making them clickable.

  1. … 8 more files in changeset.
LDEV-4366 Kumalive reports export

Allow exporting all and selected Kumalives in Excel format. Use i18n

instead of hardcoded labels. Move free jqGrid library to lams_central.

Minor fixes.

    • -0
    • +11
    ./free.jquery.jqgrid.min.js
  1. … 11 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.
LDEV-4429 Add html5audio and bootstrapTabs plugins

  1. … 24 more files in changeset.
LDEV-4429 Adjusting/updating CKEditor plugins

Updating image to image2 and including bootstrap tables CSS styles.

  1. … 76 more files in changeset.
LDEV-4428 Make extraPlugin setting contain only extra plugins

LDEV-4428 Add emojione and autoembed plugins

Both plugins were added as integrated plugins (so no need to specify

them as extraPlugins). At the same time Emojione button replaced Smiley

one.

As a side note, when adding Emojione plugin as integrated one, its icon

gets incorporated into icons.png incorrectly (the size of the icon is

much bigger than 16 px) that's why it doesn't get displayed at all. So

we need to tweak editor.css and replace CSS rule for

.cke_button__emojione_icon with the following:

.cke_button__emojione_icon {background:

url(../../plugins/emojione/icons/emojione.png?t=dee79e2) no-repeat 0 0

!important; background-size: 100% !important;}

  1. … 51 more files in changeset.
LDEV-4428 Revive "Preview" button

In order to make Preview feature available in inline mode, Preview

plugin needed to be tweaked. To achieve it the next command

"a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(" was removed from the

ckeditor.js; precisely from that line:

CKEDITOR.plugins.add("preview",{init:function(a){a.elementMode!=CKEDITOR.ELEMENT_MODE_INLINE&&(h=this.path,a.addCommand

  1. … 1 more file in changeset.
LDEV-4428 Specify default URL for embed plugin

LDEV-4428 Stop showing 'Templates' plugin button

LDEV-4428 Remove oembed, paint and smiley plugins

  1. … 62 more files in changeset.
LDEV-4415 Allow removing weights from saved LD

  1. … 1 more file in changeset.
LDEV-4415 Add a title to weights dialog

  1. … 3 more files in changeset.
LDEV-4423 Adding portraits to Monitor screens

Portraits incorporated into general monitor screens such as the

email sending popup, journal viewing, grouping and learner

progress. Also fixed issues in journal viewing relating to

LDEV-4393.

  1. … 12 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-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

  1. … 5 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

  1. … 5 more files in changeset.
LDEV-4419 Add widget for cropping portrait photos

Added widget that allows cropping the image to a standardised size for

webcam and image uploads (in order to make it squarish).

  1. … 1 more file in changeset.
LDEV-4419 Add widget for cropping portrait photos

Added widget that allows cropping the image to a standardised size for

webcam and image uploads (in order to make it squarish).

  1. … 2 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 42 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

  1. … 42 more files in changeset.
LDEV-4415 Add front end for weighted outputs

  1. … 11 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 73 more files in changeset.
LDEV-4417 Popover portraits in Monitoring

Implemented in Assessment, Chat, Daco, Forum and Submit.

  1. … 74 more files in changeset.
LDEV-4415 Add tool output weight. Rewrite activity evaluations.

Activity evaluations have been implemented as a list, even though always

only the first element is meaningful. They were rewritten as one-to-one

association with Activity. The primary key is activity ID now instead of

DB generated UID.

Weight column was added.

Server version was bumped so a filter can pick up activityEvaluations ->

evaluation field rename when importing older LDs.

A convention without date was used for server version as it seems good

enough.

Unnecessary versions of clients were removed from configuration table as

they server the abandoned Flash authoring.

  1. … 17 more files in changeset.
LDEV-4357 Disable "Move learner to" button when no users selected

The root problem was that diaplog's 'open' method wasn't called in case

dialog gets opened for the second time.