lams-github / lams_tool_scratchie

web

Clone Tools

Stats

Commits this week: 0
Total Committers: 13
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
Thursday 08 Oct 2020
2:03 am

Marcin Cieslak

LDEV-5089 Prevent scratching until Ajax response is received

Options
    • -1
    • +24
    ./pages/learning/learning.jsp
Wednesday 07 Oct 2020
3:33 am

Marcin Cieslak

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

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

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-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
Monday 05 Oct 2020
6:16 pm

Marcin Cieslak

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

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

Marcin Cieslak

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

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

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-INF/tags/CKEditor.tag
  2. … 31 more files in changeset.
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
    • -1
    • +1
    ./pages/authoring/parts/itemlist.jsp
  2. … 7 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
    ./pages/authoring/parts/itemlist.jsp
    • -2
    • +2
    ./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-INF/tags/Arrow.tag
    • -2
    • +2
    ./pages/authoring/parts/answerlist.jsp
    • -2
    • +2
    ./pages/authoring/parts/itemlist.jsp
  4. … 50 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
    ./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
    ./pages/learning/results.jsp
Monday 24 Aug 2020
5:25 pm

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -6
    • +8
    ./pages/authoring/advance.jsp
  2. … 1 more file in changeset.
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
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -1
    • +1
    ./pages/authoring/parts/itemlist.jsp
  3. … 24 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
    ./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
    ./pages/authoring/advance.jsp
3:10 am

Ernie Ghiglione

LDEV-5061 remove duplicate shuffle items option

Options
    • -7
    • +0
    ./pages/authoring/advance.jsp
Friday 17 Jul 2020
5:45 pm

Marcin Cieslak

LDEV-5054 Fix Learning Outcome removal Ajax call

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

Marcin Cieslak

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

Options
    • -10
    • +0
    ./pages/authoring/parts/addVsa.jsp
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -2
    • +1
    ./pages/learning/scratchies.jsp
  4. … 27 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
    ./pages/authoring/advance.jsp
7:29 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4886 Automated tests for v4.0

Options
    • -1
    • +1
    ./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
    • +7
    ./pages/authoring/advance.jsp
    • -1
    • +1
    ./pages/learning/learning.jsp
    • -2
    • +2
    ./pages/learning/parts/confidenceLevelPortrait.jsp
    • -0
    • +1
    ./pages/learning/scratchies.jsp
  5. … 3 more files in changeset.
Monday 01 Jun 2020
3:19 pm

Marcin Cieslak

LDEV-5025 Allow leaving comments even after user rated

Options
    • -1
    • +1
    ./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-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-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-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-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-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-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
    ./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
    • -4
    • +4
    ./pages/learning/results.jsp
  2. … 1 more file in changeset.