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
Wednesday 02 Dec 2020
8:56 pm

Marcin Cieslak

LDEV-5120 Allow teacher to start Gallery Walk in Monitoring

Learners get pushed to Gallery Walk page.

Options
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -1
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml
    • -0
    • +22
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -1
    • +21
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -0
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/IDokumaranService.java
    • -44
    • +36
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -1
    • +1
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningWebsocketServer.java
    • -3
    • +7
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java
    • -12
    • +8
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -16
    • +43
    /lams_tool_doku/web/pages/monitoring/summary.jsp
9:21 am

Ernie Ghiglione

LDEV-5125 Updating MS Word template to include VSA support

Options
    • binary
    /lams_www/web/public/MSWord-question-import.docx
5:21 am

Marcin Cieslak

Merge branch 'LDEV-5127' into v4.0

Options
5:21 am

Marcin Cieslak

LDEV-5127 Fix pad resizing

Options
    • -1
    • +1
    /lams_admin/web/WEB-INF/tags/Etherpad.tag
    • -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_doku/web/pages/learning/learning.jsp
    • -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.
5:14 am

Marcin Cieslak

LDEV-5127 Identify new Etherpad authors immediately

Options
    • -0
    • +287
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_author_neat/static/js/index.js
    • -0
    • +51
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_authornames/static/js/index.js
1:33 am

Marcin Cieslak

LDEV-5127 Fix "Return to pad" button so settings are preserved

Options
    • -0
    • +537
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_editbar.js
1:06 am

Marcin Cieslak

LDEV-5127 Allow comments in readonly Etherpad

Options
    • -0
    • +1508
    /lams_build/conf/etherpad/etherpad-lite/src/node/handler/PadMessageHandler.js
12:52 am

Marcin Cieslak

LDEV-5127 Add exact plugin version information for Etherpad

Options
    • -8
    • +7
    /lams_build/conf/etherpad/readme.txt
12:51 am

Marcin Cieslak

LDEV-5127 Add standard LAMS customisations to Etherpad 1.8.5

Options
    • -18
    • +11
    /lams_build/conf/etherpad/etherpad-lite/node_modules/ep_resize/static/js/index.js
    • -2
    • +44
    /lams_build/conf/etherpad/etherpad-lite/settings.json
    • -1
    • +1
    /lams_build/conf/etherpad/etherpad-lite/src/node/db/AuthorManager.js
    • -19
    • +34
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad.js
    • -2
    • +2
    /lams_build/conf/etherpad/etherpad-lite/src/static/js/pad_userlist.js
Tuesday 01 Dec 2020
8:58 pm

Marcin Cieslak

LDEV-4944 Recalculate Scratchie marks only for given VSA answer

Options
    • -7
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ICommonScratchieService.java
    • -4
    • +2
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java
    • -16
    • +15
    /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -22
    • +23
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -5
    • +2
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -17
    • +17
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -4
    • +3
    /lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
8:15 pm

Marcin Cieslak

LDEV-4944 Synchronise only answer allocation

Mark recalculation can run in parallel.

Options
    • -80
    • +70
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -3
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -6
    • +12
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Monday 30 Nov 2020
9:24 pm

Marcin Cieslak

Merge branch 'LDEV-5125' into v4.0

Options
9:23 pm

Marcin Cieslak

LDEV-5125 Add support for VSA question for Word import

Options
    • -56
    • +11
    /lams_central/src/java/org/lamsfoundation/lams/web/qb/ImsQtiController.java
    • -3
    • +49
    /lams_common/src/java/org/lamsfoundation/lams/questions/QuestionWordParser.java
7:35 pm

Marcin Cieslak

LDEV-4944 Recalculate marks only for learners with matching VSA answer

Recalculating all results bound to a given QB question is an enormous

job. We need to focus on results that actually changed.

Options
    • -0
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/AssessmentResultDAO.java
    • -3
    • +15
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentResultDAOHibernate.java
    • -19
    • +21
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
7:31 pm

Marcin Cieslak

LDEV-4944 Synchronise VSA answer allocation

We need to synchronise this operation.

When multiple requests are made to modify the same option, for example

to add a VSA answer, we have a case of dirty reads. One answer gets

added, but while DB is still flushing, another answer reads the option

without the first answer, because it is not there yet.

