Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Merge remote-tracking branch 'origin/master' into lams31

Conflicts:

lams_admin/.classpath

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java

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

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

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

lams_central/src/java/org/lamsfoundation/lams/rest/RestServlet.java

lams_central/src/java/org/lamsfoundation/lams/rest/ToolRestManager.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

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

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_common/.classpath

lams_common/src/java/org/lamsfoundation/lams/integration/service/IntegrationService.java

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_gradebook/.classpath

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

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

lams_learning/.classpath

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

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/service/KumaliveService.java

lams_monitoring/.classpath

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

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

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

lams_tool_assessment/.classpath

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

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

lams_tool_bbb/.classpath

lams_tool_chat/.classpath

lams_tool_doku/.classpath

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_forum/.classpath

lams_tool_images/.classpath

lams_tool_kaltura/.classpath

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_lamc/.classpath

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

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_laqa/.classpath

lams_tool_larsrc/.classpath

lams_tool_leader/.classpath

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_nb/.classpath

lams_tool_notebook/.classpath

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

lams_tool_sbmt/.classpath

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

lams_tool_scratchie/.classpath

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_spreadsheet/.classpath

lams_tool_survey/.classpath

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

lams_tool_task/.classpath

lams_tool_vote/.classpath

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

lams_tool_wiki/.classpath

  1. … 103 more files in changeset.
LDEV-4660 Update LAMS code to support POI 3.17 and 4.0

POI libraries are kept at 3.17 version, until they fix the following

issue: java.lang.IllegalArgumentException: Property

'http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit' is not

recognized.

  1. … 13 more files in changeset.
LDEV-4440 Various fixes in admin

  1. … 4 more files in changeset.
LDEV-4440 added session scope at UserOrgRole, fixed paths - added lams url

  1. … 22 more files in changeset.
LDEV-4440 changed redirect into forward at return of methods

  1. … 1 more file in changeset.
LDEV-4654 userinfoUrl field is no longer required one

Also added * character after all required fields to make required fields

more obvious.

  1. … 1 more file in changeset.
LDEV-4440 added setters of userid and orgid

  1. … 1 more file in changeset.
LDEV-4440 fixed creating courses/subcourses, added annotation with session scope at userorgrole files

  1. … 1 more file in changeset.
LDEV-4440 Fixed import users, lti / server maintain, user create and edit

  1. … 7 more files in changeset.
LDEV-4440 changes at user controller - set orgid and userid

LDEV-4440 Admin migration - fixed tool content list, theme management, ldap, cleaned code at controllers

  1. … 21 more files in changeset.
LDEV-4440 Migration of admin - fixed import, ldap and toolcontentlist

  1. … 10 more files in changeset.
LDEV-4440 Admin - fixed sign up management, added errorMaps

  1. … 39 more files in changeset.
LDEV-4440 Migration of admin - fixed userChangePass and userRoles

  1. … 14 more files in changeset.
LDEV-4440 Migration of admin - no struts

  1. … 37 more files in changeset.
LDEV-4440 Migration of admin

  1. … 17 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 57 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 18 more files in changeset.
LDEV-4440 Migration of admin in progress

  1. … 41 more files in changeset.
LDEV-4440 Actions changed to controllers

  1. … 67 more files in changeset.
LDEV-4440 Started migration of admin - added spring-servlet, changed web.xml, new forms files

  1. … 96 more files in changeset.
LDEV-4644 Global outcomes management via sysadmin

  1. … 4 more files in changeset.
LDEV-4639 Use tour instead of tutorials video on first login

Tutorial videos have never been fully implemented. We get rid of them in

favour of tours.

  1. … 19 more files in changeset.
LDEV-4641 Allow STARTTLS and SSL when sending emails with SMTP

  1. … 5 more files in changeset.
LDEV-4627 Make sure country has an appropriate value

Monthly merge from master to lams31

Conflicts:

lams_build/3rdParty.userlibraries

lams_build/build.xml

lams_build/conf/j2ee/jboss-deployment-structure.xml

lams_build/lib/lams/lams.jar

lams_build/liblist.txt

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

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

  1. … 25 more files in changeset.
LDEV-4617 Add an option to enable email verification on sign up

  1. … 9 more files in changeset.
LDEV-4631 Set server timezone for users created via integrations/spreadsheet and signup pages

  1. … 5 more files in changeset.
Merge branch 'LDEF-4627'

LDEV-4628 Set default timezone when creating a user

* Also fix an issue with storing server'd timezone containing

"+", e.g. "ETC+4"

  1. … 1 more file in changeset.