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 01 Feb 2021
9:11 pm

Marcin Cieslak

Merge branch 'LDEV-5143' into v4.0

Conflicts:

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/SessionDTO.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

Options
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +19
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/GradeStatsDTO.java
    • -0
    • +79
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -0
    • +20
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -0
    • +11
    /lams_tool_assessment/web/pages/learning/learning.jsp
    • -15
    • +66
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -0
    • +3
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_scratchie/conf/language/lams/ApplicationResources.properties
    • -0
    • +3
    /lams_tool_vote/conf/language/lams/ApplicationResources.properties
12:44 pm

Ernie Ghiglione

LDEV-5143 and LDEV-5140 labels updates

Options
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources.properties
    • -3
    • +3
    /lams_learning/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_leader/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    /lams_tool_sbmt/conf/language/lams/ApplicationResources.properties
  16. … 7 more files in changeset.
11:17 am

Ernie Ghiglione

LDEV-5140 adjusting font size

Options
    • -1
    • +1
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
6:40 am

Marcin Cieslak

Merge branch 'LDEV-5158' into LDEV-5143

Options
6:40 am

Marcin Cieslak

LDEV-5158 Fix description validation on Submit Files front end

Options
    • -1
    • +1
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
6:33 am

Marcin Cieslak

Merge branch 'LDEV-5161' into LDEV-5143

Options
6:32 am

Marcin Cieslak

LDEV-5161 After leader change always redirect to main learner URL

Options
    • -1
    • +2
    /lams_tool_sbmt/web/learner/sbmtlearner.jsp
5:54 am

Marcin Cieslak

Merge branch 'LDEV-5160' into LDEV-5143

Options
5:53 am

Marcin Cieslak

LDEV-5160 Fix an exception when removing content of leader

Options
    • -0
    • +5
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
5:40 am

Marcin Cieslak

Merge branch 'LDEV-5159' into LDEV-5143

Options
5:40 am

Marcin Cieslak

LDEV-5159 Refresh Assessment monitoring after leader change

Options
    • -0
    • +1
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
Sunday 31 Jan 2021
10:46 pm

Marcin Cieslak

LDEV-5154 Remove incorrectly committed test code

Options
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
7:55 pm

Ernie Ghiglione

LDEV-5140 logo image with CSS instead

Options
    • -6
    • +7
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
1:52 pm

Ernie Ghiglione

LDEV-5140 Fixing image email

Adding new LAMS logos and adjusting email teamplate for grades

Options
    • -0
    • +1
    /lams_central/web/images/svg/lamsv5_logo.svg
    • -0
    • +1
    /lams_central/web/images/svg/lamsv5_logo_reverse.svg
    • -1
    • +2
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
Saturday 30 Jan 2021
4:23 am

Marcin Cieslak

LDEV-5143 Fix marking all learners with star when there is no leader

Options
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp
    • -1
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
4:13 am

Marcin Cieslak

LDEV-5143 Refresh Scratchie monitoring after leader change

Tables in summary tab need to reflect the change.

Options
    • -0
    • +1
    /lams_tool_scratchie/web/pages/monitoring/summary.jsp
4:11 am

Marcin Cieslak

LDEV-5143 Allow promoting to leader a learner who did not reach activity

Options
    • -8
    • +18
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -2
    • +2
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -2
    • +14
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +12
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -2
    • +2
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -6
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -5
    • +0
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
    • -0
    • +15
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java
    • -2
    • +2
    /lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp
    • -1
    • +2
    /lams_tool_leader/conf/language/lams/ApplicationResources.properties
    • -3
    • +10
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/MonitoringController.java
    • -0
    • +5
    /lams_tool_leader/web/pages/monitoring/changeLeaderDialog.jsp
    • -7
    • +17
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
    • -0
    • +15
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/MonitoringController.java
  16. … 7 more files in changeset.
Friday 29 Jan 2021
7:19 pm

Marcin Cieslak

LDEV-5148 Include average, median, mode into export summary sheet

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -3
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -2
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/AssessmentUserDTO.java
    • -56
    • +96
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -5
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -8
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
5:51 pm

Ernie Ghiglione

LDEV-5140 shrink LAMS logo svg

Options
    • -2
    • +1
    /lams_www/web/gradebookReleaseLessonMarksEmailTemplate.html
11:42 am

Ernie Ghiglione

LDEV-4769 Update Norwegian, Spanish, English, Greek, German, French

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -23
    • +23
    /lams_gradebook/conf/language/lams/ApplicationResources.properties
    • -5
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources_de_DE.properties
    • -5
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources_el_GR.properties
    • -23
    • +23
    /lams_gradebook/conf/language/lams/ApplicationResources_en_AU.properties
    • -5
    • +25
    /lams_gradebook/conf/language/lams/ApplicationResources_es_ES.properties
    • -5
    • +2
    /lams_gradebook/conf/language/lams/ApplicationResources_fr_FR.properties
    • -5
    • +25
    /lams_gradebook/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +6
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +7
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -2
    • +1
    /lams_tool_daco/conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    /lams_tool_daco/conf/language/lams/ApplicationResources_de_DE.properties
  16. … 8 more files in changeset.
12:42 am

Marcin Cieslak

LDEV-5143 Allow changing leader if activity is not grouped

Options
    • -20
    • +30
    /lams_tool_assessment/web/pages/monitoring/summary.jsp
    • -5
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -18
    • +27
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -18
    • +28
    /lams_tool_laqa/web/monitoring/SummaryContent.jsp
    • -15
    • +25
    /lams_tool_sbmt/web/monitoring/parts/summary.jsp
Thursday 28 Jan 2021
11:56 pm

Marcin Cieslak

LDEV-5143 Do not allow changing Q&A leader after response was submitted

Options
    • -0
    • +6
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java
    • -1
    • +1
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/LearningController.java
    • -1
    • +3
    /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/MonitoringController.java
11:30 pm

Marcin Cieslak

LDEV-5143 Refresh learners in Leader Selection on leader change

Options
    • -4
    • +11
    /lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/controller/LearningWebsocketServer.java
    • -73
    • +71
    /lams_tool_leader/web/pages/learning/leaderselection.jsp
11:09 pm

Marcin Cieslak

LDEV-5143 Display group members on Submit Files wait-for-leader screen

Options
    • -0
    • +2
    /lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/controller/LearningController.java
2:21 pm

Marcin Cieslak

LDEV-4813 Add a missing index on Assessment Result table

It is vital for fetching VSA questions and confidence levels.

Options
    • -0
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20210127.sql
1:42 am

Marcin Cieslak

Merge branch 'LDEV-5154' into v4.0

Options
1:41 am

Marcin Cieslak

LDEV-5154 Add message on retrieving monitoring data error

An access forbidden 403 error is rendered as error.jsp page. There is no

way for Ajax call to understand what happened as it just receives HTML.

So on any error we display a message and close the monitoring window.

Options
    • -1
    • +1
    /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java
1:28 am

Marcin Cieslak

LDEV-3115 Remove grouping/input references on activity remove

Options
    • -10
    • +12
    /lams_central/web/includes/javascript/authoring/authoringActivity.js
12:50 am

Marcin Cieslak

LDEV-4909 Allow grouping not being connected to support activity

Options
    • -18
    • +33
    /lams_central/web/includes/javascript/authoring/authoringGeneral.js
Wednesday 27 Jan 2021
7:39 pm

Marcin Cieslak

Merge branch 'LDEV-5140' into v4.0

Options
    • -0
    • +1
    /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookMonitoringController.java