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
Monday 20 Jan 2020
2:34 pm

Marcin Cieslak

LDEV-4846 Set QB question content folder when creating via TBL template

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
2:31 pm

Marcin Cieslak

LDEV-4947 Add questions from imported LD to user private QB collection

Options
    • -12
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 3 more files in changeset.
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
  5. … 73 more files in changeset.
Sunday 19 Jan 2020
3:25 pm

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20121004_wviCustomUpdate.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20130502_wviCustomUpdate.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190510.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190809.sql
    • -2
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
  7. … 96 more files in changeset.
Wednesday 15 Jan 2020
5:57 am

Andrey Balan

LDEV-4928 Update TBL monitor and Excel export to fully support VSA type

Options
    • -1
    • +6
    ./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieAnswerVisitDAO.java
    • -10
    • +26
    ./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
    • -35
    • +79
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  5. … 1 more file in changeset.
Thursday 09 Jan 2020
3:59 pm

Andrey Balan

Merge branch 'master' into v4.0

# Conflicts:

# lams_admin/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_build/build.xml

# lams_build/liblist.txt

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

# lams_central/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_central/web/authoringConfirm.jsp

# lams_central/web/common/taglibs.jsp

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_central/web/includes/javascript/outcome.js

# lams_central/web/outcome/outcomeEdit.jsp

# lams_central/web/outcome/outcomeManage.jsp

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

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

# lams_gradebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_learning/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_monitoring/web/WEB-INF/tags/OutcomeAuthor.tag

# 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/MonitoringController.java

# lams_tool_assessment/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_chat/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_daco/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_doku/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_forum/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_gmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_images/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_imscc/web/WEB-INF/tags/OutcomeAuthor.tag

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

# lams_tool_lamc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaAuthoringController.java

# lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaMonitoringController.java

# lams_tool_laqa/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_laqa/web/authoring/AuthoringTabsHolder.jsp

# lams_tool_laqa/web/authoring/newQuestionBox.jsp

# lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp

# lams_tool_larsrc/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_leader/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_mindmap/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/controller/NbMonitoringController.java

# lams_tool_nb/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_notebook/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_pixlr/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_preview/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_sbmt/web/WEB-INF/tags/OutcomeAuthor.tag

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

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

# lams_tool_scratchie/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_scratchie/web/pages/authoring/basic.jsp

# lams_tool_scribe/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_spreadsheet/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_survey/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_task/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_vote/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_wiki/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_tool_zoom/web/WEB-INF/tags/OutcomeAuthor.tag

# lams_www/web/WEB-INF/tags/OutcomeAuthor.tag

Options
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
    • -7
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  4. … 92 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -3
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 9 more files in changeset.
Wednesday 08 Jan 2020
6:34 am

Andrey Balan

LDEV-4932 Add CSRF to LD export and Excel export

Options
    • -3
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 12 more files in changeset.
Sunday 05 Jan 2020
11:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 3 more files in changeset.
Friday 03 Jan 2020
6:44 pm

Marcin Cieslak

Merge branch 'LDEV-4745' into v4.0

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# 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_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

Options
    • -21
    • +22
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -388
    • +448
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  3. … 18 more files in changeset.
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -14
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20170221.sql
    • -14
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171026.sql
    • -15
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20171106.sql
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180223.sql
    • -14
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180316.sql
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180425.sql
    • -14
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20180828.sql
    • -17
    • +0
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103.sql
    • -0
    • +59
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20190103_updateTo31.sql
  10. … 110 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 42 more files in changeset.
12:34 am

Marcin Cieslak

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

Conflicts:

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

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

Options
    • -10
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -11
    • +20
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Saturday 28 Dec 2019
11:42 pm

Marcin Cieslak

LDEV-4935 Secure Scratchie websockets

User gets checked if he participates in the given activity.

Options
    • -3
    • +5
    ./org/lamsfoundation/lams/tool/scratchie/dao/DAO.java
    • -25
    • +26
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -19
    • +26
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -2
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
11:04 am

Ernie Ghiglione

LDEV-4932 Add CSRF to Scratchie monitoring

Adding CSRF for:

