Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Monthly merge from master to lams31

Multiple conflicts regarding audit service and JSON.

Conflicts:

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSearchAction.java

lams_build/conf/domain.xml

lams_build/conf/slim/standalone.xml

lams_build/conf/standalone.xml

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

lams_common/src/java/org/lamsfoundation/lams/integration/security/SsoHandler.java

lams_common/src/java/org/lamsfoundation/lams/rating/service/RatingService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveWebsocketServer.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/MonitoringAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaMonitoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/MonitoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/ILeaderselectionService.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/service/LeaderselectionService.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/MonitoringAction.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/service/PeerreviewServiceImpl.java

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/MonitoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java

  1. … 83 more files in changeset.
LKC-89 Move TBL Monitoring interface from lams-private

Add a switch that would display TBL UI monitoring interface. It

should be available only to the TBL template lessons.

Besides, modify the TBL UI monitor as in some cases the iRA (the first

assessment is not only just MCQ, but Assessment). So the change would be

to add as iRA the first assessment activity whether this is MCQ or

assessment.

  1. … 13 more files in changeset.
LDEV-4402 Get rid of LAMS customised session filter

This filter was implemented in 2005 and seems more like a workaround

than a feature we need. Especially that many of LAMS tools already use

the standard filter and they work OK.

  1. … 23 more files in changeset.
LDEV-4272: Do not allow in LAMS any HTTP methods other than GET or POST.

  1. … 34 more files in changeset.
LDEV-3674: Remove multiple Flash elements: Authoring, icons, themes, i18n files, WDDX libraries and classes, methods, servlets etc. Rename/rewrite methods for Flashless use.

  1. … 420 more files in changeset.
LDEV-3707: Use Flashless chosen branching interface in Monitor. Remove obsolete Flash classes and methods. Fix group renaming. General clean up.

  1. … 14 more files in changeset.
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.

  1. … 371 more files in changeset.
LDEV-3335, LDEV-3340: Remove a filter which sets inactive timeout in sessions. With new SSO it is just needed in Central and it is already taken care of by SessionListener.

  1. … 33 more files in changeset.
LDEV-3335, LDEV-3334: Add session and cookie configuration to jboss-all.xml. Remove obsolete configuration from web.xml files.

  1. … 35 more files in changeset.
LDEV-3335, LDEV-3334: Use SSO mechanism introduced in WildFly 9. Do not create web.xml files with XDoclet as it can not produce them based on 3.1 schema. Use static ones instead. Make SessionManager just a proxy to webserver's HTTP session. Remov custom shared sessions and JSESSIONIDSSO cookie as they are obsolete. Remove own session monitoring as the container should take care of invalidation. Move injecting UserDTO into session to SsoHandler intead of UniversalLoginModule as an authentication request may not reach the latter due to WildFly credentials caching.

  1. … 226 more files in changeset.
LDEV-2847: Major changes to build.xml files. See JIRA comment for full explanation.

  1. … 1313 more files in changeset.
WVI-19 Ability for Email Notifications to be scheduled

*merge from lams2_3_release

  1. … 24 more files in changeset.
Merge lams2_3 to head (continuing...)

  1. … 50 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

  1. … 167 more files in changeset.
LDEV-1912 set session timeout programmatically according to lams' UserInactiveTimeout value via a servlet listener rather than hard coding to 120 mins (in some webapps, no session timeout was specified at all).

  1. … 35 more files in changeset.
LDEV-1581: Added most of the logic for creating/managing learner's choice grouping.

  1. … 32 more files in changeset.
LDEV-1375: Implementing the class export portfolio page for sequence activities

  1. … 5 more files in changeset.
LDEV-1134: Branching: View screen for the class export portfolio

  1. … 11 more files in changeset.
Updating lams_monitoring_library.swf

Removed the dummy monitoring page.

  1. … 9 more files in changeset.
Finishing off I18N of monitoring

  1. … 4 more files in changeset.
Implementing gate and grouping screens for export portfolio.

  1. … 42 more files in changeset.
Temporary indexContent page that points to Flash movies, set up for individual courses/classes rather than the old old organisation model. Done to allow Flash work to be done, while the admin work is in progress.

  1. … 20 more files in changeset.
Tool deployment utility has been changed to update the context path and class path when the tool is deployed. Build file changed to match and the main tool context application file moved so that only the tool's have a context file classpath of /org/lamsfoundation/lams/tool.

  1. … 26 more files in changeset.
Renaming applicationResources.properties to ApplicationResources.properties

  1. … 31 more files in changeset.
Updated copyright statement - only support GPL v 2.0

  1. … 186 more files in changeset.
Fixed chat application context file reference

  1. … 5 more files in changeset.
Added new tools Chat and Shared Resources

  1. … 4 more files in changeset.
Converted to Servlet 2.4, JSTL 1.1

  1. … 43 more files in changeset.
Adding web access support for delete preview lessons

  1. … 7 more files in changeset.