• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Fixed up lookup of existing group to branch mappings based on UIID and ID. Now uses a combination of both that should cover all cases.

minor group and branch mapping changes

minor group and branch mapping changes

  1. … 4 more files in changeset.
Fixed up lookup of existing Groups based on UIID and ID. Now uses a combination of both that should cover all cases.

improved DDM for opening design with grouping (groups) and branch mappings

  1. … 2 more files in changeset.
group matching dialog + saving matches + group handling

  1. … 9 more files in changeset.
Handles group records that may or may not have an order id.

group naming dialog + saving groups

  1. … 6 more files in changeset.
add results text when federation server list is updated

  1. … 2 more files in changeset.
Branching: basic group naming and branch -> group mapping screens. They don't save data to the server yet.

LDEV-1134: Preview now lets the author select a branch to view, but the author can only do one branch. To view all branches, the author needs to run preview multiple times. Did some small refactoring to have only one piece of code that creates the branching mapping related to a group as we have many bits that need to do this (authoring, import, chosen branching in monitoring and now preview!)

  1. … 3 more files in changeset.
added shib servlets to web-security so that ShibLogin is invoked (and shib user created if necessary) before shib servlets have to add shib user to lesson class; refactored ShibExportPortfolioServlet to extend ShibLearnerServlet; moved xdoclet out of .java files because it doesn't work properly with a servlet extending another servlet

    • -0
    • +15
    ./conf/xdoclet/servlet-mappings.xml
add check for 'failed' parameter in request so that ShibLogin doesn't keep getting called when j_security_check login fails

fix logger class name

fix error text

add email to shib user

removing shib servlets from /servlet/* mapping; fix url for openFedExportPortfolio

file ShibExportPortfolioServlet.java was initially added on branch shibboleth_2_0.

file ShibMonitorServlet.java was initially added on branch shibboleth_2_0.

    • -0
    • +0
    ./src/java/org/lamsfoundation/lams/web/ShibMonitorServlet.java
adding shibbolized links for monitoring and export portfolio

    • -1
    • +54
    ./web/includes/javascript/openUrls.js
remember to stop processing after sending a redirect! also check if user is a local user before updating roles from shib attributes.

using hibernateFilter with ShibLoginServlet

various bugfixes

added new shib attribute for the ServerURL of the origin LAMS server to help determine whether user is local or not; added roles for shib users in ShibLoginServlet

  1. … 4 more files in changeset.
use PI to set grouping for Branching Activity (group type)

  1. … 1 more file in changeset.
fix for toolbar enabling/disabling (alert)

  1. … 2 more files in changeset.
added stopAfterActivity (Activity) field

  1. … 4 more files in changeset.
LDEV-1134: Branching: Added stopAfterActivity flag to activity, which will allow us to "end" a lesson at the end of the activity. Authoring changes done.

  1. … 9 more files in changeset.
made alert modal (disabled toolbar buttons) + apply style setting (rgb offset) through ThemeManager

  1. … 10 more files in changeset.
Replaced <bean:message> with <fmt:message> tags

  1. … 15 more files in changeset.