lams-github

lams_tool_scratchie

Clone Tools

Stats

Commits this week: 0
Total Committers: 14
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 17 Apr 2023
8:14 pm

Marcin Cieslak

LDEV-5386 Add per moduule IntelliJ configuration files

Options
    • -0
    • +7
    ./lams_tool_scratchie.eml
    • -0
    • +2
    ./lams_tool_scratchie.iml
  3. … 86 more files in changeset.
8:08 pm

Marcin Cieslak

LDEV-5386 Clean up .classpath files to make them compatible with IntelliJ

Options
    • -3
    • +3
    ./.classpath
  2. … 33 more files in changeset.
Wednesday 12 Apr 2023
2:08 am

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -25
    • +23
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
Tuesday 11 Apr 2023
4:22 am

Marcin Cieslak

LDEV-5385 Allow real numbers in Scratchie marks

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/ScratchieSessionDAO.java
    • -3
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230410.sql
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -18
    • +18
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/LeaderResultsDTO.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
    • -5
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieSession.java
    • -6
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -28
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -4
    • +4
    ./web/pages/monitoring/summary.jsp
Thursday 30 Mar 2023
4:21 am

Marcin Cieslak

LDEV-5200 Re-expand Burning Questions collapse panels after reload

Options
    • -1
    • +28
    ./web/pages/monitoring/parts/burningQuestions5.jsp
    • -4
    • +4
    ./web/pages/monitoring/parts/burningQuestionsTable.jsp
Monday 06 Mar 2023
10:27 pm

Marcin Cieslak

LDEV-5370 Make 0.5 score column in rubrics configurable in authoring

Options
    • -5
    • +10
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 41 more files in changeset.
6:59 pm

Marcin Cieslak

LDEV-5370 Add 0.5 score column in rubrics criteria in Peer Review

Options
    • -4
    • +78
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 36 more files in changeset.
Wednesday 01 Mar 2023
9:29 pm

Marcin Cieslak

# WARNING: head commit changed in the meantime

Merge remote-tracking branch 'origin/v4.6' into v4.7

Options
    • -80
    • +18
    ./web/pages/monitoring/studentChoices.jsp
  2. … 7 more files in changeset.
8:14 pm

Marcin Cieslak

LDEV-5365 Use sticky headers for at least 10 teams

Options
    • -1
    • +1
    ./web/pages/monitoring/studentChoices.jsp
5:38 pm

Marcin Cieslak

LDEV-5365 Use different method for table header stickiness

The new metho allows horizontal scrolling.

Options
    • -71
    • +19
    ./web/pages/monitoring/studentChoices.jsp
Monday 27 Feb 2023
5:53 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringController.java

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -25
    • +82
    ./web/pages/monitoring/studentChoices.jsp
    • -12
    • +21
    ./web/pages/monitoring/studentChoices5.jsp
    • -182
    • +181
    ./web/pages/monitoring/studentChoicesTable.jsp
  5. … 9 more files in changeset.
Thursday 23 Feb 2023
2:52 pm

Marcin Cieslak

LDEV-5365 Add sticky column header to Scratchie student choices table

Options
    • -23
    • +80
    ./web/pages/monitoring/studentChoices.jsp
Monday 20 Feb 2023
6:24 pm

Marcin Cieslak

LDEV-5361 Add "require all answers" setting to Scratchie

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20230220.sql
    • -4
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -1
    • +11
    ./web/pages/authoring/advance.jsp
    • -6
    • +27
    ./web/pages/learning/learning.jsp
Wednesday 01 Feb 2023
9:34 pm

Marcin Cieslak

LKC-221 Set question mark when replacing question from QA

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Monday 30 Jan 2023
11:53 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-5357' into v4.7

Conflicts:

lams_admin/web/userChangePass.jsp

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupController.java

lams_central/web/WEB-INF/web.xml

lams_central/web/authoring/authoring.jsp

lams_central/web/authoring/svgGenerator.jsp

lams_central/web/extGroups.jsp

lams_central/web/orgGroup.jsp

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXController.java

lams_monitoring/web/grouping/chosenGrouping.jsp

Options
    • -3
    • +3
    ./web/WEB-INF/tags/Page.tag
  2. … 44 more files in changeset.
11:38 pm

Marcin Cieslak

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

Options
    • -3
    • +3
    ./web/WEB-INF/tags/Page.tag
  2. … 28 more files in changeset.
