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 09 Nov 2020
11:31 am

Marcin Cieslak

LDEV-5102 Do not give marks to absent learners in Scratchie Excel report

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Sunday 08 Nov 2020
3:15 pm

Marcin Cieslak

LDEV-5101 Allow applying new question version to other activities in LD

Options
    • -0
    • +14
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -2
    • +18
    ./web/pages/authoring/parts/itemlist.jsp
  4. … 11 more files in changeset.
2:20 pm

Ernie Ghiglione

LDEV-4949 LDEV-5106 LDEV-5107 LDEV-5108 Adding/updating labels

Options
    • -0
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_de_DE.properties
    • -1
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -0
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
  8. … 13 more files in changeset.
12:36 pm

Ernie Ghiglione

LDEV-5108 Adding MS Word to scratchie

Options
    • -2
    • +14
    ./web/pages/authoring/basic.jsp
Thursday 05 Nov 2020
10:54 am

Marcin Cieslak

LDEV-5102 Prevent Scratchie from giving marks to absent learner

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -5
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
    • -23
    • +22
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  5. … 2 more files in changeset.
Thursday 29 Oct 2020
5:32 pm

Marcin Cieslak

LDEV-4880 Do not show debug information on missing confidence level

Options
    • -1
    • +2
    ./web/pages/learning/parts/confidenceLevelPortrait.jsp
Sunday 25 Oct 2020
7:20 am

Marcin Cieslak

LDEV-5020 Prevent "Show options" link from going to top of page

Options
    • -6
    • +13
    ./web/pages/tblmonitoring/burningQuestions.jsp
Wednesday 21 Oct 2020
2:54 pm

Marcin Cieslak

LDEV-5091 Etherpad.tag to accept predefined pad ID

Options
    • -29
    • +45
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Monday 19 Oct 2020
10:24 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -15
    • +15
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 2 more files in changeset.
Sunday 11 Oct 2020
8:17 am

Ernie Ghiglione

LDEV-4769 Updating Greek

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
  2. … 6 more files in changeset.
Friday 09 Oct 2020
4:25 pm

Marcin Cieslak

LDEV-5091 Initialise Etherpads on Discussion panel expand

Options
    • -6
    • +17
    ./web/WEB-INF/tags/Etherpad.tag
    • -0
    • +10
    ./web/pages/learning/learning.jsp
    • -2
    • +2
    ./web/pages/learning/scratchies.jsp
  4. … 34 more files in changeset.
Wednesday 07 Oct 2020
8:03 pm

Marcin Cieslak

LDEV-5089 Prevent scratching until Ajax response is received

Options
    • -1
    • +24
    ./web/pages/learning/learning.jsp
Tuesday 06 Oct 2020
9:33 pm

Marcin Cieslak

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

Options
    • -4
    • +3
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
9:25 pm

Marcin Cieslak

LDEV-5085 Run CKEditor initialisation immediately

If CKEditor.tag is loaded dynamically, binding it to page load event

does not work.

Options
    • -4
    • +2
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Monday 05 Oct 2020
12:16 pm

Marcin Cieslak

LDEV-4425 Do not escape user names. Add padding to portrait.

Options
    • -4
    • +4
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
6:27 am

Marcin Cieslak

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

Options
    • -21
    • +25
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
6:19 am

Marcin Cieslak

LDEV-5085 Make editor init method parametrized

It seems that multiple instances of CKEditor tag were interacting with

each other, probably with request attributes. Now initialisation method

is parametrised so CKEditor starts with own set of attributes.

Options
    • -22
    • +28
    ./web/WEB-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Sunday 04 Oct 2020
4:29 am

Ernie Ghiglione

LDEV-4769 Updating labels Green, Norwegian, English

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 4 more files in changeset.
Tuesday 22 Sep 2020
4:08 pm

Marcin Cieslak

LDEV-4745 Use correct Set class in Scratchie on TBL sequence create

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
3:05 pm

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/model/McContent.java

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

lams_tool_lamc/web/WEB-INF/tags/Arrow.tag

lams_tool_lamc/web/authoring/candidateAnswersList.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -1
    • +1
    ./web/pages/authoring/parts/itemlist.jsp
  3. … 6 more files in changeset.
7:48 am

Marcin Cieslak

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

Conflicts:

lams_tool_assessment/web/pages/authoring/parts/optionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlist.jsp

lams_tool_assessment/web/pages/authoring/parts/questionlistRestricted.jsp

lams_tool_laqa/web/authoring/itemlist.jsp

lams_tool_scratchie/web/pages/authoring/parts/answerlist.jsp

Options
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/optionlist.jsp
  3. … 2 more files in changeset.
7:40 am

Marcin Cieslak

LDEV-5078 Fix i18n labels in Arrow tag

Options
    • -3
    • +4
    ./web/WEB-INF/tags/Arrow.tag
    • -2
    • +2
    ./web/pages/authoring/parts/answerlist.jsp
    • -2
    • +2
    ./web/pages/authoring/parts/itemlist.jsp
  4. … 50 more files in changeset.
Thursday 17 Sep 2020
5:12 pm

Marcin Cieslak

LDEV-4745 Sort QB questions using display order when fetching from DB

Options
    • -0
    • +3
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
  2. … 2 more files in changeset.
4:17 pm

Marcin Cieslak

LKC-236 Return questions replaced in tool for further processing

Options
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Tuesday 15 Sep 2020
8:02 am

Ernie Ghiglione

LDEV-5076 Align TBL terminology

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +2
    ./conf/language/lams/ApplicationResources_no_NO.properties
  5. … 9 more files in changeset.
Sunday 13 Sep 2020
6:12 am

Ernie Ghiglione

Updating translations English, Greek, German and Norwegian

Added German to Lokalise. All labels are the same but the output file format is slightly different.

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 36 more files in changeset.
Saturday 12 Sep 2020
9:31 am

Marcin Cieslak

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

Options
    • -1
    • +1
    ./web/pages/learning/results.jsp
  2. … 1 more file in changeset.
9:12 am

Marcin Cieslak

LDEV-5022 Fix line breaks when multiple editing Burning Questions

Options
    • -1
    • +1
    ./web/pages/learning/results.jsp
Monday 24 Aug 2020
11:25 am

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -0
    • +6
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -6
    • +8
    ./web/pages/authoring/advance.jsp
Thursday 20 Aug 2020
8:46 am

Marcin Cieslak

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

Conflicts:

lams_central/conf/language/lams/ApplicationResources_en_AU.properties

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateController.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateController.java

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

lams_central/web/questions/questionFile.jsp

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190722.sql

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20190724.sql

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java

lams_tool_assessment/web/pages/monitoring/summary.jsp

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_lamc/conf/language/lams/ApplicationResources_fr_FR.properties

lams_tool_lamc/conf/language/lams/ApplicationResources_no_NO.properties

lams_tool_lamc/db/sql/activity_insert.sql

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_lamc/web/WEB-INF/tags/Etherpad.tag

lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

lams_tool_lamc/web/WEB-INF/tags/Rating.tag

lams_tool_lamc/web/WEB-INF/tags/StyledRating.tag

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/authoring/editQuestionBox.jsp

lams_tool_lamc/web/authoring/itemlist.jsp

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