lams-github

lams_tool_assessment

Clone Tools

Stats

Commits this week: 0
Total Committers: 20
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
6:50 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
4:12 am

Ernie Ghiglione

LDEV-4945 Fix mysql comments on patch files

Options
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.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/assessment/dbupdates/patch20110413_updateTo236.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170101_updateTo30.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190423.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190517.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190704.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190809.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190913.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191016.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191120.sql
    • -2
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20191205.sql
  11. … 92 more files in changeset.
Friday 17 Jan 2020
6:04 am

Andrey Balan

LDEV-4932 Add CSRF to Assessment monitoring

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +2
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +3
    ./web/pages/monitoring/statisticpart.jsp
  4. … 1 more file in changeset.
5:36 am

Andrey Balan

LDEV-4944 Take care about VSAs edited by several teachers simultaneously

Options
    • -1
    • +1
    ./conf/language/lams/ApplicationResources_en_AU.properties
    • -1
    • +14
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
    • -1
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java
    • -3
    • +11
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -15
    • +18
    ./web/pages/monitoring/parts/questionsummary.jsp
Thursday 16 Jan 2020
4:06 am

Andrey Balan

LDEV-4875 Add "cursor:pointer" to drag-and-drop answers

Options
    • -0
    • +3
    ./web/pages/monitoring/parts/questionsummary.jsp
3:43 am

Andrey Balan

LDEV-4875 Prevent monitors from allocating empty or autosaved answers

Options
    • -1
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentQuestionResultDAOHibernate.java
    • -1
    • +4
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
Friday 10 Jan 2020
6:10 am

Andrey Balan

LDEV-4932 Add CSRF to QB bank calls

Options
    • -2
    • +2
    ./web/pages/authoring/basic.jsp
  2. … 32 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
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -14
    • +12
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -9
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
    • -2
    • +3
    ./web/WEB-INF/tags/OutcomeAuthor.tag
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/monitoring.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/usersummary.jsp
    • -9
    • +10
    ./web/pages/monitoring/summary.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  12. … 84 more files in changeset.
5:44 am

Andrey Balan

LDEV-4932 Add CSRF Excel export in tools

Options
    • -4
    • +1
    ./web/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
    • -5
    • +6
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +7
    ./web/pages/tblmonitoring/assessmentStudentChoices.jsp
    • -1
    • +7
    ./web/pages/tblmonitoring/iraAssessmentStudentChoices.jsp
  4. … 10 more files in changeset.
3:42 am

Andrey Balan

LDEV-4932 Add CSRF to monitor and central

Options
    • -9
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/TblMonitoringController.java
  2. … 50 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
    • -20
    • +33
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
    • -399
    • +405
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  3. … 18 more files in changeset.
2:59 pm

Marcin Cieslak

LDEV-4743 Squash tool patches updating to version 3.1

Options
    • -19
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170315.sql
    • -16
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20170822.sql
    • -34
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171011.sql
    • -23
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171016.sql
    • -17
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20171218.sql
    • -18
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180330.sql
    • -26
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180425.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20180515.sql
    • -14
    • +0
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103.sql
    • -0
    • +117
    ./src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20190103_updateTo31.sql
  11. … 109 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.
9:00 pm

Ernie Ghiglione

LDEV-4932 removing multipart encoding

There are plenty of form we set the multipart encoding for uploading files, but no files are uploaded. This has implications for CSRF tokens. So we remove the enctype="multipart/form-data" for all the authoring forms that aren't needed.

Options
    • -1
    • +1
    ./web/pages/authoring/authoring.jsp
  2. … 14 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
    ./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
    • +1
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
    • -1
    • +2
    ./web/pages/authoring/authoring.jsp
  3. … 41 more files in changeset.
Saturday 28 Dec 2019
4:49 pm

Ernie Ghiglione

LDEV-4932 Adding CSRF to Assessment monitoring

Adding CSRF to:

- Change user marks

- Disclose correct answers

- Disclose group answers

Options
    • -3
    • +3
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/MonitoringController.java
    • -1
    • +1
    ./web/pages/monitoring/parts/questionsummary.jsp
    • -1
    • +1
    ./web/pages/monitoring/parts/usersummary.jsp
    • -5
    • +9
    ./web/pages/monitoring/summary.jsp
  5. … 1 more file 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
    • +2
    ./src/java/org/lamsfoundation/lams/tool/assessment/web/controller/AuthoringController.java
  2. … 109 more files in changeset.
Wednesday 25 Dec 2019
6:28 am

Andrey Balan

LDEV-4932 Secure edit in monitor with CSRF Guard

Options
    • -5
    • +7
    ./web/pages/monitoring/editactivity.jsp
  2. … 2 more files in changeset.
5:47 am

Andrey Balan

LDEV-4932 Secure setting submission deadline with CSRF Guard

Options
    • -6
    • +5
    ./src/java/org/lamsfoundation/lams/tool/assessment/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/monitoring.jsp
  6. … 59 more files in changeset.
Monday 23 Dec 2019
8:59 pm

Ernie Ghiglione

LDEV-4745 LDEV-4875 Adding/updating labels

Adding and updating labels for QB and VSAs for LAMS v4.0

Options
    • -2
    • +7
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +7
    ./conf/language/lams/ApplicationResources_en_AU.properties
  3. … 4 more files in changeset.
8:25 pm

Andrey Balan

Merge branch 'develop' into LDEV-4745

# Conflicts:

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

Options
    • -5
    • +9
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 1 more file in changeset.
Friday 20 Dec 2019
10:27 pm

Andrey Balan

LDEV-4933 Take care about null/100.0 case

Options
    • -4
    • +7
    ./src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
  2. … 2 more files in changeset.
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
    • -19
    • +24
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 16 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
    • -18
    • +23
    ./src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
  2. … 42 more files in changeset.
Thursday 12 Dec 2019
12:26 am

Andrey Balan

Merge branch 'master' into develop

# Conflicts:

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

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

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

# lams_tool_laqa/web/learning/LearnerRep.jsp

# lams_tool_laqa/web/learning/RevisitedLearnerRep.jsp

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

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

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

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

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

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

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

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

# lams_tool_survey/conf/language/lams/ApplicationResources.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_wiki/conf/language/lams/ApplicationResources.properties

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

Options
    • -2
    • +16
    ./conf/language/lams/ApplicationResources.properties
  2. … 17 more files in changeset.
Monday 09 Dec 2019
9:18 pm

Ernie Ghiglione

LDEV-4745 adding new labels

Options
    • -15
    • +13
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +25
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -12
    • +13
    ./conf/language/lams/ApplicationResources_en_AU.properties
7:57 pm

Ernie Ghiglione

LDEV-4769 updating labels

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

Options
    • -2
    • +16
    ./conf/language/lams/ApplicationResources.properties
    • -2
    • +25
    ./conf/language/lams/ApplicationResources_el_GR.properties
    • -2
    • +16
    ./conf/language/lams/ApplicationResources_en_AU.properties
  4. … 63 more files in changeset.