lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4433: adding new label

Merge branch 'LDEV-4433'

LDEV-4433 Move simplified activities info to Lesson summary tab

Besides, display info only for those activities that have numeric

outputs (which are Assessment, MCQ or Sratchie. Also activity must be

set to produce tool outputs in Authoring)

LDEV-4431 Portraits shown in Monitor and Course Gradebook

    • -5
    • +18
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -7
    • +33
    /lams_gradebook/web/gradebookMonitor.jsp
LDEV-4432: Tweaking snippets video

Fixing layout and embedding video options

LDEV-4433 Add 'Simplified activity' tab to the lesson gradebook export

Merge branch 'LDEV-4429'

4429 Fix the JS error when saving image without classes

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

LDEV-4432: Tweaking snippets images and text

Adding new public domain images as well as tweaking layouts slightly

    • binary
    /lams_www/web/public/ckeditor-templates/images/centered_image.jpg
  1. … 13 more files in changeset.
LDEV-4432 Introduce config file for bootsnippets CKEditor plugin

Config file is located in

/lams-www/www/public/ckeditor-templates/bootsnippets.js (if the path

will be altered, it needs to be updated in ckconfig_custom.js). Contains

list of Bootstrap snippets with all required images and CSS files.

    • binary
    /lams_www/web/public/ckeditor-templates/images/centered_image.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/image_and_text.png
    • binary
    /lams_www/web/public/ckeditor-templates/images/mountain_ridge.jpg
  1. … 19 more files in changeset.
LDEV-4432 Add new CKEditor plugin for working with Bootsrap snippets

    • -0
    • +276
    /lams_central/web/ckeditor/plugins/bootsnippets/plugin.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
    /lams_central/web/ckeditor/plugins/bootpanel/dialogs/element.css
    • -0
    • +334
    /lams_central/web/ckeditor/plugins/bootpanel/dialogs/element.js
    • binary
    /lams_central/web/ckeditor/plugins/bootpanel/images/noimage.png
    • -0
    • +42
    /lams_central/web/ckeditor/plugins/bootpanel/plugin.js
    • -0
    • +17
    /lams_central/web/css/_learner_base.scss
    • -0
    • +12
    /lams_central/web/includes/javascript/clickable.js
Merge branch 'LDEV-4429'

LDEV-4366 Re-enable export buttons based on cookie conversation

The solution is based on Andrey's solution for Gradebook.

Merge remote-tracking branch 'origin/master' into LDEV-4415

LDEV-4415 Lesson marks always recalculated after Live Edit

Also tries to respect any teacher modified lesson marks when

activity marks are changed by doing a 'take the old marks off

and add the new mark on' calculation for weighting.

LDEV-4429 Add jqeury.js and bootstrap.min.js scripts to preview page

    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
LDEV-4366 Add learners summary sheet to Kumalive Excel report

Also add date to learner attempts in Kumalive sheet and do some minor

formatting.

LDEV-4366 Disable export buttons to prevent double clicking

They get re-enable after few seconds.

LDEV-4423 Additional portrait entries

    • -13
    • +15
    /lams_tool_wiki/web/pages/learning/wiki.jsp
LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

    • -1
    • +0
    /lams_central/web/signup/singupTab.jsp
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
    /lams_central/web/css/free.ui.jqgrid.min.css
LDEV-4429 Add 'classes' field to image2 plugin

LDEV-4366 Fix JAR broken when merging. Fix batch naming.

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.

    • -0
    • +20829
    /lams_learning/web/includes/javascript/jquery.jqgrid.src.js
    • -0
    • +160
    /lams_learning/web/kumalive/kumaliveReport.jsp
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

LDEV-4429 Open JLatexmath dialog when clicking on its image

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

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).

LDEV-4429 Add html5audio and bootstrapTabs plugins

    • -0
    • +674
    /lams_central/web/ckeditor/plugins/bootstrapTabs/LICENSE-GPL
    • -0
    • +165
    /lams_central/web/ckeditor/plugins/bootstrapTabs/LICENSE-LGPL
    • -0
    • +373
    /lams_central/web/ckeditor/plugins/bootstrapTabs/LICENSE-MPL
  1. … 10 more files in changeset.