Activity lams-github/

LDEV-3646: Add websocket server and client code. Add Ant code for deploying the server class to <WAR>/WEB-INF/classes folder for WildFly to pick it up on start up. Clean up and formatting.

- -5
- +7
/lams_build/build_base.xml
- History
- Source
- Diff
/lams_build/build_base.xml
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -0
- +45
/lams_common/src/java/org/lamsfoundation/lams/util/hibernate/HibernateSessionManager.java
- History
- Source
/lams_common/src/.../HibernateSessionManager.java
- -131
- +132
/lams_common/src/java/org/lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
- History
- Source
- Diff
/lams_common/.../TransactionAwareSessionContext.java
- -32
- +32
/lams_learning/web/WEB-INF/tags/Head.tag
- History
- Source
- Diff
/lams_learning/web/WEB-INF/tags/Head.tag
- -0
- +1
/lams_tool_chat/.classpath
- History
- Source
- Diff
/lams_tool_chat/.classpath
- -2
- +20
/lams_tool_chat/build.xml
- History
- Source
- Diff
/lams_tool_chat/build.xml
- -1
- +1
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/IChatMessageDAO.java
- History
- Source
- Diff
/lams_tool_chat/src/.../IChatMessageDAO.java
- -58
- +67
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dao/hibernate/ChatMessageDAO.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatMessageDAO.java
- -7
- +8
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatService.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatService.java
- -30
- +24
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/ChatServiceProxy.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatServiceProxy.java
- -2
- +3
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/service/IChatService.java
- History
- Source
- Diff
/lams_tool_chat/src/.../IChatService.java
- -1
- +1
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/util/ChatConstants.java
- History
- Source
- Diff
/lams_tool_chat/src/.../ChatConstants.java
- -169
- +21
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_chat/src/.../LearningAction.java
- -0
- +370
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java
- History
- Source
/lams_tool_chat/.../LearningWebsocketServer.java
… 4 more files in changeset.

12:36 am

Marcin Cieslak

More
6a20d28
changed 3 files
v4.7, v4.8

LDEV-3644 Store answer grade (%) sum in question so front-end knows whether the question was answered correctly/partially/incorrectly even if mark is 0.

- -83
- +110
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentQuestion.java
- -0
- +4
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentServiceImpl.java
- -4
- +4
/lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../multiplechoice.jsp

12:33 am

Marcin Cieslak

More
b2b3012
changed 3 files

LDEV-3644 Store answer grade (%) sum in question so front-end knows whether the question was answered correctly/partially/incorrectly even if mark is 0.

- -83
- +110
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/model/AssessmentQuestion.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentQuestion.java
- -0
- +4
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
- History
- Source
- Diff
/lams_tool_assessment/.../AssessmentServiceImpl.java
- -4
- +4
/lams_tool_assessment/web/pages/learning/parts/multiplechoice.jsp
- History
- Source
- Diff
/lams_tool_assessment/.../multiplechoice.jsp

6:08 pm

Marcin Cieslak

More
bcd6ef0
changed 9 files
v4.7, v4.8

LDEV-3292: Use JOIN instead of cartesian product in several named queries. Clean up and formatting.

- -136
- +58
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../lesson/Lesson.hbm.xml
- -5
- +5
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
- History
- Source
- Diff
/lams_common/.../UserOrganisation.hbm.xml
- -98
- +107
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
- History
- Source
- Diff
/lams_common/src/.../ChosenGrouper.java
- -19
- +25
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
- History
- Source
- Diff
/lams_common/src/.../Grouper.java
- -175
- +176
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -33
- +1
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
/lams_common/src/java/.../dao/ILessonDAO.java
- -60
- +5
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/LessonDAO.java
- -19
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
/lams_common/src/.../ILessonService.java
- -14
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
/lams_common/src/.../LessonService.java

5:56 pm

Marcin Cieslak

More
bff15f0
changed 1 file

