lams-github

Clone Tools

Stats

Commits this week: 0
Total Committers: 50
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 03 Aug 2017
5:46 am

Andrey Balan

Merge branch 'LDEV-4398'

Options
5:44 am

Andrey Balan

LDEV-4398 Use imgscalr library for image resizing

Besides, switch to using only PNG files in order to prevent image

quality loosing.

Options
    • -33
    • +30
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • -1
    • +1
    /lams_central/web/portrait.jsp
5:39 am

Andrey Balan

LDEV-4398 Introduce imgscalr library for image resizing

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +565
    /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/AsyncScalr.java
    • -0
    • +98
    /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
    • -0
    • +2286
    /lams_common/src/java/org/lamsfoundation/lams/util/imgscalr/Scalr.java
5:26 am

Andrey Balan

Merge branch 'LDEV-4396'

Options
5:25 am

Andrey Balan

LDEV-4396 Use new image resizing technique (imgscalr) for image gallery

As long as we moved portrait resizing mechanism to use imgscalr library,

we're migrating Image Gallery to also use it.

Besides, a few obsolete fields were removed from ImageGalleryItem.java

Options
    • -77
    • +0
    /lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.hbm.xml
    • -16
    • +0
    /lams_tool_images/conf/hibernate/mappings/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.hbm.xml
    • -12
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
    • -0
    • +17
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20170731.sql
    • -8
    • +4
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryAttachment.java
    • -27
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageGalleryItem.java
    • -0
    • +9
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryImportContentVersionFilter.java
    • -24
    • +25
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java
    • -56
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ImageGalleryWebUtils.java
    • -158
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java
    • -4
    • +2
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java
    • -1
    • +1
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java
    • -9
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageGalleryItemForm.java
    • -58
    • +0
    /lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/MultipleImagesForm.java
Wednesday 02 Aug 2017
8:07 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Merge branch. Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
8:00 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Clean up comments and debugging

Options
    • -1
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -1
    • +0
    /lams_central/web/includes/javascript/portrait.js
Tuesday 01 Aug 2017
7:12 pm

Andrey Balan

LDEV-4397 Fix lesson URL shortener functionality

Options
    • -15
    • +19
    /lams_monitoring/web/monitor.jsp
Monday 31 Jul 2017
11:55 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4395 Portrait tag and javascript to display portraits

A new tag and javascript file shows the user portraits in one of 4 sizes

and either square or round. If no portrait exists a generic coloured

user icon is used. Portraits shown in Forum and Noticeboard Comments.

Options
    • -0
    • +26
    /lams_admin/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +11
    /lams_central/conf/scss/_lams_variables.scss
    • -0
    • +9
    /lams_central/conf/scss/_lams_variables_purple.scss
    • -1
    • +19
    /lams_central/conf/scss/_mixins.scss
    • -0
    • +199
    /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java
    • -0
    • +26
    /lams_central/web/WEB-INF/tlds/lams/lams.tld
    • -0
    • +1
    /lams_central/web/comments/msgview.jsp
    • -0
    • +70
    /lams_central/web/css/_learner_base.scss
    • -3
    • +0
    /lams_central/web/css/_main_base.scss
    • -9
    • +260
    /lams_central/web/includes/font-awesome/css/font-awesome.css
    • -2
    • +2
    /lams_central/web/includes/font-awesome/css/font-awesome.min.css
    • binary
    /lams_central/web/includes/font-awesome/fonts/FontAwesome.otf
    • binary
    /lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.eot
    • -652
    • +2668
    /lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.svg
    • binary
    /lams_central/web/includes/font-awesome/fonts/fontawesome-webfont.ttf
  16. … 39 more files in changeset.
11:24 am

Marcin Cieslak

Merge branch 'LDEV-4394'

Options
Sunday 30 Jul 2017
12:08 pm

Marcin Cieslak

LDEV-4394 Fix refresh and show Finish button flow

Options
    • -6
    • +19
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
3:07 am

Andrey Balan

LDEV-4394 Fix "addTime" request

Options
    • -0
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/learning.jsp
Saturday 29 Jul 2017
4:17 pm

Marcin Cieslak

Clean up unnecessary settings file

Options
    • -59
    • +0
    /lams_gradebook/.settings/org.eclipse.jdt.ui.prefs
4:17 pm

Marcin Cieslak

Merge branch 'LDEV-4393'

Options
4:16 pm

