Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-4440 Add missing create date to user edit form in sysadmin

  1. … 1 more file in changeset.
Merge branch 'LDEV-4962' into v4.0

LDEV-4932 No need to protect /admin/user/remove.do, as it simply shows another jsp page

  1. … 3 more files in changeset.
LDEV-4965 Avoid reseting lessonFinishUrl on saving ltiConsumer

  1. … 1 more file in changeset.
LDEV-4962 Introduce complex portrait UUIDs

  1. … 33 more files in changeset.
LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

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

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

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

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

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

  1. … 94 more files in changeset.
Merge branch 'LDEV-4745' into v4.0

# Conflicts:

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

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

# lams_central/conf/language/lams/ApplicationResources_en_AU.properties

# lams_central/web/includes/javascript/authoring/authoringGeneral.js

# lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationKeys.java

# lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

# lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml

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

# lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

  1. … 19 more files in changeset.
LDEV-4932 Adding CSRF to Admin

Adding it to:

- User roles

- Create course

- Clone lessons

- assign roles in courses

- global roles

- change password for course

- change user pass

- delete all lessons

  1. … 20 more files in changeset.
LDEV-4932 Adding CSRF protection to admin

- Adding user add/edit/remove/disable

  1. … 5 more files in changeset.
LDEV-4932 Adding CSRF admin

Adding CSRF to delete session management

  1. … 2 more files in changeset.
LDEV-4932 Adding CSRF to admin

Adding CSRF token:

- When adding/editing learning outcomes

- Adding/editing and removing themes

  1. … 4 more files in changeset.
LDEV-4932 Adding CSRF Admin

Fixing policy management toggle. Adding enable/disable toggle for tool management

  1. … 3 more files in changeset.
LDEV-4931 Adding CSRF protection for LAMS Admin

Adding:

- Edit configuration

- Editing timezones

- Add/disable/enable/delete signup pages

- Add/disable/enable/delete integrated server

- Add/activate/deactivate policies

  1. … 14 more files in changeset.
LDEV-4907 Password changes corrected in audit

  1. … 1 more file in changeset.
Merge branch 'SP-3'

  1. … 6 more files in changeset.
LDEV-4440 Use redirects rather than forwards so links do not get broken

LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

  1. … 2 more files in changeset.
LDEV-4876 Change isUseAlternativeUseridParameterName() to getUseAlternativeUseridParameterName()

  1. … 2 more files in changeset.
LDEV-4876 Ability for LTI servers to get userId using alternative request parameter name

  1. … 5 more files in changeset.
LDEV-4869 Add default lesson settings for LTI tool consumers

* Also move all integrations jsps to /integration/ folder

  1. … 9 more files in changeset.
LDEV-4869 Aggregate ServerListController, ServerMaintainController and ServerSaveController into a single ExtServerManagementController

LDEV-4869 Create common form for ExtServerForm and LtiConsumerForm

LKC-214 In sysadmin add entry point for blueprint management page

  1. … 3 more files in changeset.
SP-3 Automatically redirect to logout URL configured in sysadmin

  1. … 7 more files in changeset.
LDEV-4778 Log sysadmin configuration change

  1. … 3 more files in changeset.
LDEV-4767 Move logout logging to higher level methods

This way we know what triggered logout: manual logout, sysadmin or

duplicate session in another browser.

Timeout logout will be silent.

  1. … 3 more files in changeset.
LDEV-4747 Fix cancel button, which used to save instead of cancel

  1. … 3 more files in changeset.
LDEV-4678 Remove all ServiceProxy classes

Also get rid of LearningWebUtil.putActivityPositionInRequest(Long

activityId, HttpServletRequest request, ServletContext context) and

LearningWebUtil.getActivityMapping(ServletContext context) methods. As

it's better to invoke according service methods directly.

  1. … 51 more files in changeset.
LDEV-4732 User Role screen error handling for no roles reinstated