LDEV-3292: Use JOIN instead of cartesian product in several named queries. Clean up and formatting.

- -5
- +5
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/usermanagement/UserOrganisation.hbm.xml
- History
- Source
- Diff
/lams_common/.../UserOrganisation.hbm.xml

5:47 pm

Marcin Cieslak

More
c85eeb3
changed 8 files

LDEV-3292: Use JOIN instead of cartesian product in several named queries. Clean up and formatting.

- -136
- +58
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../lesson/Lesson.hbm.xml
- -98
- +107
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouper.java
- History
- Source
- Diff
/lams_common/src/.../ChosenGrouper.java
- -168
- +192
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouper.java
- History
- Source
- Diff
/lams_common/src/.../Grouper.java
- -175
- +176
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouper.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouper.java
- -33
- +1
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java
- History
- Source
- Diff
/lams_common/src/java/.../dao/ILessonDAO.java
- -85
- +7
/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/LessonDAO.java
- -19
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java
- History
- Source
- Diff
/lams_common/src/.../ILessonService.java
- -14
- +0
/lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java
- History
- Source
- Diff
/lams_common/src/.../LessonService.java

1:35 am

Andrey Balan

More
bc23cb3
changed 1 file

LDEV-3637 adding comments

- -1
- +2
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java
- History
- Source
- Diff
/lams_monitoring/.../IMonitoringService.java

1:35 am

Andrey Balan

More
8ffbcd2
changed 1 file

LDEV-3637 Add integration API: clone a lesson based on a lessonID

- -6
- +7
/lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java
- History
- Source
- Diff
/lams_central/.../LessonManagerServlet.java

10:41 pm

Marcin Cieslak

More
1cda4dd
changed 29 files

LDEV-3640: Generate only a warning when there is no foreign key to drop.

- -17
- +17
/lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_assessment/.../patch20151217.sql
- -2
- +2
/lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_bbb/src/.../patch20151217.sql
- -5
- +5
/lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_chat/src/.../patch20151217.sql
- -9
- +9
/lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_daco/src/.../patch20151217.sql
- -12
- +12
/lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_eadventure/.../patch20151217.sql
- -17
- +17
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_forum/src/.../patch20151217.sql
- -6
- +6
/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_gmap/src/.../patch20151217.sql
- -10
- +10
/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_images/src/.../patch20151217.sql
- -10
- +10
/lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_imscc/src/.../patch20151217.sql
- -12
- +12
/lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_kaltura/src/.../patch20151217.sql
- -8
- +8
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_lamc/src/.../patch20151217.sql
- -8
- +8
/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_laqa/src/.../patch20151217.sql
- -10
- +10
/lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_larsrc/src/.../patch20151217.sql
- -3
- +3
/lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_leader/src/.../patch20151217.sql
- -7
- +7
/lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/dbupdates/patch20151217.sql
- History
- Source
- Diff
/lams_tool_mindmap/src/.../patch20151217.sql
… 14 more files in changeset.

4:37 pm

Marcin Cieslak

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

LDEV-3533 moved URL rewrite operations from index.jsp to UrlRewrite config file (in order to keep such rules in one place)

- -0
- +6
/lams_learning/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_learning/web/WEB-INF/web.xml

4:36 pm

Marcin Cieslak

More
b7a775f
deleted 8 files
v4.7, v4.8

LDEV-3335, LDEV-3334 Do not create web.xml files with XDoclet as it can not produce them based on 3.1 schema. Use static ones instead.