Marcin Cieslak

LDEV-4393 Fix Add button in lesson Notebook

The initial button takes lesson ID from an attribute. If there are some

entries already, lesson ID is not set as an attribute. Instead, the

button is duplicated below and takes lesson ID from entries' external

ID. The initial button gets hidden if there are already entries.

Options
    • -12
    • +10
    /lams_learning/web/notebook/viewall.jsp
12:56 pm

Marcin Cieslak

LDEV-4394 Reintroduce page refresh to Doku

It was incorrectly removed in previous commits. Also make sure the other

websocket pings and reconnects.

Options
    • -8
    • +31
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -4
    • +36
    /lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
12:55 pm

Marcin Cieslak

LDEV-4394 Rewrite Scratchie time limit

Now it is controlled by websocket server.

Options
    • -72
    • +51
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -62
    • +0
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -22
    • +60
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -1
    • +7
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
12:53 pm

Marcin Cieslak

LDEV-4394 Minor improvements for compiler optimisation

Options
    • -9
    • +9
    /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
    • -8
    • +8
    /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
    • -13
    • +8
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
5:30 am

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions.

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
5:29 am

Andrey Balan

LDEV-4032 Handle hiding of a Finish button for non-leaders properly

Finish button should be hidden from non-leader in case leader hasn't yet

submitted Notebook or burning questions

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
Friday 28 Jul 2017
6:21 pm

Marcin Cieslak

LDEV-4394 Do not show Finish button until Scratchie Leader finished the tool completely

This includes answering to burning questions.

Options
    • -30
    • +1
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -7
    • +0
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
6:18 pm

Marcin Cieslak

LDEV-4394 Do not refresh Leader Selection after leader was chosen

Options
    • -47
    • +49
    /lams_tool_leader/web/pages/learning/leaderselection.jsp
6:15 pm

Marcin Cieslak

LDEV-4394 Reduce Q&A refresh time for non-leaders

Options
    • -1
    • +1
    /lams_tool_laqa/web/learning/AnswersContent.jsp
3:53 pm

Marcin Cieslak

LDEV-4394 Make page reload and websocket close requests cross-node

Some requests have been sent only to websockets on current node. Now

they are detected in DB and run on all nodes.

Options
    • -40
    • +40
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -22
    • +83
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningWebsocketServer.java
    • -3
    • +3
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -8
    • +4
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java
    • -3
    • +72
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningWebsocketServer.java
    • -12
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/util/FinishScratchingJob.java
    • -17
    • +13
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
    • -10
    • +34
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningWebsocketServer.java
    • -0
    • +1
    /lams_tool_scratchie/web/pages/learning/questionlist.jsp
    • -2
    • +0
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java
    • -7
    • +17
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningWebsocketServer.java
    • -2
    • +0
    /lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/MonitoringAction.java
2:58 pm

Marcin Cieslak

Merge branch 'LDEV-4392'

Options
2:57 pm

Marcin Cieslak

LDEV-4392 Fix websocket close detection

Make sure there is only, well implemented one piece of code that detects

websocket close and optionally reconnects it.

Options
    • -12
    • +10
    /lams_tool_doku/web/pages/learning/learning.jsp
3:12 am

Andrey Balan

Merge branch 'LDEV-4380'

Options
3:08 am

Andrey Balan

LDEV-4380 Replace portrait capturing Flash widget with WebRTC

In order to completely eradicate Flash, we can use WebRTC which seems to

be working OK in newer browsers.

Options
    • -0
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -57
    • +52
    /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java
    • binary
    /lams_central/web/includes/flash/webcam.swf
    • -197
    • +0
    /lams_central/web/includes/javascript/webcam.js
    • -0
    • +135
    /lams_central/web/includes/javascript/webrtc-capturestill.js
    • binary
    /lams_central/web/includes/sounds/shutter.mp3
    • -128
    • +97
    /lams_central/web/portrait.jsp
    • -11
    • +20
    /lams_central/web/profile.jsp
3:03 am

Andrey Balan

LDEV-4380 expose updateFile() method from ToolContentHandler.java

It will be required for storing several versions of user's portrait

images.

Options
    • binary
    /lams_build/lib/lams/lams-contentrepository.jar
    • -0
    • +24
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java
    • -0
    • +22
    /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java
Thursday 27 Jul 2017
6:05 pm

Marcin Cieslak

Merge branch 'LDEV-4392'

Options