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
Thursday 21 May 2020
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
11:02 pm

Marcin Cieslak

LDEV-5028 Add Peer Review tool to standard LAMS build

Options
    • -1
    • +1
    /lams_build/build.xml
11:01 pm

Marcin Cieslak

Merge branch 'LDEV-5024' into v4.0

Options
11:00 pm

Marcin Cieslak

LDEV-5024 Import QB questions to AE in TBL template

Options
    • -4
    • +7
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/Assessment.java
    • -9
    • +46
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -1
    • +4
    /lams_central/web/authoring/template/comms.jsp
    • -0
    • +20
    /lams_central/web/authoring/template/tbl/appex.jsp
    • -17
    • +29
    /lams_central/web/authoring/template/tbl/tbl.jsp
    • -0
    • +1
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbQuestion.java
    • -3
    • +16
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
5:35 pm

Marcin Cieslak

LDEV-5024 Close QB panel after importing a question

Options
    • -4
    • +6
    /lams_central/web/authoring/template/tbl/tbl.jsp
4:25 pm

Marcin Cieslak

LDEV-5024 Detect and process QB question modification

Options
    • -63
    • +89
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
2:26 pm

Marcin Cieslak

LDEV-4746 Fix question and option ordering issues.

Options
    • -1
    • +12
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql
    • -0
    • +11
    /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200519.sql
Monday 18 May 2020
2:01 pm

Marcin Cieslak

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

Options
    • -2
    • +162
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -1
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
1:56 pm

Ernie Ghiglione

LDEV-4745 adding labels for Greek and Norwegian

Options
    • -2
    • +162
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +164
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
1:06 pm

Marcin Cieslak

LDEV-4996 Adjust doKu code to follow Etherpad resize update

Options
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_doku/web/pages/monitoring/summary.jsp
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -12
    • +19
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -1
    • +1
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
    • -1
    • +1
    /lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
  16. … 18 more files in changeset.
Sunday 17 May 2020
6:11 am

Ernie Ghiglione

LDEV-4967 include appropriate contentType

Options
    • -1
    • +1
    /lams_central/web/loadVars.jsp
Saturday 16 May 2020
6:31 pm

Marcin Cieslak

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

Conflicts:

lams_tool_zoom/web/pages/learning/learning.jsp

Options
    • -11
    • +13
    /lams_tool_doku/web/pages/monitoring/summary.jsp
    • -1
    • +0
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
2:37 pm

Ernie Ghiglione

LDEV-4996 add further details to readme

Options
    • -8
    • +15
    /lams_build/conf/etherpad/readme.txt
12:35 pm

Ernie Ghiglione

LDEV-4996 changes to settings.json for etherpad 1.8.4

Change default skin to colibris

Change editOnliny to true

Bring back the return to pad in timeslider

Options
    • -13
    • +3
    /lams_build/conf/etherpad/etherpad-lite/settings.json
Friday 15 May 2020
7:09 pm

Marcin Cieslak

LDEV-4996 Add Etherpad autogrow feature to Doku tool

Options
    • -0
    • +13
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -11
    • +13
    /lams_tool_doku/web/pages/monitoring/summary.jsp
7:07 pm

Marcin Cieslak

LDEV-4996 Remove obsolete menu item

Options
    • -1
    • +1
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -1
    • +0
    /lams_tool_doku/conf/language/lams/ApplicationResources_en_AU.properties
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_central/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_gradebook/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_learning/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_monitoring/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_assessment/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_chat/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_daco/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_doku/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_forum/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_gmap/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_images/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_imscc/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_lamc/web/WEB-INF/tags/Etherpad.tag
    • -2
    • +2
    /lams_tool_laqa/web/WEB-INF/tags/Etherpad.tag
  16. … 17 more files in changeset.
6:44 pm

Marcin Cieslak

LDEV-4996 Update Etherpad customisations to version 1.8.4

Options
    • -2
    • +31
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -5513
    • +0
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/ace2_inner.js
    • -7
    • +20
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -21
    • +7
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
    • -1
    • +3
    /lams_build/conf/etherpad/readme.txt
3:07 pm

Ernie Ghiglione

LDEV-5026 display improvement

Options
    • -2
    • +2
    /lams_tool_zoom/web/pages/learning/learning.jsp
9:16 am

Ernie Ghiglione

LDEV-5021 layout changes

Options
    • -4
    • +5
    /lams_tool_notebook/web/pages/monitoring/print.jsp
Thursday 14 May 2020
7:38 pm

Marcin Cieslak

Merge branch 'LDEV-5026'

Options
7:38 pm

Marcin Cieslak

LDEV-5026 Always require a password for Zoom meetings

Options
    • -1
    • +0
    /lams_tool_zoom/conf/language/lams/ApplicationResources.properties
    • -0
    • +11
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dbupdates/patch20200514.sql
    • -11
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/Zoom.java
    • -9
    • +6
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java
    • -3
    • +2
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/util/ZoomUtil.java
    • -1
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/AuthoringController.java
    • -3
    • +1
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/controller/LearningController.java
    • -10
    • +0
    /lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/forms/AuthoringForm.java
    • -7
    • +0
    /lams_tool_zoom/web/pages/authoring/advanced.jsp
7:27 pm

Marcin Cieslak

LDEV-5024 Import question from QB to TBL template wizard

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -0
    • +39
    /lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java
    • -3
    • +58
    /lams_central/web/authoring/template/tbl/tbl.jsp
5:24 pm

Marcin Cieslak

LDEV-5024 Add "question from bank" button to TBL template wizard

Options
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources.properties
    • -2
    • +18
    /lams_central/web/authoring/template/tbl/tbl.jsp