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
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
    • -11
    • +38
    ./pages/monitoring/summary.jsp
  2. … 21 more files in changeset.
1:31 pm

Marcin Cieslak

LDEV-4992 Add icon to a leader in Scratchie monitoring summary

Options
    • -1
    • +10
    ./pages/monitoring/summary.jsp
Thursday 19 Mar 2020
9:10 pm

Marcin Cieslak

LDEV-4992 Show all learners in Scratchie monitoring summary

Options
    • -12
    • +30
    ./pages/monitoring/summary.jsp
  2. … 4 more files in changeset.
2:51 pm

Marcin Cieslak

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

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/outcome/dao/hibernate/OutcomeDAO.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java

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

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

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

lams_tool_scratchie/web/pages/tblmonitoring/traStudentChoices.jsp

Options
    • -0
    • +252
    ./pages/monitoring/studentChoices.jsp
    • -17
    • +8
    ./pages/monitoring/summary.jsp
  3. … 5 more files in changeset.
Wednesday 18 Mar 2020
10:09 pm

Ernie Ghiglione

LDEV-4993 Slight layout changes

Options
    • -1
    • +3
    ./pages/monitoring/summary.jsp
8:55 pm

Marcin Cieslak

LDEV-4993 Move files to reflect logical assignment better

Options
    • -0
    • +244
    ./pages/monitoring/studentChoices.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
    • -244
    • +0
    ./pages/tblmonitoring/traStudentChoices.jsp
  4. … 1 more file in changeset.
8:48 pm

Marcin Cieslak

LDEV-4993 Redesign Scratchie monitoring summary tab

Options
    • -16
    • +5
    ./pages/monitoring/summary.jsp
    • -52
    • +69
    ./pages/tblmonitoring/traStudentChoices.jsp
  3. … 7 more files in changeset.
Thursday 12 Mar 2020
1:55 pm

Marcin Cieslak

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

Conflicts:

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.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/src/java/org/lamsfoundation/lams/tool/scratchie/web/controller/TblMonitorController.java

lams_tool_scratchie/web/pages/learning/scratchies.jsp

Options
    • -0
    • +4
    ./includes/css/scratchie-learning.scss
    • -0
    • +11
    ./pages/learning/learning.jsp
    • -2
    • +9
    ./pages/learning/results.jsp
    • -2
    • +8
    ./pages/learning/scratchies.jsp
  5. … 7 more files in changeset.
1:33 pm

Marcin Cieslak

LDEV-4990 Style results page the same way as learning page in Scratchie

Options
    • -1
    • +3
    ./pages/learning/results.jsp
10:12 am

Ernie Ghiglione

LDEV-4987 Minor adjustments in layout

Options
    • -7
    • +8
    ./pages/learning/scratchies.jsp
Wednesday 11 Mar 2020
6:29 am

Marcin Cieslak

LDEV-4987 Display Scratchie item score on monitoring page

Options
    • -0
    • +4
    ./includes/css/scratchie-learning.scss
    • -0
    • +11
    ./pages/learning/learning.jsp
    • -4
    • +6
    ./pages/learning/scratchies.jsp
  4. … 1 more file in changeset.
5:56 am

Marcin Cieslak

LDEV-4987 Show score by each Scratchie in results. Show negative percent

Options
    • -1
    • +6
    ./pages/learning/results.jsp
    • -0
    • +4
    ./pages/learning/scratchies.jsp
  3. … 7 more files in changeset.
Wednesday 19 Feb 2020
1:51 pm

Ernie Ghiglione

LDEV-4975 Upgrade jquery to version 3.4.1

Options
    • -1
    • +1
    ./pages/learning/learning.jsp
  2. … 16 more files in changeset.
Thursday 23 Jan 2020
6:40 am

Andrey Balan

LDEV-4953 Set pageEncoding and contentType in web.xml instead of jsps

Options
    • -1
    • +0
    ./403.jsp
    • -1
    • +0
    ./404.jsp
    • -0
    • +6
    ./WEB-INF/web.xml
    • -1
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./error.jsp
    • -1
    • +0
    ./login.jsp
  7. … 167 more files in changeset.
Wednesday 22 Jan 2020
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Options
    • -26
    • +1
    ./pages/authoring/basic.jsp
    • -14
    • +50
    ./pages/authoring/parts/itemlist.jsp
  3. … 3 more files in changeset.
9:38 pm

Marcin Cieslak

LDEV-4950 Drag&drop item sorting in Scratchie authoring

Also in Scratchie and Assessment update visible question numbering on

sort.

Conflicts:

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

lams_tool_scratchie/web/pages/authoring/basic.jsp

lams_tool_scratchie/web/pages/authoring/parts/itemlist.jsp

Options
    • -26
    • +1
    ./pages/authoring/basic.jsp
    • -2
    • +47
    ./pages/authoring/parts/itemlist.jsp
  3. … 3 more files in changeset.
Tuesday 21 Jan 2020
4:23 am

Andrey Balan

LDEV-4948 Prevent adding enctype="multipart/form-data" to forms

Options
    • -4
    • +4
    ./pages/learning/learning.jsp
  2. … 4 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
    • +1
    ./pages/tblmonitoring/traStudentChoices.jsp
  2. … 4 more files in changeset.
Friday 10 Jan 2020
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -1
    • +1
    ./pages/authoring/parts/addMcq.jsp
    • -0
    • +1
    ./pages/authoring/parts/addVsa.jsp
  4. … 30 more files 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
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +1
    ./pages/authoring/authoring.jsp
    • -1
    • +1
    ./pages/authoring/basic.jsp
    • -0
    • +1
    ./pages/authoring/parts/addMcq.jsp
    • -3
    • +3
    ./pages/monitoring/summary.jsp
    • -1
    • +7
    ./pages/tblmonitoring/traStudentChoices.jsp
  7. … 89 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  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
    • -1
    • +7
    ./pages/tblmonitoring/traStudentChoices.jsp
  2. … 12 more files in changeset.
Sunday 05 Jan 2020
11:49 pm

Ernie Ghiglione

LDEV Adding CSRF to Scratchie authoring

Options
    • -2
    • +2
    ./pages/authoring/basic.jsp
    • -0
    • +1
    ./pages/authoring/parts/additem.jsp
  3. … 2 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./WEB-INF/tags/OutcomeAuthor.tag
  2. … 30 more files in changeset.
Wednesday 01 Jan 2020
7:43 am

Ernie Ghiglione

LDEV-4932 Passing CSRF token as a post rather than get

Options
    • -2
    • +2
    ./pages/authoring/authoring.jsp
  2. … 41 more files in changeset.
Tuesday 31 Dec 2019
5:14 am

Andrey Balan

LDEV-4932 Secure save tool authoring with CSRF Guard

Options
    • -2
    • +2
    ./pages/authoring/authoring.jsp
  2. … 42 more files in changeset.
Saturday 28 Dec 2019
11:04 am

Ernie Ghiglione

LDEV-4932 Add CSRF to Scratchie monitoring

Adding CSRF for:

- Changing group marks

Options
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  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
    • -5
    • +7
    ./pages/monitoring/editactivity.jsp
  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
    • -0
    • +70
    ./WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./WEB-INF/web.xml
    • -0
    • +1
    ./common/taglibs.jsp
    • -1
    • +1
    ./pages/monitoring/summary.jsp
  5. … 60 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
    • -5
    • +5
    ./pages/monitoring/parts/itemSummary.jsp
    • -6
    • +14
    ./pages/tblmonitoring/tra.jsp
    • -11
    • +18
    ./pages/tblmonitoring/traStudentChoices.jsp
  4. … 7 more files in changeset.