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
Friday 26 Jun 2020
8:39 pm

Marcin Cieslak

LDEV-4745 Use correct JSON attribute name for QB question max mark

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
8:23 pm

Marcin Cieslak

LDEV-5047 Make numeric option more accurate as it performs rounding

Options
    • -0
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200626.sql
    • -15
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200626.sql
5:15 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
5:14 pm

Marcin Cieslak

Merge branch 'LDEV-5047'

Options
5:14 pm

Marcin Cieslak

LDEV-5047 Make numeric option more accurate as it performs rounding

Options
    • -0
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200626.sql
Thursday 25 Jun 2020
5:45 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'v4.0' into LDEV-4886

Options
    • -8
    • +2
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -4
    • +4
    /lams_central/web/passwordChangeContent.jsp
    • -2
    • +3
    /lams_monitoring/web/includes/javascript/monitorLesson.js
Wednesday 24 Jun 2020
8:37 pm

Marcin Cieslak

Merge branch 'LDEV-5033' into v4.0

Options
8:37 pm

Marcin Cieslak

LDEV-5033 Add answer justification to Assessment

Options
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -0
    • +17
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200624.sql
    • -13
    • +27
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionDTO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -0
    • +28
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -2
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
    • -1
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -1
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +7
    /lams_tool_assessment/web/pages/authoring/advance.jsp
    • -1
    • +26
    /lams_tool_assessment/web/pages/learning/parts/allquestions.jsp
    • -0
    • +9
    /lams_tool_assessment/web/pages/learning/results/allquestions.jsp
    • -0
    • +5
    /lams_tool_assessment/web/pages/monitoring/parts/userresponse.jsp
Tuesday 23 Jun 2020
7:31 pm

Marcin Cieslak

Merge branch 'LDEV-5041' into v4.0

Options
7:30 pm

Marcin Cieslak

LDEV-5041 Use CSS instead of deprecated HTML attributes

Options
    • -0
    • +4
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -13
    • +13
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
12:50 pm

Ernie Ghiglione

LDEV-5041 add/fix labels and modify the monitor UI stlightly

Options
    • -5
    • +8
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -33
    • +40
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
Monday 22 Jun 2020
8:47 pm

Marcin Cieslak

LDEV-5041 Allow adding a whole group to individual time limit table

Options
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -11
    • +86
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -5
    • +6
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
6:57 pm

Marcin Cieslak

LDEV-5041 Allow time limit for learners who did not reach Assessment yet

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -4
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -24
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -1
    • +10
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -2
    • +21
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -11
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java
    • -7
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -7
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -20
    • +37
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/authoring/advance.jsp
    • -1
    • +0
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -12
    • +8
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
4:48 pm

Marcin Cieslak

LDEV-5041 Add lesson service utility method

Options
    • -6
    • +5
    /lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java
    • -12
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/events/EventNotificationService.java
    • -3
    • +6
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
    • -19
    • +26
    /lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
    • -10
    • +10
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
    • -8
    • +5
    /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
3:29 pm

Marcin Cieslak

LDEV-5041 Remove block UI on learner entry with time limit

Options
    • -1
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -22
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -44
    • +0
    /lams_tool_assessment/web/pages/learning/learning.jsp
11:24 am

Marcin Cieslak

Merge remote-tracking branch 'origin/master' into v4.0

Options
    • -1
    • +2
    /lams_tool_doku/web/pages/monitoring/summary.jsp
11:21 am

Marcin Cieslak

Merge branch 'LDEV-5046'

Options
11:21 am

Marcin Cieslak

LDEV-5046 Make counter not overlap with its buttons in Doku monitoring

Options
    • -1
    • +2
    /lams_tool_doku/web/pages/monitoring/summary.jsp
Friday 19 Jun 2020
4:50 pm

Ernie Ghiglione

LDEV-5043 autocomplete stuff for 5.0 branch

Options
    • -4
    • +4
    /lams_central/web/passwordChangeContent.jsp
3:27 pm

Ernie Ghiglione

LDEV-5043 autocomplete stuff for 5.0 branch

Options
    • -34
    • +16
    /lams_admin/web/user.jsp
    • -3
    • +3
    /lams_central/web/login.jsp
    • -10
    • +7
    /lams_central/web/signup/loginTab.jsp
    • -22
    • +13
    /lams_central/web/signup/singupTab.jsp
10:36 am

Ernie Ghiglione

LDEV-5043 update autocomplete login/change password form

Options
    • -3
    • +3
    /lams_central/web/login.jsp
    • -4
    • +4
    /lams_central/web/passwordChangeContent.jsp
    • -8
    • +5
    /lams_central/web/signup/loginTab.jsp
    • -17
    • +9
    /lams_central/web/signup/singupTab.jsp
Thursday 18 Jun 2020
11:55 pm

Marcin Cieslak

LDEV-5041 Expand panel if absolute time limit is set and not expired

Options
    • -0
    • +5
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
11:50 pm

Marcin Cieslak

LDEV-5041 Add individual time limits

Options
    • -1
    • +2
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -2
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +22
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentUser.java
    • -1
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -0
    • +49
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +5
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -3
    • +59
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -0
    • +104
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:29 pm

Marcin Cieslak

LDEV-5041 Add "Finish now" feature

Options
    • -1
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +13
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -9
    • +27
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
7:28 pm

Marcin Cieslak

LDEV-5041 Provide correct user ID when fetching seconds till time limit

Options
    • -2
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -2
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
6:21 pm

Marcin Cieslak

LDEV-5041 Add absolute time limit feature to Assessment

Options
    • -2
    • +0
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20200617.sql
    • -6
    • +23
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/Assessment.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -5
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -4
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -11
    • +20
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -3
    • +10
    /lams_tool_assessment/web/pages/monitoring/monitoring.jsp
    • -12
    • +62
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -32
    • +178
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
Wednesday 17 Jun 2020
7:26 pm

Marcin Cieslak

LDEV-5041 Update jQuery Countdown

Options
    • -6
    • +7
    /lams_central/web/includes/javascript/jquery.countdown.js
    • -4
    • +9
    /lams_central/web/includes/javascript/jquery.plugin.js
6:17 pm

Marcin Cieslak

LDEV-5041 Control relative time limit in Assessment monitor

Options
    • -0
    • +1
    /lams_central/conf/security/Owasp.CsrfGuard.properties
    • -1
    • +20
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -0
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -134
    • +139
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -0
    • +70
    /lams_tool_assessment/web/pages/monitoring/parts/timeLimit.jsp
    • -1
    • +73
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
12:43 pm

Ernie Ghiglione

LDEV-4769 Updating labels

Options
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_central/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro.html
    • -3
    • +3
    /lams_www/web/public/ld-templates/tbl/tblintro_en_AU.html
12:51 am

Marcin Cieslak

LDEV-5041 Rewrite Assessment time limit with websockets

Options
    • -1
    • +2
    /lams_tool_assessment/.classpath
    • -1
    • +19
    /lams_tool_assessment/build.xml
    • -2
    • +0
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java
    • -6
    • +8
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentUserDAO.java
    • -0
    • +11
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -34
    • +13
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -12
    • +5
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -34
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -0
    • +238
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningWebsocketServer.java
    • -43
    • +107
    /lams_tool_assessment/web/pages/learning/learning.jsp