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 29 May 2020
1:28 pm

Marcin Cieslak

Merge branch 'LDEV-5025' into v4.0

Options
1:27 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
1:20 pm

Marcin Cieslak

Merge branch 'LDEV-4925'

Options
1:20 pm

Marcin Cieslak

LDEV-4925 Fix new lines in hedging comments in Peer Review

Options
    • -1
    • +1
    /lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/controller/MonitoringController.java
    • -13
    • +3
    /lams_tool_preview/web/pages/learning/hedging.jsp
Thursday 28 May 2020
3:26 pm

Marcin Cieslak

LDEV-5052 Adjust rating layout in Assessment monitoring

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -4
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -9
    • +11
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
Wednesday 27 May 2020
3:43 pm

Marcin Cieslak

LDEV-5052 Adjust rating layout in Assessment monitoring

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -7
    • +7
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
3:28 pm

Marcin Cieslak

LDEV-5052 Fix page reloading, not from cache

Options
    • -2
    • +5
    /lams_central/web/includes/javascript/rating.js
    • -0
    • +5
    /lams_tool_assessment/web/pages/learning/results.jsp
3:15 pm

Marcin Cieslak

LDEV-5052 Make "not disclosed" info print out in italics

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
3:12 pm

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -38
    • +43
    /lams_central/web/includes/javascript/rating.js
    • -1
    • +2
    /lams_gradebook/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_learning/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_monitoring/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -0
    • +11
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -3
    • +10
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -1
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_doku/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_forum/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_images/web/WEB-INF/tags/Rating.tag
  16. … 20 more files in changeset.
1:01 am

Marcin Cieslak

LDEV-5052 Add group name when displaying rating in monitor

Options
    • -0
    • +3
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -3
    • +5
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
12:51 am

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    /lams_admin/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_central/web/WEB-INF/tags/Rating.tag
    • -0
    • +12
    /lams_central/web/includes/javascript/rating.js
    • -4
    • +13
    /lams_gradebook/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_learning/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_monitoring/web/WEB-INF/tags/Rating.tag
    • -1
    • +6
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -1
    • +2
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
    • -4
    • +13
    /lams_tool_chat/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_daco/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_doku/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_forum/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_gmap/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_images/web/WEB-INF/tags/Rating.tag
    • -4
    • +13
    /lams_tool_imscc/web/WEB-INF/tags/Rating.tag
  16. … 19 more files in changeset.
12:15 am

Marcin Cieslak

LDEV-5025 Put proper text information when answers not yet disclosed

Options
    • -1
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
12:13 am

Marcin Cieslak

LDEV-5025 Show own group ratings only when rated other groups

Options
    • -5
    • +14
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dto/QuestionSummary.java
    • -15
    • +38
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -2
    • +4
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
Tuesday 26 May 2020
11:05 pm

Marcin Cieslak

LDEV-5025 Put own group first in Assessment answer rating table

Options
    • -3
    • +33
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
10:42 pm

Marcin Cieslak

LDEV-5025 Highlight own group when displaying Assessment answer rating

Options
    • -0
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -6
    • +13
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
Monday 25 May 2020
8:09 pm

Marcin Cieslak

LDEV-5025 Show detailed answer ratings in Assessment monitoring

Options
    • -0
    • +3
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -7
    • +72
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -8
    • +60
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
7:03 pm

Marcin Cieslak

LDEV-5025 Show average answer rating in Assessment monitoring

Options
    • -2
    • +6
    /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
    • -3
    • +59
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -7
    • +27
    /lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp
3:32 pm

Marcin Cieslak

LDEV-5025 Allow rating only for Leaders

Options
    • -6
    • +10
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
2:55 pm

Marcin Cieslak

LDEV-5025 Show rating for the given team's own answer

Options
    • -1
    • +1
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -16
    • +26
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
2:21 pm

Marcin Cieslak

LDEV-5025 Do not centre an other group's answer in the results table

Options
    • -1
    • +1
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
Friday 22 May 2020
2:53 pm

Marcin Cieslak

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

Options
2:51 pm

Marcin Cieslak

Merge branch 'LDEV-5031'

Options
2:50 pm

Marcin Cieslak

LDEV-5031 Refresh last TBL tab content. Periodic refresh.

Options
    • -4
    • +18
    /lams_monitoring/web/tblmonitor/tblmonitor.jsp
Thursday 21 May 2020
2:46 pm

Marcin Cieslak

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

Options
    • -1
    • +2
    /lams_tool_doku/web/pages/monitoring/summary.jsp
2:46 pm

Marcin Cieslak

LDEV-5025 Allow Assessment other groups' answer rating and commenting

Options
    • -0
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/RatingServlet.java
    • -6
    • +20
    /lams_central/web/includes/javascript/rating.js
    • -16
    • +19
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/IRatingDAO.java
    • -20
    • +39
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -57
    • +80
    /lams_common/src/java/org/lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -5
    • +9
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/IRatingService.java
    • -5
    • +13
    /lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java
    • -0
    • +5
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
    • -0
    • +49
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/LearningController.java
    • -4
    • +8
    /lams_tool_assessment/web/WEB-INF/tags/Rating.tag
    • -1
    • +25
    /lams_tool_assessment/web/pages/learning/results.jsp
    • -1
    • +10
    /lams_tool_assessment/web/pages/learning/results/essay.jsp
2:44 pm

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +2
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -1
    • +4
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +4
    /lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
  16. … 18 more files in changeset.
Wednesday 20 May 2020
2:39 pm

Marcin Cieslak

Merge branch 'LDEV-5029' into v4.0

Options
2:39 pm

Marcin Cieslak

LDEV-5029 Make IRA question collapsible in TBL template

Options
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -0
    • +4
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -6
    • +9
    /lams_central/web/authoring/template/tool/mcquestion.jsp
1:58 am

Marcin Cieslak

LDEV-5024 Fix layout issues in TBL template

Options
    • -1
    • +1
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +1
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -6
    • +11
    /lams_central/web/authoring/template/tbl/tbl.jsp
Tuesday 19 May 2020
11:04 pm

Marcin Cieslak

Merge branch 'LDEV-5028' into v4.0

Options