Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4451 Make slider neater (narrower and with lesser text size)

  1. … 2 more files in changeset.
LDEV-4451 Display confidence levels in Scratchie

Add ability to Scratchie to display what options the individual students

have had in the individual assessment.

Add advanced option to Scratchie - 'Show confidences' and then list

activites from the sequence to choose from (skip branching or use only

the current branch if inside of it).

    • -0
    • +1050
    ./css/circle.css
    • -0
    • +34
    ./includes/javascript/jqGrid.confidenceLevelFormattter.js
  1. … 21 more files in changeset.
LDEV-4450: Learner icons in progress tab have portraits

  1. … 3 more files in changeset.
LDEV-4453 Add "gradebook on lesson complete" field to Lesson

  1. … 8 more files in changeset.
LDEV-4452 Prompt on overwriting unsaved changes in Authoring

  1. … 2 more files in changeset.
LDEV-4451 Allow learners to choose confidence levels

Add advanced option in Assessment/MCQ - 'Store Confidences'.

If this option is ON, then in learning show sliders which will allow

choosing confidence levels. Display stored levels in learning and

monitoring.

    • -0
    • +41
    ./css/bootstrap-slider.css
    • -0
    • +5
    ./includes/javascript/bootstrap-slider.js
  1. … 28 more files in changeset.
LDEV-4366: Small UI change

LDEV-4366 Disable learner's button when Kumalive is not started

  1. … 4 more files in changeset.
Merge branch 'LDEV-4366'

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

  1. … 12 more files in changeset.
LDEV-4441 CKEditor bootsnippets plugin to support i18n

Make bootsnippets plugin to support i18n. Besides of the plugin's

internal labels, we're also going to translate labels from