The second answer gets added, but the first one gets lost.

We can not synchronise the method in service as the "dirty" transaction

is already started before synchronisation kicks in.

We do it in MonitoringController, before transaction starts.

It will not work for distributed environment, though.

If teachers allocate answers on different LAMS servers, we can still get

the same problem. We will need a more sophisticated solution then.

Options
    • -2
    • +21
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Saturday 28 Nov 2020
12:05 am

Marcin Cieslak

LDEV-3261 Correctly order question in Assessment monitoring summary

Options
    • -1
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
Friday 27 Nov 2020
11:38 pm

Marcin Cieslak

Merge branch 'LDEV-5124' into v4.0

Conflicts:

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

Options
2:15 pm

Marcin Cieslak

LDEV-5124, LDEV-2169 Put correct time and answer in learner history

Options
    • -0
    • +7
    /lams_common/src/java/org/lamsfoundation/lams/logevent/LearnerInteractionEvent.java
    • -2
    • +1
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -0
    • +9
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +2
    /lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp
2:01 pm

Marcin Cieslak

LDEV-5124, LDEV-3173 Fix answer print out in user response history

Options
    • -1
    • +6
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/util/AssessmentEscapeUtils.java
1:43 pm

Marcin Cieslak

LDEV-5124 Add question numbering in front of title

Options
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Thursday 26 Nov 2020
10:04 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, Norwegian, Greek

Options
    • -0
    • +3
    /lams_central/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_central/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +6
    /lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +2
    /lams_tool_assessment/conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +6
    /lams_tool_assessment/conf/language/lams/ApplicationResources_no_NO.properties
    • -0
    • +1
    /lams_tool_doku/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    /lams_tool_laqa/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +6
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +4
    /lams_tool_scratchie/conf/language/lams/ApplicationResources_no_NO.properties
10:04 pm

Ernie Ghiglione

LDEV-5124 Adding labels from Lokalise

Options
    • -2
    • +4
    /lams_tool_assessment/conf/language/lams/ApplicationResources.properties
4:23 pm

Marcin Cieslak

LDEV-5124 Fix result ordering when generating Assessment Excel report

Options
    • -2
    • +21
    /lams_common/src/java/org/lamsfoundation/lams/qb/model/QbToolAnswer.java
    • -12
    • +2
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestionResult.java
    • -0
    • +4
    /lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentResult.java
    • -11
    • +1
    /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McUsrAttempt.java
2:27 pm

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku learning

Options
    • -4
    • +12
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -3
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -7
    • +28
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -0
    • +65
    /lams_tool_doku/web/pages/learning/galleryWalk.jsp
    • -1
    • +11
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
2:27 pm

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku learning

Options
    • -4
    • +12
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dto/SessionDTO.java
    • -3
    • +2
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java
    • -7
    • +42
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/LearningController.java
    • -0
    • +102
    /lams_tool_doku/web/pages/learning/galleryWalk.jsp
    • -1
    • +11
    /lams_tool_doku/web/pages/learning/learning.jsp
    • -1
    • +1
    /lams_tool_doku/web/pages/learning/waitForTimeLimitLaunch.jsp
12:12 am

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku advanced authoring

Options
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +16
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -2
    • +23
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +26
    /lams_tool_doku/web/pages/authoring/advance.jsp
12:12 am

Marcin Cieslak

LDEV-5120 Add Gallery Walk in Doku advanced authoring

Options
    • -0
    • +2
    /lams_tool_doku/conf/language/lams/ApplicationResources.properties
    • -0
    • +16
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dbupdates/patch20201122.sql
    • -2
    • +23
    /lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java
    • -0
    • +26
    /lams_tool_doku/web/pages/authoring/advance.jsp
Wednesday 25 Nov 2020
11:46 pm

Marcin Cieslak

LDEV-5122 Do not create an obsolete table in Dokumaran

Options
    • -7
    • +0
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
11:46 pm

Marcin Cieslak

LDEV-5122 Do not create an obsolete table in Dokumaran

Options
    • -7
    • +0
    /lams_tool_doku/db/sql/create_lams_tool_dokumaran.sql
11:35 pm

Marcin Cieslak

LDEV-4604 Scroll to burning questions after refreshing them

Options
    • -9
    • +7
    /lams_tool_scratchie/web/pages/learning/results.jsp