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
Tuesday 22 Sep 2020
9: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.
1:48 pm

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.
1:40 pm

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
11: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.
10: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
2:02 pm

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
12:12 pm

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
3:31 pm

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.
3:12 pm

Marcin Cieslak

LDEV-5022 Fix line breaks when multiple editing Burning Questions

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

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
2:46 pm

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.
Monday 17 Aug 2020
10:34 pm

Marcin Cieslak

LDEV-4917 Add Uppy file uploads to QTI question import

Options
    • -1
    • +1
    ./web/pages/authoring/basic.jsp
  2. … 6 more files in changeset.
Wednesday 12 Aug 2020
3:12 am

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option 4a9a06a

Options
    • -7
    • +0
    ./web/pages/authoring/advance.jsp
3:10 am

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option

Options
    • -7
    • +0
    ./web/pages/authoring/advance.jsp
Monday 10 Aug 2020
12:49 pm

Marcin Cieslak

LDEV-5058 Allow tool adding both on fresh build and afterwards

As a column got removed from a LAMS core table, we need to make sure

that all scenarios work well: an upgrade from previous version, a fresh

build and adding extra tools afterwards.

Options
    • -2
    • +0
    ./db/sql/activity_insert.sql
  2. … 41 more files in changeset.
Tuesday 04 Aug 2020
2:20 pm

Ernie Ghiglione

Updating labels Spanish, English, French, Norwegian

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 41 more files in changeset.
Monday 03 Aug 2020
2:23 am

Ernie Ghiglione

LDEV-4769 Updating Spanish

Also removing a deprecated label

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  2. … 22 more files in changeset.
Sunday 02 Aug 2020
10:55 am

Ernie Ghiglione

LDEV-4769 Updating Spanish, Greek, French, Norwegian

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -9
    • +14
    ./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
    • -1
    • +6
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 17 more files in changeset.
Wednesday 29 Jul 2020
11:22 am

Ernie Ghiglione

LDEV-4769 Updating labels

Adding missing labels in Spanish, English

Adding translations for Zoom (Norwegian, Spanish)

Options
    • -2
    • +5
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +5
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -13
    • +22
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 9 more files in changeset.
Tuesday 28 Jul 2020
7:30 pm

Ernie Ghiglione

LDEV-4769 Updating English, Spanish, French, Greek and Norwegian for all active projects

From this commit onwards, we no longer will use the LAMS Community i18n to manage and handle translations.

Instead, we have now migrated to Lokalise (https://lokalise.com/) for managing all i18n projects and translations.

Many thanks Lokalise for your support!!

Options
    • -275
    • +262
    ./conf/language/lams/ApplicationResources.properties
    • -271
    • +262
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -270
    • +262
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -242
    • +256
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -0
    • +7
    ./conf/language/lams/ApplicationResources_fr_FR.properties
    • -271
    • +262
    ./conf/language/lams/ApplicationResources_no_NO.properties
  7. … 166 more files in changeset.
3:09 pm

Marcin Cieslak

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

Conflicts:

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 5 more files in changeset.
3:04 pm

Marcin Cieslak

LDEV-5057 Use UTF-8 as default encoding for message sources

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 33 more files in changeset.
Friday 17 Jul 2020
5:45 pm

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

Options
    • -0
    • +1
    ./web/WEB-INF/tags/OutcomeAuthor.tag
  2. … 31 more files in changeset.
Friday 10 Jul 2020
10:45 pm

Marcin Cieslak

LDEV-4847 Fix importing QB question with existing UUID

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 7 more files in changeset.
10:18 pm

Marcin Cieslak

LDEV-5050 Make all TBL template questions required

Options
    • -0
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 7 more files in changeset.
4:52 pm

Marcin Cieslak

LDEV-5050 Move "is required" attribute from QB question to tools

Options
    • -1
    • +0
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +0
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +0
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -10
    • +0
    ./web/pages/authoring/parts/addVsa.jsp
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -2
    • +1
    ./web/pages/learning/scratchies.jsp
  7. … 24 more files in changeset.
Friday 05 Jun 2020
8:20 pm

Marcin Cieslak

LDEV-5032 Make a checkbox depend on a another checkbox being checked

Options
    • -3
    • +18
    ./web/pages/authoring/advance.jsp
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./web/pages/authoring/parts/itemlist.jsp
  2. … 19 more files in changeset.
6:05 pm

Marcin Cieslak

LDEV-5032 Add anonymous confidence levels in Scratchie

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -0
    • +7
    ./web/pages/authoring/advance.jsp
    • -1
    • +1
    ./web/pages/learning/learning.jsp
    • -2
    • +2
    ./web/pages/learning/parts/confidenceLevelPortrait.jsp
    • -0
    • +1
    ./web/pages/learning/scratchies.jsp
Monday 01 Jun 2020
3:19 pm

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Rating.tag
  2. … 31 more files in changeset.