/lams_www/web/public/ckeditor-templates/bootsnippets.js (but only

snippets' titles).

    • -1
    • +29
    ./ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/es.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/gr.js
    • -0
    • +42
    ./ckeditor/plugins/bootsnippets/lang/ru.js
    • -9
    • +9
    ./ckeditor/plugins/bootsnippets/plugin.js
  1. … 1 more file in changeset.
LDEV-4439 Fix a typo in optional activity properties init code

LDEV-4293 Tune session log out

Make sure mapping login->session is cleared in certain situations.

Check if a session already exists for the given login. If so, invalidate

one of the sessions.

  1. … 2 more files in changeset.
LDEV-4293 Rewrite session invalidation mechanism

Server-side non-current session invalidation does not work well on

clustered WildFly 10. It breaks Infinispan distributed session cache and

makes a logged out user clear LAMS cookies, otherwise he/she gets a

blank screen. See WFLY-7281 and WFLY-7229.

So instead of invalidating a session we mark it for invalidation. The

next time the user tries to use it, the session gets invalidated and the

user gets an error screen (not a very clean solution, but more effective

than another filter which would nicely redirect the user to logout

screen).

This solution seems to work nicely if both browsers interact with the

same node. Since we use distributed session for failover rather than

replication, it should be OK.

  1. … 3 more files in changeset.
LDEV-4432 Solve the problem with dialog's checkbox gets focused on start

Solved by adding an empty <div> to the beginning of the dialog and

marking this div as required to be focused.

    • -0
    • +7
    ./ckeditor/plugins/bootsnippets/plugin.js
4429 Fix the JS error when saving image without classes

The issue arises on saving image and specifying no classes at all.

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

    • -0
    • +92
    ./ckeditor/plugins/bootsnippets/dialogs/snippets.css
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_image.ico
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_photo.gif
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_text.ico
    • binary
    ./ckeditor/plugins/bootsnippets/icons/ico_video.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/snippets-rtl.png
    • binary
    ./ckeditor/plugins/bootsnippets/icons/snippets.png
    • -0
    • +14
    ./ckeditor/plugins/bootsnippets/lang/en.js
    • -0
    • +276
    ./ckeditor/plugins/bootsnippets/plugin.js
    • -3
    • +10
    ./includes/javascript/ckconfig_custom.js
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.

    • -0
    • +78
    ./ckeditor/plugins/bootpanel/dialogs/element.css
    • -0
    • +334
    ./ckeditor/plugins/bootpanel/dialogs/element.js
    • binary
    ./ckeditor/plugins/bootpanel/icons/hidpi/image.png
    • binary
    ./ckeditor/plugins/bootpanel/icons/image.png
    • binary
    ./ckeditor/plugins/bootpanel/images/noimage.png
    • -0
    • +32
    ./ckeditor/plugins/bootpanel/lang/en.js
    • -0
    • +42
    ./ckeditor/plugins/bootpanel/plugin.js
    • -0
    • +12
    ./includes/javascript/clickable.js
LDEV-4429 Add jqeury.js and bootstrap.min.js scripts to preview page

LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

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
    • +5
    ./css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./includes/javascript/free.jquery.jqgrid.min.js
  1. … 10 more files in changeset.
LDEV-4429 Add 'classes' field to image2 plugin

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. … 13 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-4429 Open JLatexmath dialog when clicking on its image

    • -3
    • +0
    ./ckeditor/plugins/jlatexmath/plugin.js
LDEV-4429 Modify html5audio plugin

Add support for double click event. Also add padding around widget to

increate area where user can double click and right click when trying to

open html5audio dialog

    • -0
    • +19
    ./ckeditor/plugins/html5audio/plugin.js
LDEV-4429 Modify bootstrapTabs plugin

The "element.getAscendant"'s function that was specified in Double click

and contextMenu listener methods were replaced with the following:

return !( element instanceof CKEDITOR.dom.document ) &&

element.hasClass('bootstrap-tabs') ;

As otherwise it always false positively determined there is a tabs

element in CKEditor canvas (due to LAMS header containing a tab).

    • -21
    • +15
    ./ckeditor/plugins/bootstrapTabs/plugin.js
LDEV-4429 Add html5audio and bootstrapTabs plugins

    • -0
    • +674
    ./ckeditor/plugins/bootstrapTabs/LICENSE-GPL
    • -0
    • +165
    ./ckeditor/plugins/bootstrapTabs/LICENSE-LGPL
    • -0
    • +373
    ./ckeditor/plugins/bootstrapTabs/LICENSE-MPL
    • -0
    • +11
    ./ckeditor/plugins/bootstrapTabs/README.md
    • -0
    • +244
    ./ckeditor/plugins/bootstrapTabs/dialogs/bootstrapTabs.js
    • binary
    ./ckeditor/plugins/bootstrapTabs/icons/bootstrapTabs.png
    • -0
    • +14
    ./ckeditor/plugins/bootstrapTabs/lang/en.js
    • -0
    • +13
    ./ckeditor/plugins/bootstrapTabs/lang/ru.js
    • -0
    • +91
    ./ckeditor/plugins/bootstrapTabs/plugin.js
    • -0
    • +32
    ./ckeditor/plugins/bootstrapTabs/sample/bootstrapTabs.html
    • -0
    • +135
    ./ckeditor/plugins/html5audio/dialogs/html5audio.js
    • binary
    ./ckeditor/plugins/html5audio/icons/html5audio.png
    • -0
    • +14
    ./ckeditor/plugins/html5audio/lang/de.js
    • -0
    • +14
    ./ckeditor/plugins/html5audio/lang/el.js
    • -0
    • +14
    ./ckeditor/plugins/html5audio/lang/en.js
  1. … 10 more files in changeset.
LDEV-4429 Preview should show text on a white background

Don't add class to the resulted preview body. It can be achieved by

removing the following line

,d.getAttribute("class")&&(b+='class\x3d"'+d.getAttribute("class")+'" ')

LDEV-4429 Adjusting/updating CKEditor plugins

Updating image to image2 and including bootstrap tables CSS styles.

    • -0
    • +553
    ./ckeditor/plugins/image2/dialogs/image2.js
    • binary
    ./ckeditor/plugins/image2/icons/hidpi/image.png
    • binary
    ./ckeditor/plugins/image2/icons/image.png
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/af.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/ar.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/az.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/bg.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/bn.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/bs.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/ca.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/cs.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/cy.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/da.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/de-ch.js
    • -0
    • +21
    ./ckeditor/plugins/image2/lang/de.js
  1. … 62 more files in changeset.