lams-github

lams_tool_notebook

Clone Tools

Stats

Commits this week: 0
Total Committers: 24
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 15 May 2020
9:16 am

Ernie Ghiglione

LDEV-5021 layout changes

Options
    • -4
    • +5
    ./web/pages/monitoring/print.jsp
Thursday 14 May 2020
3:38 pm

Marcin Cieslak

LDEV-5021 Add print button on the report

Options
    • -20
    • +50
    ./web/pages/monitoring/print.jsp
3:28 pm

Marcin Cieslak

LDEV-5021 Prepare Notebook content in printable version

Options
    • -0
    • +1
    ./conf/language/lams/ApplicationResources.properties
    • -6
    • +6
    ./src/java/org/lamsfoundation/lams/tool/notebook/dao/INotebookUserDAO.java
    • -2
    • +10
    ./src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -0
    • +102
    ./src/java/org/lamsfoundation/lams/tool/notebook/dto/NotebookPrintDTO.java
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/INotebookService.java
    • -15
    • +14
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
    • -2
    • +45
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
    • -0
    • +34
    ./web/pages/monitoring/print.jsp
    • -6
    • +11
    ./web/pages/monitoring/summary.jsp
Monday 11 May 2020
6:14 pm

Marcin Cieslak

LDEV-4997 Renormalize line endings with git

Options
    • -2
    • +2
    ./.myumldata
  2. … 420 more files in changeset.
Wednesday 22 Apr 2020
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
9:48 pm

Marcin Cieslak

LDEV-4997 Do not import jQuery in Etherpad tag

It overwrites other imports made by pages which use the tag.

Options
    • -1
    • +1
    ./web/WEB-INF/tags/Etherpad.tag
  2. … 32 more files in changeset.
Tuesday 21 Apr 2020
6:07 pm

Marcin Cieslak

LDEV-4999 Fix monitor role detection when updating learner mark

Options
    • -2
    • +2
    ./.myumldata
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
  3. … 462 more files in changeset.
Monday 20 Apr 2020
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
8:46 pm

Marcin Cieslak

LDEV-5002 Distribute Etherpad tag to all projects

Options
    • -0
    • +98
    ./web/WEB-INF/tags/Etherpad.tag
    • -37
    • +37
    ./web/WEB-INF/tags/ImgButtonWrapper.tag
    • -0
    • +4
    ./web/WEB-INF/tlds/lams/lams.tld
  4. … 86 more files in changeset.
Wednesday 05 Feb 2020
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Options
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
  3. … 24 more files in changeset.
2:10 pm

Marcin Cieslak

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

Options
    • -8
    • +10
    ./src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
  3. … 24 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
    ./web/403.jsp
    • -1
    • +0
    ./web/404.jsp
    • -0
    • +5
    ./web/WEB-INF/web.xml
    • -1
    • +0
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/error.jsp
  6. … 168 more files in changeset.
Monday 20 Jan 2020
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20110510_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.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
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20080929_updateFrom21.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20081118_updateFrom22.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20110510_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20170101_updateTo30.sql
  5. … 98 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/WEB-INF/tags/OutcomeAuthor.tag
  2. … 94 more files in changeset.
Saturday 04 Jan 2020
11:36 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF Notebook conditions

- Add/remove conditions

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringNotebookConditionController.java
    • -1
    • +2
    ./web/pages/authoring/addCondition.jsp
    • -4
    • +7
    ./web/pages/authoring/conditions.jsp
  4. … 1 more file in changeset.
Friday 03 Jan 2020
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103.sql
    • -0
    • +15
    ./src/java/org/lamsfoundation/lams/tool/notebook/dbupdates/patch20190103_updateTo31.sql
  3. … 117 more files in changeset.
Thursday 02 Jan 2020
9:12 pm

Ernie Ghiglione

LDEV-4932 Add CSRF to OutcomeAuthor tag

Options
    • -2
    • +3
    ./web/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
    • -3
    • +3
    ./web/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
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
  2. … 42 more files in changeset.
Saturday 28 Dec 2019
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
    • -13
    • +27
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/AuthoringController.java
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
    • -6
    • +7
    ./web/pages/monitoring/editActivity.jsp
  4. … 107 more files in changeset.
Friday 27 Dec 2019
10:01 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF protection to Notebook

Prevents CSRF attacks for monitors adding comments to students' notebook entries.

Options
    • -2
    • +2
    ./web/pages/monitoring/summary.jsp
  2. … 1 more file in changeset.
Wednesday 25 Dec 2019
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -15
    • +7
    ./src/java/org/lamsfoundation/lams/tool/notebook/web/controller/MonitoringController.java
    • -0
    • +70
    ./web/WEB-INF/tlds/security/csrfguard.tld
    • -0
    • +15
    ./web/WEB-INF/web.xml
    • -0
    • +1
    ./web/common/taglibs.jsp
    • -1
    • +1
    ./web/pages/monitoring/summary.jsp
  6. … 59 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
    • -10
    • +14
    ./src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml
  2. … 42 more files in changeset.
Monday 09 Dec 2019
9:23 pm

Ernie Ghiglione

LDEV-4769 updating labels

Options
    • -3
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating labels across all modules. Mainly Greek, Norwegian, Español and English

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
  5. … 62 more files in changeset.
Wednesday 04 Dec 2019
3:44 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

# lams_tool_preview/conf/language/lams/ApplicationResources_el_GR.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_en_AU.properties

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

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

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

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

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

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

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

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

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

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

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

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

Options
    • -2
    • +2
    ./conf/language/lams/ApplicationResources.properties
  2. … 35 more files in changeset.
Monday 02 Dec 2019
9:06 pm

Ernie Ghiglione

LDEV-4769 updating labels

Updating all labels (Greek, English, Spanish, Norwegian)

Options
    • -2
    • +3
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -2
    • +3
    ./conf/language/lams/ApplicationResources_es_ES.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_no_NO.properties
  6. … 118 more files in changeset.
Thursday 14 Nov 2019
9:28 pm

Marcin Cieslak

LDEV-4900 Distribute modified Page tag to all tools

Options
    • -1
    • +11
    ./web/WEB-INF/tags/Page.tag
  2. … 30 more files in changeset.
Wednesday 13 Nov 2019
3:32 am

Andrey Balan

LDEV-4900 Update Gradebook marks of non-leaders on leader finish

* Gradebook now pushes updated marks to LTI consumer. It happens only if

user has finished the lesson

Options
    • -0
    • +5
    ./src/java/org/lamsfoundation/lams/tool/notebook/service/NotebookService.java
  2. … 60 more files in changeset.