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
Thursday 28 Sep 2017
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.
Tuesday 12 Sep 2017
4:37 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4424: display larger portrait pic

Display a larger portrait picture when showing the profile options

Options
    • -2
    • +2
    ./web/profile.jsp
3:21 pm

Andrey Balan

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

Options
    • -0
    • +250
    ./web/css/croppie.css
    • -0
    • +7
    ./web/includes/javascript/croppie.js
6:53 am

Andrey Balan

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

Options
    • -6
    • +0
    ./src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -7
    • +30
    ./web/includes/javascript/webrtc-capturestill.js
    • -27
    • +74
    ./web/portrait.jsp
Monday 11 Sep 2017
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -2
    • +3
    ./web/includes/javascript/portrait.js
  2. … 42 more files in changeset.
10:16 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

Implmented in Share Resources, Survey, Leader, Mindmap,

Noticeboard, Notebook, Pixlr, Peer Review

Options
    • -2
    • +3
    ./web/includes/javascript/portrait.js
  2. … 42 more files in changeset.
Saturday 09 Sep 2017
4:42 pm

Marcin Cieslak

LDEV-4293 Skip isSysAdmin check when there is no session

The code that checks if user is sysadmin depends on HTTP session being

present in SessionManager. It is normally present as the authentication

request goes through SsoHandler which initiates the session. It is not

the case, though, when session gets replicated and UniversalLoginModule

is accessed directly.

The fix skips the check in no session is present, which means that

sysadmin will need to authenticate same as regular user, which is OK for

this edge situation. Session failover still works.

Options
    • -6
    • +10
    ./src/java/org/lamsfoundation/lams/security/UniversalLoginModule.java
Friday 08 Sep 2017
12:22 pm

Marcin Cieslak

LDEV-4415 Add front end for weighted outputs

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -3
    • +32
    ./web/authoring/authoring.jsp
    • -0
    • +28
    ./web/css/_authoring_base.scss
    • -7
    • +29
    ./web/includes/javascript/authoring/authoringActivity.js
    • -7
    • +122
    ./web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +5
    ./web/includes/javascript/authoring/authoringMenu.js
    • -1
    • +9
    ./web/includes/javascript/authoring/authoringProperty.js
  9. … 7 more files in changeset.
Wednesday 30 Aug 2017
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -30
    • +67
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    ./web/css/_learner_base.scss
    • -7
    • +50
    ./web/includes/javascript/portrait.js
  5. … 70 more files in changeset.
7:32 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4417 Popover portraits in Monitoring

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

Options
    • -30
    • +67
    ./src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +7
    ./web/WEB-INF/tlds/lams/lams.tld
    • -1
    • +14
    ./web/css/_learner_base.scss
    • -7
    • +50
    ./web/includes/javascript/portrait.js
  5. … 71 more files in changeset.
2:30 am

Marcin Cieslak

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.

Options
    • -28
    • +19
    ./src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
    • -42
    • +13
    ./src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
    • -33
    • +32
    ./src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
    • -3
    • +4
    ./web/includes/javascript/authoring/authoringActivity.js
    • -3
    • +3
    ./web/includes/javascript/authoring/authoringGeneral.js
  6. … 14 more files in changeset.
Saturday 26 Aug 2017
4:04 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into lams31

Multiple conflicts resolved with JSON replace and class move to

packages.

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/HomeAction.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java
  8. … 27 more files in changeset.
Wednesday 23 Aug 2017
2:54 am

Andrey Balan

LDEV-4374 Hide search widget if there is less than 10 courses

If the number of active courses that user has access to is less

than 10 - we don't display search widget.

Options
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -6
    • +8
    ./web/main.jsp
Tuesday 22 Aug 2017
9:49 pm

Andrey Balan

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.

Options
    • -4
    • +4
    ./web/includes/javascript/dialog.js
Monday 21 Aug 2017
9:58 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395: Portrait will not tile and improved Generic spacing

Options
    • -4
    • +4
    ./web/css/_learner_base.scss