Activity lams-github/lams

6:14 pm

Marcin Cieslak

More
a5b247d
changed 421 files
v4.7, v4.8

LDEV-4997 Renormalize line endings with git

- -109
- +109
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveLog.java
- -148
- +148
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
- History
- Source
- Diff
./src/java/org/.../model/KumalivePoll.java
- -128
- +128
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
- History
- Source
- Diff
./src/java/.../model/KumalivePollAnswer.java
- -111
- +111
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveRubric.java
- -111
- +111
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveScore.java
- -75
- +75
./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
- History
- Source
- Diff
./src/java/.../service/IKumaliveService.java
- -635
- +635
./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
- History
- Source
- Diff
./src/java/.../service/KumaliveService.java
- -1072
- +1072
./web/includes/javascript/kumalive.js
- History
- Source
- Diff
./web/includes/javascript/kumalive.js
… 413 more files in changeset.

7:21 pm

Marcin Cieslak

More
8bc318f
changed 31 files

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

- -62
- +74
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
… 30 more files in changeset.

9:48 pm

Marcin Cieslak

More
4987c51
changed 33 files
v4.7, v4.8

LDEV-4997 Do not import jQuery in Etherpad tag

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

- -1
- +1
./web/WEB-INF/tags/Etherpad.tag
- History
- Source
- Diff
./web/WEB-INF/tags/Etherpad.tag
… 32 more files in changeset.

9:48 pm

Marcin Cieslak

More
1e355e0
changed 33 files
v4.7, v4.8

LDEV-4997 Do not import jQuery in Etherpad tag

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

- -1
- +1
./web/WEB-INF/tags/Etherpad.tag
- History
- Source
- Diff
./web/WEB-INF/tags/Etherpad.tag
… 32 more files in changeset.

6:07 pm

Marcin Cieslak

More
89279cb
changed 464 files
v4.7, v4.8

LDEV-4999 Fix monitor role detection when updating learner mark

- -109
- +109
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveLog.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveLog.java
- -148
- +148
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePoll.java
- History
- Source
- Diff
./src/java/org/.../model/KumalivePoll.java
- -128
- +128
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumalivePollAnswer.java
- History
- Source
- Diff
./src/java/.../model/KumalivePollAnswer.java
- -111
- +111
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveRubric.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveRubric.java
- -111
- +111
./src/java/org/lamsfoundation/lams/learning/kumalive/model/KumaliveScore.java
- History
- Source
- Diff
./src/java/org/.../model/KumaliveScore.java
- -75
- +75
./src/java/org/lamsfoundation/lams/learning/kumalive/service/IKumaliveService.java
- History
- Source
- Diff
./src/java/.../service/IKumaliveService.java
- -635
- +635
./src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java
- History
- Source
- Diff
./src/java/.../service/KumaliveService.java
- -37
- +37
./web/WEB-INF/tags/ImgButtonWrapper.tag
- History
- Source
- Diff
./web/WEB-INF/tags/ImgButtonWrapper.tag
- -1072
- +1072
./web/includes/javascript/kumalive.js
- History
- Source
- Diff
./web/includes/javascript/kumalive.js
… 455 more files in changeset.

8:46 pm

Marcin Cieslak

More
e81152b
changed 89 files
v4.7, v4.8

LDEV-5002 Distribute Etherpad tag to all projects

- -0
- +98
./web/WEB-INF/tags/Etherpad.tag
- History
- Source
./web/WEB-INF/tags/Etherpad.tag
- -37
- +37
./web/WEB-INF/tags/ImgButtonWrapper.tag
- History
- Source
- Diff
./web/WEB-INF/tags/ImgButtonWrapper.tag
- -0
- +4
./web/WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
./web/WEB-INF/tlds/lams/lams.tld
… 86 more files in changeset.

8:46 pm

Marcin Cieslak

More
b215f73
changed 89 files
v4.7, v4.8

LDEV-5002 Distribute Etherpad tag to all projects

- -0
- +98
./web/WEB-INF/tags/Etherpad.tag
- History
- Source
./web/WEB-INF/tags/Etherpad.tag
- -37
- +37
./web/WEB-INF/tags/ImgButtonWrapper.tag
- History
- Source
- Diff
./web/WEB-INF/tags/ImgButtonWrapper.tag
- -0
- +4
./web/WEB-INF/tlds/lams/lams.tld
- History
- Source
- Diff
./web/WEB-INF/tlds/lams/lams.tld
… 86 more files in changeset.

