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 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.
Friday 29 May 2020
6:39 pm

Marcin Cieslak

LDEV-4925 Fix new lines on learner results page in Peer Review

Options
    • -1
    • +1
    ./web/WEB-INF/tags/StyledRating.tag
  2. … 31 more files in changeset.
Wednesday 27 May 2020
3:12 pm

Marcin Cieslak

LDEV-5052 Add refresh button. Scroll to ratings table on refresh.

Options
    • -1
    • +2
    ./web/WEB-INF/tags/Rating.tag
  2. … 34 more files in changeset.
12:51 am

Marcin Cieslak

LDEV-5052 Refresh page and scroll to comments on rating

Options
    • -4
    • +13
    ./web/WEB-INF/tags/Rating.tag
  2. … 33 more files in changeset.
Thursday 21 May 2020
2:44 pm

Marcin Cieslak

LDEV-5030 Sanitise user names for initial Etherpad content

Options
    • -1
    • +4
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Monday 18 May 2020
12:45 pm

Marcin Cieslak

LDEV-4996 Update Etherpad resize plugin customisation to 0.0.8

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Friday 15 May 2020
6:53 pm

Marcin Cieslak

LDEV-4996 Adjust Etherpad autogrow feature

Options
    • -2
    • +2
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 31 more files in changeset.
Thursday 14 May 2020
9:33 am

Ernie Ghiglione

LDEV-5020 Adding spacing between question and answers

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
Wednesday 13 May 2020
8:53 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/web/pages/learning/results.jsp

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

Marcin Cieslak

LDEV-5022 Make burning questions paragraphs work with jqGrid editing

Options
    • -0
    • +2
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -6
    • +6
    ./web/pages/learning/results.jsp
Tuesday 12 May 2020
6:13 pm

Marcin Cieslak

LDEV-5020 Fix a bug preventing letters from showing in question options

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
3:59 pm

Marcin Cieslak

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

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/3rdParty.userlibraries

lams_build/build.xml

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

lams_central/web/includes/javascript/openUrls.js

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

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

lams_common/src/java/org/lamsfoundation/lams/outcome/Outcome.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeMapping.java

lams_common/src/java/org/lamsfoundation/lams/outcome/OutcomeScale.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/IOutcomeService.java

lams_common/src/java/org/lamsfoundation/lams/outcome/service/OutcomeService.java

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

lams_tool_assessment/conf/language/lams/ApplicationResources.properties

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

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

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

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_assessment/web/pages/monitoring/parts/usersummary.jsp

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/controller/MonitoringController.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20170101_updateTo30.sql

lams_tool_lamc/web/tblmonitoring/mcq.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

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

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

lams_tool_scratchie/web/pages/learning/scratchies.jsp

lams_tool_scratchie/web/pages/tblmonitoring/burningQuestions.jsp

lams_www/web/news.html

Options
    • -0
    • +2
    ./conf/language/lams/ApplicationResources.properties
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
    • -7
    • +6
    ./web/pages/tblmonitoring/burningQuestions.jsp
  9. … 1 more file in changeset.
3:05 pm

Marcin Cieslak

LDEV-5022 Keep HTML paragraphs when displaying burning questions

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +8
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -0
    • +1
    ./web/pages/monitoring/summary.jsp
1:21 pm

Marcin Cieslak

LDEV-5020 Add letters and highlight to options in burning questions

Options
    • -8
    • +7
    ./web/pages/tblmonitoring/burningQuestions.jsp
Monday 11 May 2020
6:05 pm

Marcin Cieslak

LDEV-4997 Adjust Etherpad integration code for LAMS 3.1

Options
    • -0
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  3. … 7 more files in changeset.
1:35 pm

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
    ./conf/language/lams/ApplicationResources.properties
    • -0
    • +11
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +16
    ./web/pages/monitoring/studentChoices.jsp
    • -7
    • +34
    ./web/pages/tblmonitoring/burningQuestions.jsp
Friday 08 May 2020
1:07 pm

Marcin Cieslak

LDEV-5020 Fix a missing character

Options
    • -1
    • +1
    ./web/pages/tblmonitoring/burningQuestions.jsp
Thursday 07 May 2020
6:28 pm

Marcin Cieslak

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

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -7
    • +34
    ./web/pages/tblmonitoring/burningQuestions.jsp
2:38 pm

Marcin Cieslak

LDEV-5019 Link Scratchie learner view to student choices in monitoring

Options
    • -0
    • +9
    ./src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +17
    ./web/pages/monitoring/studentChoices.jsp