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 18 Jun 2018
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
6:26 pm

Ernie Ghiglione <ernieg@gmail.com>

CLOUD-88: Ooopss

Sorry, didn't mean to commit these two files.

Options
    • -4
    • +0
    /lams_build/common.properties
    • -1
    • +0
    /lams_build/unix.properties
11:27 am

Ernie Ghiglione <ernieg@gmail.com>

CLOUD-88: removing flash tutorial video

removing flash video replace it with youtube streaming instead

Options
    • -0
    • +5
    /lams_build/common.properties
    • -0
    • +2
    /lams_build/unix.properties
    • -25
    • +2
    /lams_central/web/tutorialVideo.jsp
1:59 am

Marcin Cieslak

Merge branch 'LDEV-4600'

Options
1:59 am

Marcin Cieslak

LDEV-4600 Sanitise a parameter when changing password

Options
    • -1
    • +1
    /lams_central/web/forgotPasswordChange.jsp
Thursday 14 Jun 2018
1:53 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4054: Updating labels in various projects

English, Spanish and Greek

Options
    • -3
    • +3
    /lams_admin/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
    • -10
    • +11
    /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +5
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -15
    • +3
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_common/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_common/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    /lams_common/conf/language/lams/ApplicationResources_en_AU.properties
    • -6
    • +7
    /lams_common/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +5
    /lams_monitoring/conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +3
    /lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties
1:35 pm

Ernie Ghiglione <ernieg@gmail.com>

LDEV-4588: adding removing labels

In English, Greek and Spanish

Options
    • -14
    • +16
    /lams_tool_mindmap/conf/language/lams/ApplicationResources.properties
    • -6
    • +15
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_el_GR.properties
    • -8
    • +14
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties
    • -8
    • +14
    /lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties
Wednesday 13 Jun 2018
9:03 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4602 TBL Monitor launches a new window with a countdown timer

Options
    • binary
    /lams_central/web/includes/sounds/276607__mickleness__ringtone-foofaraw.mp3
    • binary
    /lams_central/web/includes/sounds/276607__mickleness__ringtone-foofaraw.ogg
    • binary
    /lams_central/web/includes/sounds/276607__mickleness__ringtone-foofaraw.wav
    • -1
    • +11
    /lams_monitoring/conf/language/lams/ApplicationResources.properties
    • -0
    • +53
    /lams_monitoring/web/css/timer.scss
    • -4
    • +8
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
    • -0
    • +231
    /lams_monitoring/web/timer.jsp
Tuesday 12 Jun 2018
10:21 pm

Andrey Balan

Revert "Merge branch 'LDEV_NTU-12'"

This reverts commit 183bac242c2d086c728767b79b2bf3be9604370a, reversing

changes made to 58e35ac606c140010b53bae4314478e0cf63f05d.

Options
    • -2
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -4
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -42
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -23
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -10
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -11
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -1
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Monday 11 Jun 2018
11:57 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

Merge branch 'LDEV_NTU-12'

Options
11:56 am

tkkaung@ntu.edu.sg <tkkaung@ntu.edu.sg>

LDEV_NTU-12 Need to be able to change tool output to blank

Options
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -0
    • +42
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +23
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java
    • -0
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
Sunday 10 Jun 2018
11:47 pm

Marcin Cieslak

LDEV-4599 Add Zoom icon

Options
    • -0
    • +1
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
11:47 pm

Marcin Cieslak

LDEV-4599 Initial implementation of Zoom tool

Options
    • -0
    • +32
    /lams_tool_zoom/.classpath
    • -0
    • +3
    /lams_tool_zoom/.gitignore
    • -0
    • +18
    /lams_tool_zoom/.project
    • -0
    • +7
    /lams_tool_zoom/build.properties
    • -0
    • +7
    /lams_tool_zoom/build.xml
    • -0
    • +166
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/Zoom.hbm.xml
    • -0
    • +55
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomApi.hbm.xml
    • -0
    • +53
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomConfig.hbm.xml
    • -0
    • +107
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomSession.hbm.xml
    • -0
    • +79
    /lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomUser.hbm.xml
    • -0
    • +68
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +28
    /lams_tool_zoom/db/sql/activity_insert.sql
    • -0
    • +95
    /lams_tool_zoom/db/sql/create_lams_tool_zoom.sql
    • -0
    • +2
    /lams_tool_zoom/db/sql/db_version_insert.sql
    • -0
    • +16
    /lams_tool_zoom/db/sql/library_insert.sql
  16. … 120 more files in changeset.
Friday 08 Jun 2018
4:06 pm

Marcin Cieslak

LDEV-4599 Add JWT library source code

Options
    • -0
    • +51
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/ClaimJwtException.java
    • -0
    • +174
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Claims.java
    • -0
    • +102
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/ClaimsMutator.java
    • -0
    • +18
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Clock.java
    • -0
    • +55
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/CompressionCodec.java
    • -0
    • +46
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/CompressionCodecResolver.java
    • -0
    • +34
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/CompressionCodecs.java
    • -0
    • +33
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/CompressionException.java
    • -0
    • +39
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/ExpiredJwtException.java
    • -0
    • +132
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Header.java
    • -0
    • +32
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/IncorrectClaimException.java
    • -0
    • +54
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/InvalidClaimException.java
    • -0
    • +28
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Jws.java
    • -0
    • +107
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/JwsHeader.java
    • -0
    • +40
    /3rdParty_sources/jsonwebtoken/io/jsonwebtoken/Jwt.java
  16. … 67 more files in changeset.
4:05 pm

Marcin Cieslak

LDEV-4599 Add JWT library. Set up dependencies.

If LAMS has been slimmed before deployment of this patch, it is missing

Jackson library which is needed for JWT library to work. The library can

taken from a fresh copy of WF from the following path:

<WF>modules\system\layers\base\com\fasterxml

It needs to be copied to the slimmed WF instance.

Options
    • -43
    • +44
    /lams_build/3rdParty.userlibraries
    • -3
    • +8
    /lams_build/build.xml
    • -1
    • +2
    /lams_build/conf/j2ee/jboss-deployment-structure.xml
    • -0
    • +1
    /lams_build/lib/jdk/jdk.module.xml
    • binary
    /lams_build/lib/json/jjwt-0.9.0.jar
    • -0
    • +35
    /lams_build/lib/json/jjwt.module.xml
    • -0
    • +2
    /lams_build/liblist.txt
Thursday 07 Jun 2018
10:01 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

Merge branch 'LDEV_NTU-11'

Options
10:00 am

SanjanaPabsetti <Sanjana.pabsetti@gmail.com>

LDEV_NTU-11 Swapping Mark and Response columns in Assessment Monitor

Options
    • -3
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java
    • -4
    • +4
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
    • -4
    • +4
    /lams_tool_assessment/web/pages/monitoring/summary.jsp