9:47 am

Andrey Balan

More
e2956cb
changed 199 files

LDEV-4995 Upgrade to bootstrap 4

* Update LAMS code to use bootstrap 4

* Update and redesign index page

- -1
- +1
./web/grouping/choose.jsp
- History
- Source
- Diff
./web/grouping/choose.jsp
- -1
- +1
./web/grouping/show.jsp
- History
- Source
- Diff
./web/grouping/show.jsp
- -3
- +3
./web/kumalive/kumalive.jsp
- History
- Source
- Diff
./web/kumalive/kumalive.jsp
- -1
- +1
./web/kumalive/kumaliveReport.jsp
- History
- Source
- Diff
./web/kumalive/kumaliveReport.jsp
- -5
- +5
./web/kumalive/kumaliveRubrics.jsp
- History
- Source
- Diff
./web/kumalive/kumaliveRubrics.jsp
- -1
- +1
./web/lessonComplete.jsp
- History
- Source
- Diff
./web/lessonComplete.jsp
- -1
- +1
./web/presenceChat.jsp
- History
- Source
- Diff
./web/presenceChat.jsp
… 192 more files in changeset.

1:35 pm

Marcin Cieslak

More
a61b6ad
changed 22 files
v4.7, v4.8

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

- -0
- +3
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +3
./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
- History
- Source
- Diff
./src/java/.../ILearnerFullService.java
- -62
- +74
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -14
- +11
./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
- History
- Source
- Diff
./src/java/.../controller/GateController.java
… 18 more files in changeset.

5:48 pm

Ernie Ghiglione

More
eb433bc
changed 3 files
v4.7, v4.8

LDEV-4989 fixing layout and labels

- -3
- +2
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +1
./web/gate/gateNext.jsp
- History
- Source
- Diff
./web/gate/gateNext.jsp
- -14
- +10
./web/gate/passwordGateContent.jsp
- History
- Source
- Diff
./web/gate/passwordGateContent.jsp

9:44 pm

Marcin Cieslak

More
255e147
changed 4 files
v4.7, v4.8

LDEV-4989 Inform user of incorrect gate password

- -0
- +1
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -0
- +4
./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
- History
- Source
- Diff
./src/java/.../controller/GateController.java
- -0
- +9
./src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java
- History
- Source
- Diff
./src/java/org/.../web/form/GateForm.java
- -0
- +9
./web/gate/passwordGateContent.jsp
- History
- Source
- Diff
./web/gate/passwordGateContent.jsp

10:44 pm

Marcin Cieslak

More
7116e79
changed 37 files
v4.7, v4.8

LDEV-4989 Password Gate initial implementation

- -0
- +3
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +3
./src/java/org/lamsfoundation/lams/learning/service/ILearnerFullService.java
- History
- Source
- Diff
./src/java/.../ILearnerFullService.java
- -62
- +74
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
- -14
- +7
./src/java/org/lamsfoundation/lams/learning/web/controller/GateController.java
- History
- Source
- Diff
./src/java/.../controller/GateController.java
- -1
- +9
./src/java/org/lamsfoundation/lams/learning/web/form/GateForm.java
- History
- Source
- Diff
./src/java/org/.../web/form/GateForm.java
- -1
- +10
./web/gate/gateNext.jsp
- History
- Source
- Diff
./web/gate/gateNext.jsp
- -0
- +67
./web/gate/passwordGateContent.jsp
- History
- Source
./web/gate/passwordGateContent.jsp
… 30 more files in changeset.

12:23 pm

Ernie Ghiglione

More
029a724
changed 1 file
v4.7, v4.8

LDEV-4878 Sanitise XSS for notes title in learner

- -9
- +13
./web/notebook/viewall.jsp
- History
- Source
- Diff
./web/notebook/viewall.jsp

10:21 pm

Andrey Balan

More
b5d2a68
changed 193 files

LDEV-4951 Remove traces of MCQ tool from other modules

- -3
- +1
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
… 192 more files in changeset.