- Changing group marks

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 2 more files in changeset.
2:23 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

* In order to secure /definelater.do path, added definelater() method to

AuthoringController to the tools missing it

* Remove unnecessary forms from monitor in Vote, NB, QA tools

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 109 more files in changeset.
Wednesday 25 Dec 2019
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -14
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 63 more files in changeset.
Friday 20 Dec 2019
3:42 am

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

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

# lams_tool_laqa/web/learning/CombinedAnswersContent.jsp

# lams_tool_laqa/web/learning/IndividualLearnerResults.jsp

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/SequentialAnswersContent.jsp

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_pixlr/conf/language/lams/ApplicationResources_es_ES.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_el_GR.properties

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_task/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

# lams_tool_vote/conf/language/lams/ApplicationResources_es_ES.properties

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

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

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

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

Options
    • -21
    • +22
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
    • -4
    • +7
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
  3. … 15 more files in changeset.
Thursday 19 Dec 2019
6:21 am

Andrey Balan

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

Options
    • -20
    • +22
    ./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
  2. … 42 more files in changeset.
Saturday 14 Dec 2019
10:55 am

Andrey Balan

LDEV-4928 Update monitoring, TBL monitoring and Excel export to fully support VSA question type

Options
    • -0
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/dto/GroupSummary.java
    • -0
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/dto/ScratchieItemDTO.java
    • -1
    • +14
    ./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
    • -67
    • +112
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -30
    • +13
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
    • -56
    • +43
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
    • -4
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/servlet/PopulateMarksServlet.java
  8. … 3 more files in changeset.
Friday 13 Dec 2019
10:07 pm

Marcin Cieslak

LDEV-4921 Fix ordering for burning question in Scratchie learner

Options
    • -1
    • +1
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 1 more file in changeset.
Wednesday 11 Dec 2019
4:39 pm

Marcin Cieslak

LDEV-4802 Try to identify and fix a NPE in Scratchie websockets

Options
    • -5
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningWebsocketServer.java
Tuesday 10 Dec 2019
10:24 pm

Marcin Cieslak

LDEV-4921 Hide question titles in TBL monitoring burning questions

Options
    • -1
    • +8
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java
  2. … 1 more file in changeset.
10:19 pm

Marcin Cieslak

LDEV-4921 Hide question titles in Scratchie monitoring burning questions

Options
    • -2
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/MonitoringController.java
  2. … 1 more file in changeset.
Thursday 05 Dec 2019
7:07 pm

Marcin Cieslak

LDEV-4921 Add question numbering in Scratchie

Options
    • -2
    • +9
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
  2. … 4 more files in changeset.
6:16 pm

Marcin Cieslak

LDEV-4921 Allow hiding question titles in Learner for Scratchie

Options
    • -0
    • +15
    ./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20191205.sql
    • -3
    • +3
    ./org/lamsfoundation/lams/tool/scratchie/model/ScratchieConfigItem.java
    • -2
    • +10
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AdminController.java
    • -0
    • +4
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
    • -1
    • +11
    ./org/lamsfoundation/lams/tool/scratchie/web/form/AdminForm.java
  6. … 3 more files in changeset.
7:18 am

Marcin Cieslak

LDEV-4920 Import QTI questions to Scratchie after adding them to QB

Options
    • -2
    • +19
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 4 more files in changeset.
Tuesday 26 Nov 2019
1:34 am

Andrey Balan

LDEV-4861 Prevent adding the same question twice

Options
    • -0
    • +28
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/AuthoringController.java
  2. … 5 more files in changeset.
Saturday 23 Nov 2019
1:51 am

Andrey Balan

LDEV-4880 Add confidence level variations

Options
    • -0
    • +2
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  2. … 19 more files in changeset.
Tuesday 19 Nov 2019
9:43 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java

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

lams_tool_assessment/web/pages/learning/learning.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/controller/QaLearningController.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/learning.jsp

Options
    • -20
    • +55
    ./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
    • -54
    • +51
    ./org/lamsfoundation/lams/tool/scratchie/web/controller/LearningController.java
  3. … 20 more files in changeset.