lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
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.
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")+'" ')

    • -1
    • +1
    /lams_central/web/ckeditor/ckeditor.js
LDEV-4429 Adjusting/updating CKEditor plugins

Updating image to image2 and including bootstrap tables CSS styles.

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

LDEV-4428 Make extraPlugin setting contain only extra plugins

LDEV-4428 Start supporting cy and id languages in CKEditor

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
    • +9
    /lams_central/web/ckeditor/ckeditor.js
    • -1
    • +1
    /lams_central/web/ckeditor/lang/en-au.js
  1. … 37 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
    /lams_central/web/ckeditor/ckeditor.js
LDEV-4415 Course export uses percentages, tour supports weights

LDEV-4415 Gradebook calculations and UI support weighting

    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -2
    • +64
    /lams_gradebook/web/gradebookMonitor.jsp
Merge branch 'LDEV-4428'

LDEV-4428 Specify default URL for embed plugin

LDEV-4428 Stop showing 'Templates' plugin button

LDEV-4428 Remove oembed, paint and smiley plugins

  1. … 48 more files in changeset.
LDEV-4428 Upgrade CKEditor to the latest version 4.7.3

Build is created using CKEditor's Download builder. Full preset is

chosen after which some of the plugins were removed (for details on

which plugins is chosen see \lams_central\web\ckeditor\build-config.js).

Office2013 skin is selected as the default skin.

    • -6
    • +752
    /lams_central/web/ckeditor/CHANGES.md
    • -3
    • +159
    /lams_central/web/ckeditor/LICENSE.md
    • -883
    • +1149
    /lams_central/web/ckeditor/ckeditor.js
    • -3
    • +77
    /lams_central/web/ckeditor/contents.css
  1. … 372 more files in changeset.
LDEV-4415 Allow removing weights from saved LD

LDEV-4054: updating Greek

Updating Greek with latest changes

LDEV-4415 Add a title to weights dialog

    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
Merge remote-tracking branch 'origin/master' into LDEV-4415

LDEV-4427 System Admin can delete profile pictures

    • -0
    • +1
    /lams_admin/web/WEB-INF/struts-config.xml
LDEV-4420 Lesson status changes recorded in audit log.