lams-github / lams_tool_scratchie / conf

language

Clone Tools

Stats

Commits this week: 0
Total Committers: 11
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 11 May 2020
7:35 am

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

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

lams_tool_scratchie/web/pages/monitoring/studentChoices.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Thursday 07 May 2020
12:28 pm

Marcin Cieslak

LDEV-5020 Show question options in burning question in TBL monitor

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Friday 01 May 2020
12:47 pm

Ernie Ghiglione

LDEV-5002 changes in labels

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
12:47 pm

Ernie Ghiglione

LDEV-5002 changes in labels

Conflicts:

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 1 more file in changeset.
Monday 13 Apr 2020
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/etherpad/util/EtherpadUtil.java

lams_tool_scratchie/conf/language/lams/ApplicationResources.properties

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java

lams_tool_scratchie/web/WEB-INF/tags/Etherpad.tag

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
  2. … 12 more files in changeset.
7:21 am

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -1
    • +2
    ./lams/ApplicationResources.properties
  2. … 12 more files in changeset.
Monday 23 Mar 2020
6:17 pm

Marcin Cieslak

LDEV-4992 Display all learners in group in Scratchie monitoring summary

Mark ones who reached the activity.

Options
    • -0
    • +1
    ./lams/ApplicationResources.properties
  2. … 3 more files in changeset.
Thursday 19 Mar 2020
2:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 4 more files in changeset.
Wednesday 18 Mar 2020
1:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -1
    • +0
    ./lams/ApplicationResources.properties
  2. … 8 more files in changeset.
Tuesday 10 Mar 2020
10:56 pm

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  3. … 7 more files in changeset.
Monday 09 Mar 2020
3:10 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -3
    • +3
    ./lams/ApplicationResources.properties
    • -3
    • +3
    ./lams/ApplicationResources_en_AU.properties
3:10 am

Ernie Ghiglione

LDEV-4769 Updating Greek and Norwegian

Options
    • -2
    • +18
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./lams/ApplicationResources_no_NO.properties
3:04 am

Ernie Ghiglione

LDEV-4739 Updating Greek and Norwegian

Options
    • -2
    • +18
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +37
    ./lams/ApplicationResources_no_NO.properties
3:03 am

Ernie Ghiglione

LDEV-4986 Updating labels

Options
    • -6
    • +22
    ./lams/ApplicationResources.properties
    • -6
    • +22
    ./lams/ApplicationResources_en_AU.properties
Sunday 08 Mar 2020
1:11 pm

Marcin Cieslak

LDEV-4986 Lowest score (not zero) is default for unravelled question

Options
    • -1
    • +1
    ./lams/ApplicationResources.properties
  2. … 2 more files in changeset.
Monday 23 Dec 2019
1: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
    ./lams/ApplicationResources.properties
    • -4
    • +20
    ./lams/ApplicationResources_en_AU.properties
  3. … 4 more files in changeset.
Wednesday 11 Dec 2019
5:26 pm

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
    ./lams/ApplicationResources.properties
  2. … 17 more files in changeset.
Monday 09 Dec 2019
2:27 pm

Ernie Ghiglione

LDEV-4745 adding new labels

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

Ernie Ghiglione

LDEV-4769 updating labels

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

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

Ernie Ghiglione

LDEV-4745 adding missing labels to tools

Scratchie, QA, MC and assessment

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

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
    ./lams/ApplicationResources.properties
    • -23
    • +14
    ./lams/ApplicationResources_en_AU.properties
  3. … 10 more files in changeset.
Thursday 05 Dec 2019
11:16 am

Marcin Cieslak

LDEV-4921 Allow hiding question titles in Learner for Scratchie

Options
    • -243
    • +244
    ./lams/ApplicationResources.properties
  2. … 7 more files in changeset.
Tuesday 03 Dec 2019
8:44 pm

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# 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_el_GR.properties

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.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_en_AU.properties

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

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

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

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

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

# lams_tool_survey/conf/language/lams/ApplicationResources_el_GR.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_vote/conf/language/lams/ApplicationResources_el_GR.properties

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

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

Options
    • -2
    • +8
    ./lams/ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 02 Dec 2019
2:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -2
    • +9
    ./lams/ApplicationResources.properties
    • -2
    • +9
    ./lams/ApplicationResources_en_AU.properties
    • -2
    • +9
    ./lams/ApplicationResources_es_ES.properties
  4. … 120 more files in changeset.
Sunday 24 Nov 2019
5:12 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'master' into develop

# Conflicts:

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

Options
    • -2
    • +4
    ./lams/ApplicationResources_el_GR.properties
Saturday 23 Nov 2019
1:01 am

Ernie Ghiglione

LDEV-4769 Updating labels

Norgewian and Greek

Options
    • -2
    • +7
    ./lams/ApplicationResources_el_GR.properties
    • -2
    • +10
    ./lams/ApplicationResources_no_NO.properties
  3. … 1 more file in changeset.
Friday 22 Nov 2019
6:51 pm

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +6
    ./lams/ApplicationResources_en_AU.properties
  2. … 19 more files in changeset.
Saturday 05 Oct 2019
12:02 am

Andrey Balan

LDEV-4875 Add VSA question type to Assessment and Scratchie

Options
    • -2
    • +21
    ./lams/ApplicationResources_en_AU.properties
  2. … 75 more files in changeset.
Thursday 18 Jul 2019
3:13 pm

Andrey Balan

LDEV-4838 Refine import from QB feature

Options
    • -1
    • +1
    ./lams/ApplicationResources_en_AU.properties
  2. … 6 more files in changeset.
Wednesday 03 Jul 2019
9:25 pm

Marcin Cieslak

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

# 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/ckconfig_custom.js

# lams_central/web/main.jsp

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

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookUtil.java

# lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/controller/GradebookController.java

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/AssessmentConstants.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentOutputFactory.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

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

# lams_tool_assessment/web/pages/learning/parts/markhedging.jsp

# lams_tool_assessment/web/pages/learning/parts/matchingpairs.jsp

# lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp

# lams_tool_assessment/web/pages/learning/parts/ordering.jsp

# lams_tool_assessment/web/pages/monitoring/parts/questionsummary.jsp

# lams_tool_assessment/web/pages/tblmonitoring/assessment.jsp

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

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

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

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/util/AuthoringUtil.java

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/controller/McMonitoringController.java

# lams_tool_lamc/web/authoring/BasicContent.jsp

# lams_tool_lamc/web/authoring/candidateAnswersList.jsp

# lams_tool_lamc/web/authoring/itemlist.jsp

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java

# lams_tool_scratchie/web/pages/learning/learning.jsp

# lams_tool_scratchie/web/pages/learning/scratchies.jsp

# lams_tool_scratchie/web/pages/monitoring/summary.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

# lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +2
    ./lams/ApplicationResources.properties
    • -0
    • +1
    ./lams/ApplicationResources_en_AU.properties
  3. … 53 more files in changeset.