Fisheye on lams/lams_learning/web/includes/javascript

lams (lams2_head_wildfly): LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

Marcin Cieslak — Wed, 24 May 2017 07:42:05 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20170524054205 on branch lams2_head_wildfly in lams

LDEV-4332: Send websocket ping after 3 minutes of idleness so the connection does not get cut because of idle timeout.

· /lams_admin/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-4, +28)

| History

| Source

| Diff

· /lams_gradebook/web/WEB-INF/tags/Page.tag

(-27, +51)

| History

| Source

| Diff

· /lams_learning/web/WEB-INF/tags/Page.tag

(-28, +51)

| History

| Source

| Diff

· /lams_learning/web/includes/javascript/presence.js

(-53, +87)

| History

| Source

| Diff

· /lams_monitoring/web/WEB-INF/tags/Page.tag

(-28, +51)

| History

| Source

| Diff

· /lams_tool_assessment/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

· /lams_tool_bbb/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

· /lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningWebsocketServer.java

(-1, +4)

| History

| Source

| Diff

· /lams_tool_chat/web/WEB-INF/tags/Page.tag

(-28, +51)

| History

| Source

| Diff

· /lams_tool_chat/web/includes/javascript/learning.js

(-9, +33)

| History

| Source

| Diff

· /lams_tool_daco/web/WEB-INF/tags/Page.tag

(-28, +51)

| History

| Source

| Diff

· /lams_tool_forum/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

· /lams_tool_gmap/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

· /lams_tool_images/web/WEB-INF/tags/Page.tag

(-5, +28)

| History

| Source

| Diff

… 25 more files in changeset.

lams (lams2_head_wildfly): LDEV-3724: Making the Presence / IM work with tools that use tabs in learning, such as DACO. For these tools, the bootst...

fionam — Tue, 08 Nov 2016 03:43:08 +0100

fionam committed lams2_head_wildfly:fionam:20161108024308 on branch lams2_head_wildfly in lams

LDEV-3724: Making the Presence / IM work with tools that use tabs in learning, such as DACO. For these tools, the bootstrap javascript needs to be reloaded after the jquery ui javascript or the tools tabs do not work. Also stopped onMessage being called before document.ready() had a chance to complete as this was sometimes stopping the past messages being displayed when a new tool activity was entered.

· /lams_learning/web/presenceChat.jsp	(-0, +6)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Page.tag	(-5, +7)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/presence.js	(-4, +5)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3653: Fix websocket name clash.

Marcin Cieslak — Mon, 07 Nov 2016 14:21:03 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161107132103 on branch lams2_head_wildfly in lams

LDEV-3653: Fix websocket name clash.

· /lams_learning/web/includes/javascript/presence.js	(-4, +4)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/includes/javascript/learning.js	(-6, +6)	\| History	\| Source	\| Diff
· /lams_tool_chat/web/pages/learning/learning.jsp	(-1, +1)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3724: Fix lesson chat javascript and CSS so it behaves and looks more bootstrap.

Marcin Cieslak — Sat, 05 Nov 2016 16:07:13 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20161105150713 on branch lams2_head_wildfly in lams

LDEV-3724: Fix lesson chat javascript and CSS so it behaves and looks more bootstrap.

· /lams_learning/web/lessonChat.jsp	(-58, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/presenceChat.jsp	(-2, +4)	\| History	\| Source	\| Diff
· /lams_learning/web/css/presence.css	(-11, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/presence.js	(-11, +7)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-4, +12)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-1, +3)	\| History	\| Source	\| Diff

lams (lams2_head_wildfly): LDEV-3914: Replacing learner control frames with a div based sliding bar.

fionam — Thu, 28 Jul 2016 05:44:11 +0200

fionam committed lams2_head_wildfly:fionam:20160728034411 on branch lams2_head_wildfly in lams

LDEV-3914: Replacing learner control frames with a div based sliding bar.

· /lams_admin/web/WEB-INF/tags/Page.tag

(-29, +271)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-13, +2)

| History

| Source

| Diff

· /lams_central/web/WEB-INF/tags/Page.tag

(-29, +271)

| History

| Source

| Diff

· /lams_central/web/comments/allview.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/comments/topicview.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_central/web/css/defaultHTML_learner.css

(-0, +134)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/openUrls.js

(-5, +5)

| History

| Source

