lams-github / lams_tool_scratchie / src

java

Clone Tools

Stats

Commits this week: 0
Total Committers: 12
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
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 7 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
    ./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
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Monday 24 Aug 2020
5:25 pm

Marcin Cieslak

LDEV-5066 Do not show unconfigured Etherpad option in Scratchie

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  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
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 25 more files in changeset.
Tuesday 28 Jul 2020
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
    ./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
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 33 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
    ./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
    ./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
    • -2
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 29 more files in changeset.
Friday 05 Jun 2020
6:05 pm

Marcin Cieslak

LDEV-5032 Add anonymous confidence levels in Scratchie

Options
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200605.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
  3. … 5 more files in changeset.
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
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 1 more file in changeset.
6:57 pm

Marcin Cieslak

LDEV-5022 Make burning questions paragraphs work with jqGrid editing

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 1 more file in changeset.
Tuesday 12 May 2020
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
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  6. … 4 more files in changeset.
3:05 pm

Marcin Cieslak

LDEV-5022 Keep HTML paragraphs when displaying burning questions

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -4
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  6. … 1 more file in changeset.
Monday 11 May 2020
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
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
Thursday 07 May 2020
2:38 pm

Marcin Cieslak

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

Options
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 1 more file in changeset.
Wednesday 06 May 2020
7:21 pm

Marcin Cieslak

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

Conflicts:

lams_build/3rdParty.userlibraries

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

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

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

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

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

lams_monitoring/web/tblmonitor/teams.jsp

lams_tool_assessment/conf/language/lams/ApplicationResources_en_AU.properties

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql

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

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

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

lams_tool_lamc/web/WEB-INF/tlds/lams/lams.tld

lams_tool_lamc/web/authoring/BasicContent.jsp

lams_tool_lamc/web/learning/CombinedAnswersContent.jsp

lams_tool_lamc/web/learning/SingleQuestionAnswersContent.jsp

lams_tool_lamc/web/learning/ViewAnswers.jsp

lams_tool_lamc/web/monitoring/SummaryContent.jsp

lams_tool_lamc/web/monitoring/parts/statsPart.jsp

lams_tool_lamc/web/tblmonitoring/mcqStudentChoices.jsp

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

Options
    • -0
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -5
    • +18
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  3. … 29 more files in changeset.
Wednesday 15 Apr 2020
12:49 am

Marcin Cieslak

LDEV-5002 Display user list only when Scratchie is grouped

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 1 more file in changeset.
12:49 am

Marcin Cieslak

LDEV-5002 Display user list only when Scratchie is grouped

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 1 more file in changeset.
Monday 13 Apr 2020
1:21 pm

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
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  7. … 7 more files in changeset.
1:21 pm

Marcin Cieslak

LDEV-5002 Add question Etherpads in Scratchie

Options
    • -10
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20200413.sql
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -1
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -0
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  7. … 7 more files in changeset.
Wednesday 01 Apr 2020
7:44 pm

Marcin Cieslak

LDEV-4998 Protect activity default questions from modification

Options
    • -4
    • +17
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 5 more files in changeset.
12:08 pm

Marcin Cieslak

LDEV-4998, LDEV-4941 Fix public question editing for Q&A and Scratchie

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Thursday 26 Mar 2020
6:59 pm

Marcin Cieslak

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

Conflicts:

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

Options
    • -0
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -14
    • +25
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  5. … 4 more files in changeset.
Wednesday 25 Mar 2020
12:44 am

Marcin Cieslak

LDEV-4993 Convert double to percent correctly in Scratcie monitoring

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
Tuesday 24 Mar 2020
1:19 am

Marcin Cieslak

LDEV-4992 Remove obsolete method parameter

Options
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
1:17 am

Marcin Cieslak

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

Mark ones who reached the activity.

Options
    • -4
    • +13
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -12
    • +25
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 2 more files in changeset.
Friday 20 Mar 2020
1:35 pm

Marcin Cieslak

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

Conflicts:

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java

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

Options
    • -4
    • +12
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 19 more files in changeset.
Thursday 19 Mar 2020
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -6
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  4. … 2 more files in changeset.