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
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -3
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +7
    ./web/pages/tblmonitoring/traStudentChoices.jsp
  3. … 11 more files in changeset.
Sunday 05 Jan 2020
11:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
    • -0
    • +1
    ./web/pages/authoring/parts/additem.jsp
  4. … 1 more file in changeset.
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -21
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -388
    • +448
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 18 more files in changeset.
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171026.sql
    • -15
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180425.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql
    • -0
    • +59
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103_updateTo31.sql
  10. … 110 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./web/pages/authoring/authoring.jsp
  2. … 41 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -2
    • +2
    ./web/pages/authoring/authoring.jsp
  3. … 41 more files in changeset.
12:34 am

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

Options
    • -10
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +20
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Saturday 28 Dec 2019
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Scratchie websockets

User gets checked if he participates in the given activity.

Options
    • -3
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -25
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +26
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
11:04 am

Ernie Ghiglione

LDEV-4932 Add CSRF to Scratchie monitoring

Adding CSRF for:

- Changing group marks

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  3. … 1 more file in changeset.
2:23 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -5
    • +7
    ./web/pages/monitoring/editactivity.jsp
  3. … 108 more files in changeset.
Wednesday 25 Dec 2019
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -14
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  6. … 59 more files in changeset.
Monday 23 Dec 2019
8:59 pm

Ernie Ghiglione

LDEV-4745 LDEV-4875 Adding/updating labels

Adding and updating labels for QB and VSAs for LAMS v4.0

Options
    • -4
    • +20
    ./conf/language/lams/ApplicationResources.properties
    • -4
    • +20
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 4 more files in changeset.
Friday 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

# lams_central/conf/language/lams/ApplicationResources.properties

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

# lams_learning/conf/language/lams/ApplicationResources.properties

# lams_learning/conf/language/lams/ApplicationResources_en_AU.properties

# lams_learning/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/conf/language/lams/ApplicationResources.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_lamc/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_mindmap/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_nb/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_survey/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_task/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_es_ES.properties

Options
    • -21
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  3. … 15 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -20
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 42 more files in changeset.
Saturday 14 Dec 2019
10:55 am

Andrey Balan

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

Options
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -67
    • +112
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -30
    • +13
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -56
    • +43
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -4
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
    • -5
    • +5
    ./web/pages/monitoring/parts/itemSummary.jsp
    • -6
    • +14
    ./web/pages/tblmonitoring/tra.jsp
    • -11
    • +18
    ./web/pages/tblmonitoring/traStudentChoices.jsp
Friday 13 Dec 2019
10:07 pm

Marcin Cieslak

LDEV-4921 Fix ordering for burning question in Scratchie learner

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -4
    • +6
    ./web/pages/learning/results.jsp
9:24 pm

Marcin Cieslak

LDEV-4921 Properly detect General Burning Question in TBL monitor

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
Thursday 12 Dec 2019
12:26 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

# lams_admin/conf/language/lams/ApplicationResources.properties

# lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

# lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

# lams_tool_mindmap/conf/language/lams/ApplicationResources.properties

# lams_tool_nb/conf/language/lams/ApplicationResources.properties

# lams_tool_notebook/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources.properties

# lams_tool_pixlr/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scratchie/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_scribe/conf/language/lams/ApplicationResources.properties

# lams_tool_spreadsheet/conf/language/lams/ApplicationResources.properties

# lams_tool_survey/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources.properties

# lams_tool_task/conf/language/lams/ApplicationResources_el_GR.properties

# lams_tool_vote/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources.properties

# lams_tool_wiki/conf/language/lams/ApplicationResources_el_GR.properties

Options
    • -2
    • +15
    ./conf/language/lams/ApplicationResources.properties
  2. … 17 more files in changeset.
Wednesday 11 Dec 2019
4:39 pm

Marcin Cieslak

LDEV-4802 Try to identify and fix a NPE in Scratchie websockets

Options
    • -5
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Tuesday 10 Dec 2019
10:24 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

Options
    • -1
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -1
    • +4
    ./web/pages/tblmonitoring/burningQuestions.jsp
10:19 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

Options
    • -2
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +3
    ./web/pages/monitoring/summary.jsp
7:09 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie burning questions

Options
    • -1
    • +19
    ./web/pages/learning/results.jsp
    • -6
    • +6
    ./web/pages/learning/scratchies.jsp
Monday 09 Dec 2019
9:27 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +17
    ./conf/language/lams/ApplicationResources.properties
    • -3
    • +21
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +17
    ./conf/language/lams/ApplicationResources_en_AU.properties
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +15
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +21
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +15
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 63 more files in changeset.
Saturday 07 Dec 2019
7:09 pm

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Friday 06 Dec 2019
2:32 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/develop' into LDEV-4745

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/conf/language/lams/ApplicationResources.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

lams_tool_laqa/web/learning/Notebook.jsp

lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/conf/language/lams/ApplicationResources_en_AU.properties

Options
    • -0
    • +6
    ./conf/language/lams/ApplicationResources.properties
    • -23
    • +14
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
Thursday 05 Dec 2019
7:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -2
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +3
    ./web/pages/authoring/parts/itemlist.jsp
    • -4
    • +7
    ./web/pages/learning/scratchies.jsp
    • -123
    • +123
    ./web/pages/monitoring/parts/statisticpart.jsp
    • -3
    • +9
    ./web/pages/monitoring/summary.jsp
6:16 pm

Marcin Cieslak

LDEV-4921 Allow hiding question titles in Learner for Scratchie

Options
    • -243
    • +244
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java
    • -0
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java
    • -1
    • +6
    ./web/pages/admin/config.jsp
    • -3
    • +5
    ./web/pages/learning/scratchies.jsp
7:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -2
    • +19
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -0
    • +35
    ./web/pages/authoring/basic.jsp
    • -0
    • +5
    ./web/pages/authoring/parts/itemlist.jsp
  4. … 2 more files in changeset.