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
Sunday 24 Jun 2018
8:41 pm

Marcin Cieslak

Monthly merge from master to lams31

Conflicts:

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java

lams_tool_mindmap/.classpath

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/service/MindmapService.java

Options
    • -0
    • +1
    /lams_build/common.properties
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • binary
    /lams_build/lib/lams/lams.jar
    • -0
    • +1
    /lams_build/unix.properties
    • -8
    • +14
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -30
    • +179
    /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java
    • -1
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java
    • -5
    • +41
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java
    • -2
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -4
    • +17
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -3
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -0
    • +6
    /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
    • -4
    • +4
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java
    • -2
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
  16. … 9 more files in changeset.
Saturday 23 Jun 2018
8:23 am

Andrey Balan

LDEV-4593 Further develop Policies & consents feature

Options
    • -7
    • +6
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -59
    • +87
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/PolicyManagementAction.java
    • -1
    • +1
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java
    • -0
    • +37
    /lams_admin/src/java/org/lamsfoundation/lams/admin/web/dto/UserPolicyConsentDTO.java
    • -0
    • +6
    /lams_admin/web/WEB-INF/struts-config.xml
    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -138
    • +0
    /lams_admin/web/policies/edit.jsp
    • -0
    • +143
    /lams_admin/web/policies/editPolicy.jsp
    • -115
    • +0
    /lams_admin/web/policies/list.jsp
    • -0
    • +164
    /lams_admin/web/policies/policies.jsp
    • -81
    • +0
    /lams_admin/web/policies/previousVersionsList.jsp
    • -0
    • +82
    /lams_admin/web/policies/userConsents.jsp
    • -0
    • +19
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java
    • -1
    • +26
    /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java
  16. … 13 more files in changeset.
1:35 am

Marcin Cieslak

Merge branch 'LDEV-4607'

Options
1:28 am

Marcin Cieslak

LDEV-4607 Confirm delete marks on output change in monitoring

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
    • -0
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -1
    • +8
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
1:02 am

Marcin Cieslak

LDEV-4607 Show "no score" gradebook output option in authoring

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    /lams_central/web/authoring/authoring.jsp
    • -1
    • +1
    /lams_central/web/includes/javascript/authoring/authoringProperty.js
12:42 am

Marcin Cieslak

LDEV-4607 Remove marks on output change to "none" in monitoring

Options
    • binary
    /lams_build/lib/lams/lams-gradebook.jar
    • -14
    • +18
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -11
    • +24
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -1
    • +4
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/monitoring/parts/toolOutput.jsp
    • -5
    • +0
    /lams_tool_assessment/web/pages/monitoring/statisticpart.jsp
    • -0
    • +1
    /lams_tool_lamc/conf/language/lams/ApplicationResources.properties
    • -32
    • +31
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McMonitoringAction.java
    • -5
    • +0
    /lams_tool_lamc/web/monitoring/parts/statsPart.jsp
    • -1
    • +1
    /lams_tool_lamc/web/monitoring/parts/toolOutput.jsp
Thursday 21 Jun 2018
6:56 pm

Marcin Cieslak

Merge branch 'LDEV-4606'

Options
6:54 pm

Marcin Cieslak

LDEV-4606 Remove lesson mark if there are no activity marks left

Options
    • -6
    • +13
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
2:34 pm

Marcin Cieslak

Revert "LDEV_NTU-10 Add a column "LAMS group" in exported summary"

This reverts commit 502290bd52d375ca2661924f6c80ff5590e5aaaf.

Options
    • -1
    • +0
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -67
    • +11
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
Wednesday 20 Jun 2018
7:20 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Removing debugging

Options
    • -3
    • +1
    /lams_central/web/includes/javascript/addLesson.js
6:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Tweaking date validation and display of scheduled dates

Options
    • -1
    • +3
    /lams_central/web/includes/javascript/addLesson.js
    • -3
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Tuesday 19 Jun 2018
5:59 am

Andrey Balan

LDEV-4604 Improvements to burning questions page (learner)

1) Add buttons for expand/collapse all in burning questions. Only

display these buttons if there's burning questions.

2) Display a counter for burning questions next to the question name

3) Save cells on blur event

Options
    • -0
    • +2
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -11
    • +41
    /lams_tool_scratchie/web/pages/learning/results.jsp
3:52 am

Andrey Balan

LDEV-4598 Questions must have a link to burning questions

Options
    • -0
    • +1
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +14
    /lams_tool_scratchie/web/pages/learning/results.jsp
    • -0
    • +9
    /lams_tool_scratchie/web/pages/learning/scratchies.jsp
Monday 18 Jun 2018
8:18 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Tweaking css and button display for disabling lessons

Options
    • -1
    • +13
    /lams_monitoring/web/css/_monitorLesson_base.scss
    • -7
    • +9
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -3
    • +2
    /lams_monitoring/web/monitor.jsp
6:48 pm

Marcin Cieslak

LDEV-4599 Add authoring advanced settings: duration and start in monitor

Options
    • -1
    • +18
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml
    • -0
    • +3
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +6
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
    • -10
    • +19
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
    • -15
    • +26
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -0
    • +3
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java
    • -2
    • +4
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -1
    • +20
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
    • -7
    • +51
    /lams_tool_zoom/web/pages/authoring/advanced.jsp
4:24 pm

Marcin Cieslak

LDEV-4599 Adjust learner layout