- -13
- +0
/lams_learning/conf/xdoclet/error-pages.xml
- History
- Source
- Diff
/lams_learning/conf/.../error-pages.xml
- -25
- +0
/lams_learning/conf/xdoclet/filter-mappings.xml
- History
- Source
- Diff
/lams_learning/conf/.../filter-mappings.xml
- -31
- +0
/lams_learning/conf/xdoclet/filters.xml
- History
- Source
- Diff
/lams_learning/conf/xdoclet/filters.xml
- -18
- +0
/lams_learning/conf/xdoclet/servlet-mappings.xml
- History
- Source
- Diff
/lams_learning/conf/.../servlet-mappings.xml
- -40
- +0
/lams_learning/conf/xdoclet/servlets.xml
- History
- Source
- Diff
/lams_learning/conf/xdoclet/servlets.xml
- -89
- +0
/lams_learning/conf/xdoclet/taglibs.xml
- History
- Source
- Diff
/lams_learning/conf/xdoclet/taglibs.xml
- -54
- +0
/lams_learning/conf/xdoclet/web-security.xml
- History
- Source
- Diff
/lams_learning/conf/.../web-security.xml
- -34
- +0
/lams_learning/conf/xdoclet/web-settings.xml
- History
- Source
- Diff
/lams_learning/conf/.../web-settings.xml

11:27 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
5297fc6
changed 11 files
v4.7, v4.8

LDEV-3631: Converted to div

- -11
- +6
/lams_central/web/WEB-INF/tags/Comments.tag
- History
- Source
- Diff
/lams_central/web/.../tags/Comments.tag
- -4
- +2
/lams_central/web/comments/comments.jsp
- History
- Source
- Diff
/lams_central/web/comments/comments.jsp
- -2
- +2
/lams_central/web/comments/edit.jsp
- History
- Source
- Diff
/lams_central/web/comments/edit.jsp
- -12
- +4
/lams_central/web/comments/msgview.jsp
- History
- Source
- Diff
/lams_central/web/comments/msgview.jsp
- -3
- +2
/lams_central/web/comments/new.jsp
- History
- Source
- Diff
/lams_central/web/comments/new.jsp
- -2
- +2
/lams_central/web/comments/reply.jsp
- History
- Source
- Diff
/lams_central/web/comments/reply.jsp
- -10
- +6
/lams_central/web/comments/topicview.jsp
- History
- Source
- Diff
/lams_central/web/comments/topicview.jsp
- -1
- +1
/lams_central/web/comments/topicviewwrapper.jsp
- History
- Source
- Diff
/lams_central/web/.../topicviewwrapper.jsp
- -9
- +5
/lams_central/web/includes/javascript/comments.js
- History
- Source
- Diff
/lams_central/web/.../javascript/comments.js
- -7
- +6
/lams_tool_nb/web/WEB-INF/tags/Comments.tag
- History
- Source
- Diff
/lams_tool_nb/web/.../tags/Comments.tag
- -0
- +1
/lams_tool_nb/web/template/learnerTemplate.jsp
- History
- Source
- Diff
/lams_tool_nb/web/.../learnerTemplate.jsp

10:19 am

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
4df9f0e
changed 11 files

LDEV-3631: Converted to div

- -11
- +6
/lams_central/web/WEB-INF/tags/Comments.tag
- History
- Source
- Diff
/lams_central/web/.../tags/Comments.tag
- -4
- +2
/lams_central/web/comments/comments.jsp
- History
- Source
- Diff
/lams_central/web/comments/comments.jsp
- -2
- +2
/lams_central/web/comments/edit.jsp
- History
- Source
- Diff
/lams_central/web/comments/edit.jsp
- -12
- +4
/lams_central/web/comments/msgview.jsp
- History
- Source
- Diff
/lams_central/web/comments/msgview.jsp
- -3
- +2
/lams_central/web/comments/new.jsp
- History
- Source
- Diff
/lams_central/web/comments/new.jsp
- -2
- +2
/lams_central/web/comments/reply.jsp
- History
- Source
- Diff
/lams_central/web/comments/reply.jsp
- -10
- +6
/lams_central/web/comments/topicview.jsp
- History
- Source
- Diff
/lams_central/web/comments/topicview.jsp
- -1
- +1
/lams_central/web/comments/topicviewwrapper.jsp
- History
- Source
- Diff
/lams_central/web/.../topicviewwrapper.jsp
- -9
- +5
/lams_central/web/includes/javascript/comments.js
- History
- Source
- Diff
/lams_central/web/.../javascript/comments.js
- -7
- +6
/lams_tool_nb/web/WEB-INF/tags/Comments.tag
- History
- Source
- Diff
/lams_tool_nb/web/.../tags/Comments.tag
- -0
- +1
/lams_tool_nb/web/template/learnerTemplate.jsp
- History
- Source
- Diff
/lams_tool_nb/web/.../learnerTemplate.jsp