| Diff

· /lams_central/web/includes/javascript/progressBar.js

(-46, +25)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-1, +15)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java

(-6, +14)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

(-2, +75)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java

(-2, +0)

| History

| Source

| Diff

· /lams_learning/web/lessonComplete.jsp

(-3, +4)

| History

| Source

| Diff

· /lams_learning/web/loadToolActivity.jsp

(-1, +4)

| History

| Source

| Diff

… 14 more files in changeset.

lams (lams2_head_wildfly): LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

Marcin Cieslak — Mon, 27 Jun 2016 12:01:24 +0200

Marcin Cieslak committed lams2_head_wildfly:marcin:20160627100124 on branch lams2_head_wildfly in lams

LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java

(-5, +7)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-3, +4)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml

(-2, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040064.sql

(binary)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-12, +28)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java

(-3, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

(-0, +2)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

(-6, +4)

| History

| Source

| Diff

… 8 more files in changeset.

lams (MAIN): LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

Marcin Cieslak — Mon, 27 Jun 2016 10:21:13 +0200

Marcin Cieslak committed MAIN:marcin:20160627082113 on branch MAIN in lams

LDEV-3839: Add "allow restart" an advanced option in lesson setup. Add restart button above learner progress bar.

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-1, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

(-2, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-8, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/LessonManagerSoapBindingImpl.java

(-2, +2)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java

(-6, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-4, +5)

| History

| Source

| Diff

· /lams_central/web/addLesson.jsp

(-1, +2)

| History

| Source

| Diff

· /lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/Lesson.hbm.xml

(-2, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch2040064.sql

(binary)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java

(-12, +30)

| History

| Source

| Diff

· /lams_learning/conf/language/lams/ApplicationResources.properties

(-0, +1)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerServiceProxy.java

(-3, +3)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

(-1, +3)

| History

| Source

| Diff

… 9 more files in changeset.

lams (lams2_head_wildfly): LDEV-3724: updating LAMS Learning to bootstrap

Ernie Ghiglione — Sun, 13 Mar 2016 00:48:18 +0100

Ernie Ghiglione committed lams2_head_wildfly:ernieg:20160312234818 on branch lams2_head_wildfly in lams

LDEV-3724: updating LAMS Learning to bootstrap

· /lams_learning/web/loadToolActivity.jsp	(-35, +53)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Alert.tag	(-0, +46)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tags/Page.tag	(-0, +36)	\| History	\| Source	\| Diff
· /lams_learning/web/WEB-INF/tlds/lams/lams.tld	(-0, +8)	\| History	\| Source	\| Diff
· /lams_learning/web/css/nprogress.css	(-0, +74)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/conditionGateContent.jsp	(-7, +10)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/gateNext.jsp	(-10, +15)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/permissionGateContent.jsp	(-8, +11)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/scheduleGateContent.jsp	(-65, +34)	\| History	\| Source	\| Diff
· /lams_learning/web/gate/synchGateContent.jsp	(-12, +20)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/choose.jsp	(-55, +47)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/show.jsp	(-65, +91)	\| History	\| Source	\| Diff
· /lams_learning/web/grouping/wait.jsp	(-33, +31)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/nprogress.js	(-0, +1)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/gateLayout.jsp	(-16, +19)	\| History	\| Source	\| Diff
· /lams_learning/web/layout/layout.jsp	(-0, +3)	\| History	\| Source	\| Diff

lams (MAIN): file nprogress.js was initially added on branch lams2_head_wildfly.

Ernie Ghiglione — Sun, 13 Mar 2016 00:48:18 +0100

Ernie Ghiglione committed MAIN:ernieg:20160312234818:3 on branch MAIN in lams

file nprogress.js was initially added on branch lams2_head_wildfly.

· /lams_learning/web/includes/javascript/nprogress.js

(-0, +0)

| History

| Source

lams (lams2_head_wildfly): LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels....

Marcin Cieslak — Wed, 24 Feb 2016 13:35:13 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20160224123513 on branch lams2_head_wildfly in lams

LDEV-3660: Remove export potfolio resources: Java classes, JPS, DB entries and labels.

Remove localLinkPath attribute from CSS tag as it was only used for export portfolio.

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

(-3, +1)

| History

| Source

| Diff

· /lams_admin/conf/xdoclet/struts-forms.xml

(-1, +0)

| History

| Source

| Diff

· /lams_admin/web/WEB-INF/tlds/lams/lams.tld

(-8, +0)

| History

| Source

| Diff

· /lams_admin/web/organisation/createOrEdit.jsp

(-10, +0)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-monitoring.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/language/lams/ApplicationResources.properties

(-3, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/EditOnFlyProcessor.java

(-2, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

(-28, +27)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java

(-3, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

(-60, +50)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-10, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java

(-32, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonJoinServlet.java

(-21, +18)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LessonManagerServlet.java

(-85, +85)

| History

| Source

| Diff

… 357 more files in changeset.

lams (lams2_head_wildfly): LDEV-3653 Add websocket server and client code....

Marcin Cieslak — Fri, 29 Jan 2016 09:41:37 +0100

Marcin Cieslak committed lams2_head_wildfly:marcin:20160129084137 on branch lams2_head_wildfly in lams

LDEV-3653 Add websocket server and client code.

Add Ant code for deploying the server class to /WEB-INF/classes folder for WildFly to pick it up on start up.

Rearange, clean up and formatting.

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java

(-52, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatAction.java

(-238, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

(-10, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/dao/IPresenceChatDAO.java

(-47, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/dao/hibernate/PresenceChatDAO.java

(-113, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatMessage.java

(-126, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/model/PresenceChatUser.java

(-82, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/service/IPresenceChatService.java

(-53, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/presence/service/PresenceChatService.java

(-102, +0)

| History

| Source

| Diff

· /lams_learning/.classpath

(-0, +1)

| History

| Source

| Diff

· /lams_learning/build.xml

(-0, +18)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-0, +25)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/PresenceWebsocketServer.java

(-0, +391)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/presence/dao/IPresenceChatDAO.java

(-0, +43)

| History

| Source

| Diff

… 9 more files in changeset.

lams (MAIN): LDEV-2990 Improved IM's UI:...

Andrey Balan — Fri, 31 Jan 2014 19:32:56 +0100

Andrey Balan committed MAIN:andreyb:20140131183256 on branch MAIN in lams

LDEV-2990 Improved IM's UI:

* IM tab is enlarged. Link for opening it now occupies entire available space

* changed cursor css style

· /lams_learning/web/presenceChat.jsp	(-2, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/css/presence.css	(-0, +12)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/presence.js	(-2, +0)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3105: Use local ID in HTML tags instead of user names, which can contain various characters.

Marcin Cieslak — Thu, 22 Aug 2013 12:28:07 +0200

Marcin Cieslak committed MAIN:marcin:20130822102807 on branch MAIN in lams

LDEV-3105: Use local ID in HTML tags instead of user names, which can contain various characters.

· /lams_learning/web/presenceChat.jsp	(-2, +2)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/presence.js	(-26, +25)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3063: Show number of active chat users in Monitor.

Marcin Cieslak — Fri, 05 Jul 2013 15:54:39 +0200

Marcin Cieslak committed MAIN:marcin:20130705135439 on branch MAIN in lams

LDEV-3063: Show number of active chat users in Monitor.

· /lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatAction.java	(-5, +9)	\| History	\| Source	\| Diff
· /lams_learning/web/presenceChat.jsp	(-26, +20)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/presence.js	(-7, +14)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-3021: Learners tab initial implementation....

Marcin Cieslak — Fri, 17 May 2013 11:36:08 +0200

Marcin Cieslak committed MAIN:marcin:20130517093608 on branch MAIN in lams

LDEV-3021: Learners tab initial implementation.

Move progress methods from Learner to Monitor modules.

Make Flashless Learner use common Raphael progress bar library.

· /lams_central/web/css/progressBar.css	(-0, +38)	\| History	\| Source
· /lams_central/web/includes/javascript/progressBar.js	(-0, +1022)	\| History	\| Source
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-121, +55)	\| History	\| Source	\| Diff
· /lams_learning/web/main.jsp	(-11, +20)	\| History	\| Source	\| Diff
· /lams_learning/web/css/main.css	(-36, +0)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/main.js	(-876, +1)	\| History	\| Source	\| Diff
· /lams_monitoring/conf/language/lams/ApplicationResources.properties	(-1, +10)	\| History	\| Source	\| Diff
· /lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java	(-1, +79)	\| History	\| Source	\| Diff
· /lams_monitoring/web/monitor.jsp	(-8, +29)	\| History	\| Source	\| Diff
· /lams_monitoring/web/css/monitorLesson.css	(-5, +17)	\| History	\| Source	\| Diff
· /lams_monitoring/web/includes/javascript/monitorLesson.js	(-19, +53)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2967: Add comments. Move global variables to top of file for easier customisation.

Marcin Cieslak — Tue, 11 Dec 2012 11:45:42 +0100

Marcin Cieslak committed MAIN:marcin:20121211104542 on branch MAIN in lams

LDEV-2967: Add comments. Move global variables to top of file for easier customisation.

· /lams_learning/web/includes/javascript/main.js

(-54, +126)

| History

| Source

| Diff

lams (MAIN): LDEV-2967: Add support for Branching. Fix minor bugs.

Marcin Cieslak — Wed, 05 Dec 2012 15:01:17 +0100

Marcin Cieslak committed MAIN:marcin:20121205140117 on branch MAIN in lams

LDEV-2967: Add support for Branching. Fix minor bugs.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java	(-9, +7)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java	(-3, +4)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/main.js	(-86, +231)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2967: Fix label positioning in Optional Activities.

Marcin Cieslak — Sat, 01 Dec 2012 14:00:00 +0100

Marcin Cieslak committed MAIN:marcin:20121201130000 on branch MAIN in lams

LDEV-2967: Fix label positioning in Optional Activities.

· /lams_learning/web/includes/javascript/main.js

(-8, +7)

| History

| Source

| Diff

lams (MAIN): LDEV-2967: Add support for Gates and Optional Activities and Sequences.

Marcin Cieslak — Thu, 29 Nov 2012 16:23:33 +0100

Marcin Cieslak committed MAIN:marcin:20121129152333 on branch MAIN in lams

LDEV-2967: Add support for Gates and Optional Activities and Sequences.

· /lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressBuilder.java	(-4, +2)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-7, +28)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/bean/ActivityURL.java	(-97, +114)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java	(-1, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/css/main.css	(-1, +25)	\| History	\| Source	\| Diff
· /lams_learning/web/includes/javascript/main.js	(-139, +512)	\| History	\| Source	\| Diff

lams (MAIN): LDEV-2967: Add Learner screen with SVG/VML.

Marcin Cieslak — Tue, 20 Nov 2012 15:47:03 +0100

Marcin Cieslak committed MAIN:marcin:20121120144703 on branch MAIN in lams

LDEV-2967: Add Learner screen with SVG/VML.

· /lams_learning/conf/language/lams/ApplicationResources.properties	(-2, +11)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java	(-1, +42)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java	(-3, +3)	\| History	\| Source	\| Diff
· /lams_learning/web/main.jsp	(-0, +176)	\| History	\| Source	\| Diff
· /lams_learning/web/css/main.css	(-0, +153)	\| History	\| Source
· /lams_learning/web/includes/javascript/main.js	(-0, +345)	\| History	\| Source

lams (MAIN): LDEV-2949: Reimplement Presence Chat in Learner using Ajax instead of Jabber. Remove Jabber libraries and support code. ...

Marcin Cieslak — Tue, 30 Oct 2012 18:46:44 +0100

Marcin Cieslak committed MAIN:marcin:20121030174644 on branch MAIN in lams

LDEV-2949: Reimplement Presence Chat in Learner using Ajax instead of Jabber. Remove Jabber libraries and support code. Minor fix in Chat Tool.

· /lams_build/3rdParty.userlibraries

(-3, +0)

| History

| Source

| Diff

· /lams_build/build.xml

(-3, +0)

| History

| Source

| Diff

· /lams_build/liblist.txt

(-3, +1)

| History

| Source

| Diff

· /lams_build/lib/jabber/JabberHTTPBind-1.1.1.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-central.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams-learning.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/lams/lams.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/smack/smack.jar

(binary)

| History

| Source

| Diff

· /lams_build/lib/smack/smackx.jar

(binary)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/servlet-mappings.xml

(-5, +0)

| History

| Source

| Diff

· /lams_central/conf/xdoclet/servlets.xml

(-5, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-3, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PresenceServlet.java

(-96, +14)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/PaintAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/PresenceChatAction.java

(-0, +234)

| History

| Source

… 75 more files in changeset.