11:37 pm

Marcin Cieslak

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

Options
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
  2. … 52 more files in changeset.
Wednesday 25 Jan 2023
10:08 pm

Marcin Cieslak

LDEV-5257 Escape parameters to prevent XSS attack

WEB-005

Options
    • -2
    • +2
    ./web/WEB-INF/tags/AuthoringButton.tag
  2. … 37 more files in changeset.
Monday 23 Jan 2023
9:00 pm

Marcin Cieslak

LDEV-5257 Remove outdated jQuery UI slider widget

WEB-008

It is a part of jQuery UI bundle anyway.

Options
    • -1
    • +1
    ./web/pages/authoring/parts/addVsa.jsp
  2. … 2 more files in changeset.
Tuesday 10 Jan 2023
12:55 am

Marcin Cieslak

LDEV-5200, LKC-110 Fix burning questions expand button

Options
    • -31
    • +0
    ./web/pages/monitoring/parts/burningQuestions5.jsp
    • -2
    • +38
    ./web/pages/monitoring/parts/burningQuestionsTable.jsp
Friday 06 Jan 2023
4:29 pm

Marcin Cieslak

LDEV-5200, LKC-106 Make question numbering consistent between views

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -2
    • +1
    ./web/pages/monitoring/parts/burningQuestionsTable.jsp
Wednesday 14 Dec 2022
6:54 pm

Ernie Ghiglione

LDEV-5345 Updating English, Spanish, Greek

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 19 more files in changeset.
Wednesday 30 Nov 2022
11:34 pm

Marcin Cieslak

LDEV-5347 Add Flux update to Burning Questions tab

Also indicate when there are no burning questions yet.

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -1
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -8
    • +24
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -153
    • +4
    ./web/pages/monitoring/parts/burningQuestions5.jsp
    • -0
    • +172
    ./web/pages/monitoring/parts/burningQuestionsTable.jsp
6:57 pm

Marcin Cieslak

LDEV-5200 Add proper padding to larger learner content

Before the patch it overlapped with progress bar on the left.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 32 more files in changeset.
Thursday 24 Nov 2022
11:35 pm

Marcin Cieslak

LDEV-5200 Make learner content wider

Max width of 1400 px is consistent with LDEV-5192

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Page.tag
  2. … 34 more files in changeset.
Monday 21 Nov 2022
11:47 am

Ernie Ghiglione

LDEV-5346 General UI improvements TBL monitoring

Alignments, layout and labels

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -13
    • +12
    ./web/pages/monitoring/parts/burningQuestions5.jsp
    • -13
    • +9
    ./web/pages/monitoring/studentChoices5.jsp
    • -9
    • +10
    ./web/pages/tblmonitoring/tra.jsp
  7. … 6 more files in changeset.
Thursday 17 Nov 2022
2:11 pm

Marcin Cieslak

LDEV-5331 Add missing title and autocomplete attr to submission deadline

Options
    • -0
    • +1
    ./web/pages/learning/submissionDeadline.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/dateRestriction.jsp
  3. … 17 more files in changeset.
Monday 31 Oct 2022
3:19 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/v4.6' into v4.7

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CleanupPreviewLessonsController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgPasswordChangeController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PortraitBatchUploadController.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserSaveController.java

lams_central/conf/language/lams/ApplicationResources.properties

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeController.java

lams_central/src/java/org/lamsfoundation/lams/webservice/UserRoleServlet.java

lams_common/src/java/org/lamsfoundation/lams/security/ISecurityService.java

lams_common/src/java/org/lamsfoundation/lams/security/SecurityService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXController.java

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

Options
    • -5
    • +9
    ./web/pages/monitoring/studentChoices.jsp
  2. … 35 more files in changeset.
Wednesday 26 Oct 2022
6:53 pm

Marcin Cieslak

LDEV-5317 Fix time limit widget in TBL monitoring tRAT

Options
    • -5
    • +9
    ./web/pages/monitoring/studentChoices.jsp
    • -11
    • +1
    ./web/pages/monitoring/summary.jsp
Monday 24 Oct 2022
10:56 pm

Marcin Cieslak

LDEV-5337 Add new FileUpload tag to all projects

Options
    • -0
    • +82
    ./web/WEB-INF/tags/FileUpload5.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 62 more files in changeset.