lams-github

lams_central

Clone Tools

Stats

Commits this week: 0
Total Committers: 31
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Wednesday 04 Oct 2017
8:56 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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.

Options
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
  2. … 1 more file in changeset.
4:59 am

Andrey Balan

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

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
Tuesday 03 Oct 2017
10:48 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4423 Additional portrait entries

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
  2. … 10 more files in changeset.
8:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4430 fixes for signup pages

Small cosmetic changes in signup pages

Options
    • -8
    • +7
    ./web/signup/signup.jsp
    • -1
    • +0
    ./web/signup/singupTab.jsp
2:44 am

Marcin Cieslak

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.

Options
    • -0
    • +5
    ./web/css/free.ui.jqgrid.min.css
    • -0
    • +11
    ./web/includes/javascript/free.jquery.jqgrid.min.js
  3. … 10 more files in changeset.
12:38 am

Andrey Balan

LDEV-4429 Add 'classes' field to image2 plugin

Options
    • -0
    • +36
    ./web/ckeditor/plugins/image2/dialogs/image2.js
    • -1
    • +2
    ./web/ckeditor/plugins/image2/plugin.js
Sunday 01 Oct 2017
2:05 am

Marcin Cieslak

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.

Options
    • -0
    • +18
    ./web/includes/javascript/main.js
    • -0
    • +2
    ./web/main.jsp
  3. … 13 more files in changeset.
1:09 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +8
    ./web/main.jsp
  3. … 2 more files in changeset.
Saturday 30 Sep 2017
10:10 am

Andrey Balan

LDEV-4429 Open JLatexmath dialog when clicking on its image

Options
    • -1
    • +1
    ./web/ckeditor/plugins/image2/plugin.js
    • -3
    • +0
    ./web/ckeditor/plugins/jlatexmath/plugin.js
9:23 am

Andrey Balan

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

Options
    • -0
    • +19
    ./web/ckeditor/plugins/html5audio/plugin.js
9:22 am

Andrey Balan

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

Options
    • -21
    • +15
    ./web/ckeditor/plugins/bootstrapTabs/plugin.js
9:21 am

Andrey Balan

LDEV-4429 Add html5audio and bootstrapTabs plugins

Options
    • -0
    • +674
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-GPL
    • -0
    • +165
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-LGPL
    • -0
    • +373
    ./web/ckeditor/plugins/bootstrapTabs/LICENSE-MPL
    • -0
    • +11
    ./web/ckeditor/plugins/bootstrapTabs/README.md
    • -0
    • +244
    ./web/ckeditor/plugins/bootstrapTabs/dialogs/bootstrapTabs.js
    • binary
    ./web/ckeditor/plugins/bootstrapTabs/icons/bootstrapTabs.png
    • -0
    • +14
    ./web/ckeditor/plugins/bootstrapTabs/lang/en.js
    • -0
    • +13
    ./web/ckeditor/plugins/bootstrapTabs/lang/ru.js
    • -0
    • +91
    ./web/ckeditor/plugins/bootstrapTabs/plugin.js
    • -0
    • +32
    ./web/ckeditor/plugins/bootstrapTabs/sample/bootstrapTabs.html
    • -0
    • +135
    ./web/ckeditor/plugins/html5audio/dialogs/html5audio.js
    • binary
    ./web/ckeditor/plugins/html5audio/icons/html5audio.png
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/de.js
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/el.js
    • -0
    • +14
    ./web/ckeditor/plugins/html5audio/lang/en.js
  16. … 10 more files in changeset.
9:15 am

Andrey Balan

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")+'" ')

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
Thursday 28 Sep 2017
10:56 am

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4429 Adjusting/updating CKEditor plugins

Updating image to image2 and including bootstrap tables CSS styles.

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

Andrey Balan

LDEV-4428 Make extraPlugin setting contain only extra plugins

Options
    • -1
    • +1
    ./web/includes/javascript/ckconfig_custom.js
Wednesday 27 Sep 2017
11:11 pm

Andrey Balan

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;}

Options
    • -2
    • +4
    ./web/ckeditor/build-config.js
    • -1
    • +9
    ./web/ckeditor/ckeditor.js
    • -1
    • +1
    ./web/ckeditor/lang/ar.js
    • -1
    • +1
    ./web/ckeditor/lang/bg.js
    • -1
    • +1
    ./web/ckeditor/lang/ca.js
    • -1
    • +1
    ./web/ckeditor/lang/cs.js
    • -1
    • +1
    ./web/ckeditor/lang/cy.js
    • -1
    • +1
    ./web/ckeditor/lang/da.js
    • -1
    • +1
    ./web/ckeditor/lang/de.js
    • -1
    • +1
    ./web/ckeditor/lang/el.js
    • -1
    • +1
    ./web/ckeditor/lang/en-au.js
    • -1
    • +1
    ./web/ckeditor/lang/es.js
    • -1
    • +1
    ./web/ckeditor/lang/fr.js
    • -1
    • +1
    ./web/ckeditor/lang/hu.js
    • -1
    • +1
    ./web/ckeditor/lang/id.js
  16. … 37 more files in changeset.
