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
Monday 27 Nov 2017
7:29 pm

Marcin Cieslak

LDEV-4469 Remove obsolete file

Options
    • -165
    • +0
    /lams_central/src/java/org/lamsfoundation/lams/util/PortraitUtils.java
4:19 pm

Marcin Cieslak

LDEV-3263 Allow altering exported XML using only class names

It allows XML doc manipulation even if current project (for example

Common) is not aware of another project's classes (for example some

Tool)

Options
    • -16
    • +45
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ToolContentVersionFilter.java
Thursday 23 Nov 2017
10:37 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457: Chosen Grouping screen layout tweaked

Options
    • -5
    • +8
    /lams_central/web/css/orgGroup.scss
    • -3
    • +3
    /lams_central/web/orgGroup.jsp
5:06 am

Marcin Cieslak

LDEV-4454 Add bar chart

Options
    • -0
    • +6
    /lams_central/web/includes/javascript/chart.js
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_learning/web/css/kumalive.scss
    • -9
    • +23
    /lams_learning/web/includes/javascript/kumalive.js
    • -0
    • +3
    /lams_learning/web/kumalive/kumalive.jsp
4:14 am

Marcin Cieslak

LDEV-4454 Add pie chart, colours to badges and missing voters.

Options
    • -65
    • +92
    /lams_central/web/includes/javascript/chart.js
    • -2
    • +4
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +20
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -6
    • +28
    /lams_learning/web/css/kumalive.scss
    • -20
    • +108
    /lams_learning/web/includes/javascript/kumalive.js
    • -4
    • +14
    /lams_learning/web/kumalive/kumalive.jsp
Wednesday 22 Nov 2017
8:55 pm

Andrey Balan

LDEV-4473 Add bootstrap.js when it's not available on page

Options
    • -1
    • +7
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_central/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_images/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_imscc/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_kaltura/web/WEB-INF/tags/Page.tag
    • -1
    • +7
    /lams_tool_lamc/web/WEB-INF/tags/Page.tag
  16. … 16 more files in changeset.
7:24 pm

Andrey Balan

LDEV-4472 Fix Javascript error on accessing a Grouping activity

Since <i name="ui-${user.userId}" class="fa fa-xs

fa-user"></i>&nbsp;<c:out value="${user.firstName}" />&nbsp<c:out

value="${user.lastName}" /> was removed in one of the previous commits,

this peace of Javascript also needs to be taken care of.

Options
    • -1
    • +0
    /lams_learning/web/grouping/show.jsp
5:56 pm

Marcin Cieslak

LDEV-4454 Add buttons to release votes & voters to learners

Options
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql
    • -0
    • +14
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml
    • -4
    • +9
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -4
    • +40
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +18
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -0
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -0
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
    • -1
    • +1
    /lams_learning/web/css/kumalive.scss
    • -1
    • +41
    /lams_learning/web/includes/javascript/kumalive.js
    • -2
    • +13
    /lams_learning/web/kumalive/kumalive.jsp
1:11 am

Andrey Balan

LDEV-4470 Fix conflict between query-ui's slider and bootstrap-slider

Options
    • -1
    • +2
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/parts/confidencelevel.jsp
    • -0
    • +3
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results/confidencelevel.jsp
    • -0
    • +5
    /lams_tool_lamc/web/learning/AnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/CombinedAnswersContent.jsp
    • -1
    • +1
    /lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp
    • -1
    • +6
    /lams_tool_lamc/web/learning/ViewAnswers.jsp
Tuesday 21 Nov 2017
9:06 pm

Marcin Cieslak

LDEV-4454 Display voters in groups and with badges

Options
    • -5
    • +40
    /lams_learning/web/css/kumalive.scss
    • -8
    • +48
    /lams_learning/web/includes/javascript/kumalive.js
    • -3
    • +2
    /lams_learning/web/kumalive/kumalive.jsp
7:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4457 Create groupings based on file upload

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +16
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java
    • -1
    • +17
    /lams_central/web/WEB-INF/struts-config.xml
    • -1
    • +13
    /lams_central/web/css/orgGroup.scss
    • -0
    • +126
    /lams_central/web/includes/javascript/orgGroup.js
    • -6
    • +71
    /lams_central/web/orgGroup.jsp
    • -0
    • +35
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
    • -0
    • +8
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -0
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -3
    • +33
    /lams_common/src/java/org/lamsfoundation/lams/util/ExcelUtil.java
    • -0
    • +5
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
    • -0
    • +50
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java
    • -0
    • +65
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/FileUploadForm.java
    • -0
    • +403
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java
    • -1
    • +1
    /lams_monitoring/web/grouping/chosenGrouping.jsp
4:23 am

Marcin Cieslak

LDEV-4454 Add voting back end and basic front end

Options
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql
    • -0
    • +6
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePollAnswer.hbm.xml
    • -66
    • +151
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +11
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +2
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -1
    • +23
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -33
    • +75
    /lams_learning/web/includes/javascript/kumalive.js
    • -1
    • +1
    /lams_learning/web/kumalive/kumalive.jsp
Monday 20 Nov 2017
11:43 pm

Andrey Balan

LDEV-4436 Fixing progress bar css

Removed 'min-height' parameter as it was causing nav.sidebar to

appear larger than its descendant .container-fluid div.

Besides, removed box-shadow parameter from .container-fluid as