6:40 am

Andrey Balan

More
9cbba00
changed 173 files
v4.7, v4.8

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

- -1
- +0
./web/403.jsp
- History
- Source
- Diff
./web/403.jsp
- -1
- +0
./web/404.jsp
- History
- Source
- Diff
./web/404.jsp
- -0
- +6
./web/WEB-INF/web.xml
- History
- Source
- Diff
./web/WEB-INF/web.xml
- -2
- +0
./web/common/taglibs.jsp
- History
- Source
- Diff
./web/common/taglibs.jsp
- -1
- +1
./web/error.jsp
- History
- Source
- Diff
./web/error.jsp
- -1
- +0
./web/login.jsp
- History
- Source
- Diff
./web/login.jsp
- -2
- +0
./web/presenceChat.jsp
- History
- Source
- Diff
./web/presenceChat.jsp
- -2
- +0
./web/requestURL.jsp
- History
- Source
- Diff
./web/requestURL.jsp
… 165 more files in changeset.

3:59 pm

Andrey Balan

More
e6dc4db
changed 95 files
v4.7, v4.8

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

- -2
- +3
./web/WEB-INF/tags/OutcomeAuthor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/OutcomeAuthor.tag
… 94 more files in changeset.

5:42 pm

Marcin Cieslak

More
b5f4298
changed 1 file
v4.7, v4.8

LDEV-4366 Renormalize incorrect line endings for git to work better

- -319
- +319
./web/css/kumalive.scss
- History
- Source
- Diff
./web/css/kumalive.scss

5:42 pm

Marcin Cieslak

More
18ce1f7
changed 1 file
v4.7, v4.8

LDEV-4366 Renormalize incorrect line endings for git to work better

- -319
- +319
./web/css/kumalive.scss
- History
- Source
- Diff
./web/css/kumalive.scss

9:12 pm

Ernie Ghiglione

More
94a589a
changed 31 files
v4.7, v4.8

LDEV-4932 Add CSRF to OutcomeAuthor tag

- -2
- +3
./web/WEB-INF/tags/OutcomeAuthor.tag
- History
- Source
- Diff
./web/WEB-INF/tags/OutcomeAuthor.tag
… 30 more files in changeset.

10:54 pm

Marcin Cieslak

More
c0afa34
changed 4 files
v4.7, v4.8

LDEV-4935 Secure lesson chat (presence) websockets

Nickname is taken from session, not from incoming parameters. User gets

checked if he participates in the given lesson.

Simplified code, clean up.

- -69
- +104
./src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java
- History
- Source
- Diff
./src/java/.../PresenceWebsocketServer.java
- -3
- +3
./src/java/org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java
- History
- Source
- Diff
./src/java/org/.../dao/IPresenceChatDAO.java
- -5
- +1
./web/includes/javascript/presence.js
- History
- Source
- Diff
./web/includes/javascript/presence.js
- -2
- +1
./web/presenceChat.jsp
- History
- Source
- Diff
./web/presenceChat.jsp

3:42 am

Andrey Balan

More
f27fea8
changed 17 files
v4.7, v4.8

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

- -1
- +7
./conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
./conf/.../ApplicationResources.properties
- -1
- +1
./conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_en_AU.properties
- -1
- +1
./conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
./conf/.../ApplicationResources_es_ES.properties
… 14 more files in changeset.

6:22 am

Andrey Balan

More
d9e8a78
changed 1 file
v4.7, v4.8

Merge branch 'master' into develop

- -3
- +0
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java

6:21 am

Andrey Balan

More
713a4d2
changed 43 files
v4.7, v4.8

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

* Alphabetize method names in to xApplicationContext.xmls

- -14
- +15
./src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
- History
- Source
- Diff
./src/java/.../learningApplicationContext.xml
- -3
- +0
./src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
./src/java/org/.../service/LearnerService.java
… 41 more files in changeset.

6:41 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

More
de2950a
changed 2 files

LDEV-4911 Added ids to support automated testing

- -1
- +1
./web/gate/gateDescription.jsp
- History
- Source
- Diff
./web/gate/gateDescription.jsp
… 1 more file in changeset.

12:26 am

Andrey Balan

More
3cb5f91
changed 18 files
v4.7, v4.8

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