8:54 pm

Andrey Balan

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

Options
    • -1
    • +1
    ./web/ckeditor/ckeditor.js
    • -2
    • +2
    ./web/includes/javascript/ckconfig_custom.js
2:30 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4415 Gradebook calculations and UI support weighting

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
    • -1
    • +13
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -1
    • +2
    ./src/java/org/lamsfoundation/lams/authoring/service/IAuthoringService.java
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java
  5. … 13 more files in changeset.
7:41 am

Andrey Balan

LDEV-4428 Specify default URL for embed plugin

Options
    • -0
    • +1
    ./web/includes/javascript/ckconfig_custom.js
7:38 am

Andrey Balan

LDEV-4428 Stop showing 'Templates' plugin button

Options
    • -5
    • +3
    ./web/includes/javascript/ckconfig_custom.js
7:36 am

Andrey Balan

LDEV-4428 Remove oembed, paint and smiley plugins

Options
    • -21
    • +0
    ./web/ckeditor/plugins/oembed/LICENSE.md
    • -201
    • +0
    ./web/ckeditor/plugins/oembed/README.md
    • binary
    ./web/ckeditor/plugins/oembed/icons/hidpi/oembed.png
    • binary
    ./web/ckeditor/plugins/oembed/icons/oembed.png
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/de.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/en.js
    • -25
    • +0
    ./web/ckeditor/plugins/oembed/lang/fr.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/nl.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/pl.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/pt-br.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/ru.js
    • -23
    • +0
    ./web/ckeditor/plugins/oembed/lang/tr.js
    • -2
    • +0
    ./web/ckeditor/plugins/oembed/libs/jquery.oembed.min.js
    • binary
    ./web/ckeditor/plugins/paint/CK Paint.swf
    • -65
    • +0
    ./web/ckeditor/plugins/paint/content.jsp
  16. … 48 more files in changeset.
6:54 am

Andrey Balan

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.

Options
    • -6
    • +752
    ./web/ckeditor/CHANGES.md
    • -3
    • +159
    ./web/ckeditor/LICENSE.md
    • -1
    • +1
    ./web/ckeditor/README.md
    • -7
    • +7
    ./web/ckeditor/adapters/jquery.js
    • -10
    • +27
    ./web/ckeditor/build-config.js
    • -883
    • +1149
    ./web/ckeditor/ckeditor.js
    • -3
    • +77
    ./web/ckeditor/contents.css
    • -3
    • +3
    ./web/ckeditor/lang/ar.js
    • -3
    • +3
    ./web/ckeditor/lang/bg.js
    • -3
    • +3
    ./web/ckeditor/lang/ca.js
    • -3
    • +3
    ./web/ckeditor/lang/cs.js
    • -0
    • +5
    ./web/ckeditor/lang/cy.js
    • -3
    • +3
    ./web/ckeditor/lang/da.js
    • -3
    • +3
    ./web/ckeditor/lang/de.js
    • -3
    • +3
    ./web/ckeditor/lang/el.js
  16. … 372 more files in changeset.
Tuesday 26 Sep 2017
11:50 pm

Marcin Cieslak

LDEV-4415 Allow removing weights from saved LD

Options
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -1
    • +5
    ./web/includes/javascript/authoring/authoringGeneral.js
Monday 25 Sep 2017
9:14 pm

Marcin Cieslak

LDEV-4415 Add a title to weights dialog

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./web/authoring/authoring.jsp
    • -0
    • +1
    ./web/includes/javascript/authoring/authoringGeneral.js
  4. … 1 more file in changeset.
8:45 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
  2. … 1 more file in changeset.
8:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4427 System Admin can delete profile pictures

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +66
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
  3. … 4 more files in changeset.
Friday 22 Sep 2017
11:20 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

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.

Options
    • -0
    • +1
    ./web/css/_learner_base.scss
    • -2
    • +2
    ./web/css/orgGroup.scss
    • -0
    • +1
    ./web/emailuser.jsp
    • -4
    • +11
    ./web/includes/javascript/orgGroup.js
    • -0
    • +1
    ./web/orgGroup.jsp
  6. … 8 more files in changeset.
Monday 18 Sep 2017
8:36 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4425 Adding Portraits in Learner

Included in Grouping, Chat, Peer Review and QA

Options
    • -5
    • +7
    ./web/WEB-INF/tags/StyledRating.tag
    • -0
    • +5
    ./web/css/_learner_base.scss
    • -0
    • +39
    ./web/includes/javascript/portrait.js
  4. … 42 more files in changeset.
Thursday 14 Sep 2017
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    ./web/includes/javascript/portrait.js
  2. … 5 more files in changeset.
9:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Wiki, DoKumaran

Options
    • -1
    • +1
    ./web/includes/javascript/portrait.js
  2. … 5 more files in changeset.