its parent already has it.

Options
    • -2
    • +0
    /lams_central/web/css/_learner_base.scss
6:34 pm

Marcin Cieslak

LDEV-4454 Clean up poll Java structure

Options
    • -39
    • +47
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
Sunday 19 Nov 2017
12:02 am

Marcin Cieslak

LDEV-4454: Add vote form and poll finish&close flow

Options
    • -2
    • +8
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -29
    • +177
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -1
    • +1
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -4
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -2
    • +4
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -4
    • +19
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -1
    • +28
    /lams_learning/web/css/kumalive.scss
    • -8
    • +121
    /lams_learning/web/includes/javascript/kumalive.js
    • -6
    • +39
    /lams_learning/web/kumalive/kumalive.jsp
Friday 17 Nov 2017
11:03 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll entities and start flow

Options
    • -0
    • +32
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171117.sql
    • -0
    • +40
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePoll.hbm.xml
    • -0
    • +23
    /lams_learning/conf/hibernate/mappings/org/lamsfoundation/lams/learning/kumalive/KumalivePollAnswer.hbm.xml
    • -1
    • +35
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java
    • -0
    • +3
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/IKumaliveDAO.java
    • -0
    • +10
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/dao/hibernate/KumaliveDAO.java
    • -0
    • +98
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
    • -0
    • +76
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
    • -0
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
    • -2
    • +36
    /lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
    • -4
    • +11
    /lams_learning/web/includes/javascript/kumalive.js
    • -1
    • +2
    /lams_learning/web/kumalive/kumalive.jsp
9:25 pm

Marcin Cieslak

LDEV-4454 Kumalive poll setup validation

Options
    • -0
    • +1
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_learning/web/css/kumalive.scss
    • -4
    • +76
    /lams_learning/web/includes/javascript/kumalive.js
    • -7
    • +13
    /lams_learning/web/kumalive/kumalive.jsp
Thursday 16 Nov 2017
9:43 pm

Marcin Cieslak

LDEV-4454 Use strict mode in Kumalive JS scripts

Options
    • -1
    • +2
    /lams_learning/web/includes/javascript/kumalive.js
    • -0
    • +2
    /lams_learning/web/kumalive/kumalive.jsp
9:41 pm

Marcin Cieslak

LDEV-4454 Prevent setting Kumalive speaker when no question is asked

Options
    • -0
    • +3
    /lams_learning/web/includes/javascript/kumalive.js
9:34 pm

Marcin Cieslak

LDEV-4454 Add Kumalive poll setup front end

Options
    • -2
    • +2
    /lams_central/conf/scss/_bootstrap-variables.scss
    • -2
    • +13
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -8
    • +39
    /lams_learning/web/css/kumalive.scss
    • -2
    • +21
    /lams_learning/web/includes/javascript/kumalive.js
    • -2
    • +37
    /lams_learning/web/kumalive/kumalive.jsp
6:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4366: Adding label

Options
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
4:43 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating greek

Options
    • -4
    • +5
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
4:42 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4436: adding label to i18n

Options
    • -4
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
4:56 am

Andrey Balan

Merge branch 'LDEV-4436'

Options
    • binary
    /lams_build/lib/lams/lams.jar
4:54 am

Andrey Balan

LDEV-4436 Ability to change portrait in learner

Options
    • -12
    • +49
    /lams_admin/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_central/web/WEB-INF/tags/Page.tag
    • -6
    • +33
    /lams_central/web/css/_learner_base.scss
    • -0
    • +25
    /lams_central/web/includes/javascript/dialog.js
    • -6
    • +8
    /lams_central/web/portrait.jsp
    • -12
    • +49
    /lams_gradebook/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_learning/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_monitoring/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_assessment/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_bbb/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_chat/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_daco/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_forum/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_gmap/web/WEB-INF/tags/Page.tag
    • -12
    • +49
    /lams_tool_images/web/WEB-INF/tags/Page.tag
  16. … 19 more files in changeset.
4:50 am

Andrey Balan

LDEV-4436 Dialog CSS rules to be available in learning as well

Options
    • -0
    • +70
    /lams_central/web/css/_dialogs.scss
    • -71
    • +0
    /lams_central/web/css/_main_base.scss
    • -0
    • +1
    /lams_central/web/css/defaultHTML_learner.scss
    • -0
    • +1
    /lams_central/web/css/defaultHTML_main.scss
4:47 am

Andrey Balan

LDEV-4436 Add new config setting: display learner's portrait

It controls whether learner's portrait should be displayed in a progress

bar.

Options
    • -0
    • +2
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -30
    • +31
    /lams_admin/web/config/items.jsp
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20171115.sql
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java
Wednesday 15 Nov 2017
5:09 pm

Marcin Cieslak

LDEV-4453 Fix weights calculation on LD save when output changed

Options
    • -1
    • +2
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
    • -0
    • +4
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
7:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4465 Error messages shown as popups, does not freeze screen

Options
    • -6
    • +6
    /lams_gradebook/web/gradebookCourseMonitor.jsp
    • -21
    • +21
    /lams_gradebook/web/gradebookMonitor.jsp
    • -0
    • +16
    /lams_gradebook/web/includes/jsp/jqGridIncludes.jsp
Tuesday 14 Nov 2017
10:33 pm

Marcin Cieslak

Merge branch 'LDEV-4459'

Options