5:01 am

erniegx <ernieg@gmail.com>

More
bb31283
changed 3 files

LDEV-3630, the LAMSLESSON_PARAM_COURSEID param should left lowerkey

- -0
- +10
/moodle/mod/lamslesson/db/access.php
- History
- Source
- Diff
/moodle/mod/lamslesson/db/access.php
- -1
- +1
/moodle/mod/lamslesson/lib.php
- History
- Source
- Diff
/moodle/mod/lamslesson/lib.php
- -1
- +1
/moodle/mod/lamslesson/version.php
- History
- Source
- Diff
/moodle/mod/lamslesson/version.php

5:01 am

erniegx <ernieg@gmail.com>

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

LDEV-3630, the LAMSLESSON_PARAM_COURSEID param should left lowerkey

- -0
- +10
/moodle/mod/lamslesson/db/access.php
- History
- Source
- Diff
/moodle/mod/lamslesson/db/access.php
- -1
- +1
/moodle/mod/lamslesson/lib.php
- History
- Source
- Diff
/moodle/mod/lamslesson/lib.php
- -1
- +1
/moodle/mod/lamslesson/version.php
- History
- Source
- Diff
/moodle/mod/lamslesson/version.php

9:49 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
2cf176a
changed 1 file

LDEV-3631: Removing unwanted change.

- -2
- +2
/lams_tool_nb/web/WEB-INF/urlrewrite.xml
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/urlrewrite.xml

9:48 pm

FionaMalikoff <Fiona.Malikoff@gmail.com>

More
1225dcc
deleted 4 files

LDEV-3631: Removing images as we went with font instead.

- binary
/lams_central/web/images/dislike.gif
- History
- Source
- Diff
/lams_central/web/images/dislike.gif
- binary
/lams_central/web/images/dislike_disabled.gif
- History
- Source
- Diff
/lams_central/web/.../dislike_disabled.gif
- binary
/lams_central/web/images/like.gif
- History
- Source
- Diff
/lams_central/web/images/like.gif
- binary
/lams_central/web/images/like_disabled.gif
- History
- Source
- Diff
/lams_central/web/.../like_disabled.gif

9:14 pm

Marcin Cieslak

More
b04831b
changed 18 files
v4.7, v4.8

LDEV-3315: Prevent XSS attach when recovering password. Do not give away information that an email is assigned to multiple users. Do not give away DB structure when an error occurs.

- -1
- +1
/lams_central/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_cs_CZ.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_cs_CZ.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_de_DE.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_de_DE.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_el_GR.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_el_GR.properties
- -2
- +1
/lams_central/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_en_AU.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_es_ES.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_es_ES.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_es_MX.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_es_MX.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_fr_FR.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_fr_FR.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_id_ID.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_id_ID.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_it_IT.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_it_IT.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_ja_JP.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_ja_JP.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_mi_NZ.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_mi_NZ.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_no_NO.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_no_NO.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_pt_BR.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_pt_BR.properties
- -1
- +0
/lams_central/conf/language/lams/ApplicationResources_tr_TR.properties
- History
- Source
- Diff
/lams_central/.../ApplicationResources_tr_TR.properties
… 3 more files in changeset.

9:06 pm

Marcin Cieslak

More
5f4bc2d
changed 18 files

LDEV-3315: Prevent XSS attach when recovering password. Do not give away information that an email is assigned to multiple users. Do not give away DB structure when an error occurs.