[Yanel-commits] [wyona/yanel] a185c4: attribute added to indicate whether pre-authentica...

[Michael Wechner]

  Branch: refs/heads/master
  Home:   https://github.com/wyona/yanel
  Commit: a185c451ccdc55b0f5750f3ed9bb96997f410fc8
      https://github.com/wyona/yanel/commit/a185c451ccdc55b0f5750f3ed9bb96997f410fc8
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2016-01-04 (Mon, 04 Jan 2016)

  Changed paths:
    M src/resources/login/src/java/org/wyona/yanel/impl/resources/login/LoginResource.java

  Log Message:
  -----------
  attribute added to indicate whether pre-authenticated user already exists inside realm


  Commit: be81d2165bca26619bc63194f64742c5dca67ae8
      https://github.com/wyona/yanel/commit/be81d2165bca26619bc63194f64742c5dca67ae8
  Author: Michael Wechner <michael.wechner at wyona.com>
  Date:   2016-01-04 (Mon, 04 Jan 2016)

  Changed paths:
    M .wyona-continuous/meta/src/resources/directory/src/java/org/wyona/yanel/impl/resources/collection/CollectionResource.java_cd.xml
    M conf/yanel.xml
    M src/core/java/org/wyona/yanel/core/ResourceConfiguration.java
    M src/core/java/org/wyona/yanel/core/Yanel.java
    M src/core/java/org/wyona/yanel/core/workflow/WorkflowHelper.java
    M src/impl/java/org/wyona/yanel/impl/resources/BasicXMLResource.java
    M src/resources/cas/src/java/org/wyona/yanel/impl/resources/cas/CASProxyCallbackResource.java
    M src/resources/contact-form/src/java/org/wyona/yanel/impl/resources/contactform/ContactResourceV2.java
    M src/resources/data-repo-sitetree/src/java/org/wyona/yanel/impl/resources/navigation/DataRepoSitetreeResource.java
    M src/resources/directory/conf/directory_de.properties
    M src/resources/directory/conf/directory_en.properties
    M src/resources/directory/src/java/org/wyona/yanel/impl/resources/collection/CollectionResource.java
    M src/resources/login/resource.xml
    M src/resources/login/src/java/org/wyona/yanel/impl/resources/login/LoginResource.java
    M src/resources/redirect/resource-v1.0.1.xml
    M src/resources/redirect/src/java/org/wyona/yanel/impl/resources/redirect/RedirectResourceV101.java
    M src/resources/registration/resource.xml
    M src/resources/registration/src/java/org/wyona/yanel/resources/registration/UserRegistrationBean.java
    M src/resources/registration/src/java/org/wyona/yanel/resources/registration/UserRegistrationResource.java
    M src/resources/workflow-dashboard/src/java/org/wyona/yanel/impl/resources/dashboard/WorkflowDashboardResource.java
    M src/resources/yanel-user/src/java/org/wyona/yanel/impl/resources/yaneluser/EditYanelUserProfileResource.java
    M src/webapp/src/java/org/wyona/yanel/servlet/YanelServlet.java
    M src/webapp/src/java/org/wyona/yanel/servlet/security/impl/CASWebAuthenticatorImpl.java

  Log Message:
  -----------
  Merge branch 'master' into pre-authentication

Conflicts:
	src/resources/login/src/java/org/wyona/yanel/impl/resources/login/LoginResource.java


Compare: https://github.com/wyona/yanel/compare/341bd5156dbc...be81d2165bca