Options
    • -1
    • +1
    /lams_tool_zoom/web/pages/learning/learning.jsp
4:24 pm

Marcin Cieslak

LDEV-4599 Add Zoom activity preview

Options
    • -1
    • +35
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
    • -39
    • +15
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -22
    • +4
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
4:11 pm

Marcin Cieslak

LDEV-4599 Use another call to verify if API works

Options
    • -3
    • +3
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
4:08 pm

Marcin Cieslak

LDEV-4599 Use API with oldest live meeting if there are no free ones

Options
    • -3
    • +20
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
3:46 pm

Marcin Cieslak

LDEV-4599 In authoring warn of missing API keys

Options
    • -6
    • +6
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +9
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AuthoringAction.java
12:42 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4601 Schedule the end date when teacher creates a lesson.

Options
    • -2
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +10
    /lams_central/web/addLesson.jsp
    • -2
    • +2
    /lams_central/web/css/addLesson.scss
    • -3
    • +46
    /lams_central/web/includes/javascript/addLesson.js
    • -0
    • +4
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -4
    • +17
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java
    • -21
    • +61
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -22
    • +32
    /lams_monitoring/web/monitor.jsp
Sunday 17 Jun 2018
10:05 pm

Marcin Cieslak

LDEV-4599 API keys management

Options
    • -12
    • +11
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -14
    • +3
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
    • -1
    • +1
    /lams_tool_zoom/db/sql/tool_insert.sql
    • -30
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/IZoomConfigDAO.java
    • -30
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/IZoomSessionDAO.java
    • -30
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/IZoomUserDAO.java
    • -33
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/hibernate/ZoomConfigDAO.java
    • -33
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/hibernate/ZoomSessionDAO.java
    • -33
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dao/hibernate/ZoomUserDAO.java
    • -4
    • +19
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.java
    • -1
    • +28
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java
    • -59
    • +88
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -18
    • +45
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java
    • -12
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -3
    • +21
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
  16. … 6 more files in changeset.
6:29 pm

Marcin Cieslak

LDEV-4599 Get rid of unnecessary Config entity

Options
    • -53
    • +0
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomConfig.hbm.xml
    • -7
    • +0
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
    • -28
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ConfigDTO.java
    • -80
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomConfig.java
    • -45
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java
    • -28
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -39
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java
    • -53
    • +0
    /lams_tool_zoom/web/pages/admin/edit.jsp
    • -16
    • +0
    /lams_tool_zoom/web/pages/zoom/end_meeting.jsp
6:25 pm

Marcin Cieslak

LDEV-4599 Duplicate user data in the tool

User data like name or email seems redundant in tool tables. But

otherwise we would have to hit the core tables every time we want to

fetch it. We stick to redundancy until we have a well working 2nd level

cache and we agree to couple tool and core tables more tightly.

Options
    • -7
    • +28
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml
    • -8
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/SessionDTO.java
    • -6
    • +4
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ZoomUserDTO.java
    • -17
    • +37
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.java
    • -4
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java
    • -8
    • +2
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -1
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -3
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
12:10 am

Marcin Cieslak

LDEV-4599 Build monitoring for Zoom activity

Options
    • -0
    • +30
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ContentDTO.java
    • -0
    • +24
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/SessionDTO.java
    • -1
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -6
    • +6
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
    • -8
    • +0
    /lams_tool_zoom/web/pages/monitoring/statistics.jsp
    • -87
    • +44
    /lams_tool_zoom/web/pages/monitoring/summary.jsp
Saturday 16 Jun 2018
11:17 pm

Marcin Cieslak

LDEV-4599 Add monitor start meeting flow

Options
    • -1
    • +1
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -31
    • +53
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -0
    • +5
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomConstants.java
    • -30
    • +16
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/LearningAction.java
    • -14
    • +13
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/MonitoringAction.java
    • -0
    • +5
    /lams_tool_zoom/web/WEB-INF/struts-config.xml
    • -51
    • +21
    /lams_tool_zoom/web/pages/learning/learning.jsp
11:16 pm

Marcin Cieslak

LDEV-4599 Enable contribution from tool activities

Options
    • binary
    /lams_build/lib/lams/lams.jar
    • -1
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ContributionTypes.java
    • -0
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/learningdesign/strategy/ToolActivityStrategy.java
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/tool/ToolContentManager.java
    • -7
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java
    • -0
    • +1
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -1
    • +2
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/dto/ContributeActivityDTO.java
    • -2
    • +4
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/ContributeDTOFactory.java
    • -0
    • +1
    /lams_monitoring/web/includes/javascript/monitorLesson.js
    • -0
    • +2
    /lams_monitoring/web/monitor.jsp
11:14 pm

Marcin Cieslak

LDEV-4599 Make Zoom tool enabled from the start

Options
    • -1
    • +1
    /lams_tool_zoom/build.properties
    • -1
    • +1
    /lams_tool_zoom/db/sql/library_insert.sql
    • -1
    • +1
    /lams_tool_zoom/db/sql/tool_insert.sql
11:13 pm

Marcin Cieslak

LDEV-4599 Fix library path

Options
    • -1
    • +1
    /lams_build/3rdParty.userlibraries
Friday 15 Jun 2018
8:35 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4602 Full screen mode

Options
    • -6
    • +77
    /lams_monitoring/web/css/timer.scss
    • -4
    • +63
    /lams_monitoring/web/timer.jsp