Branch: refs/heads/master Home: https://github.com/gatein/gatein-portal Commit: b93c8d1da2e1e2424ec31bc8468aded1c961069b https://github.com/gatein/gatein-portal/commit/b93c8d1da2e1e2424ec31bc846... Author: phuong_vu <phuong.vu(a)exoplatform.com&gt; Date: 2013-11-21 (Thu, 21 Nov 2013) Changed paths: M component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java M component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java M component/portal/src/main/java/org/gatein/portal/installer/PortalSetupServlet.java M component/portal/src/main/java/org/gatein/portal/installer/SetupOrganizationDatabaseInitializer.java M component/web/oauth-common/src/main/java/org/gatein/security/oauth/data/SocialNetworkServiceImpl.java M component/web/resources/src/test/resources/Stylesheet.css M component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java A component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java M component/web/security/src/main/java/org/exoplatform/web/login/LoginServlet.java M mobile-integration/extension-login-war/src/main/webapp/login/jsp/login.jsp M packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl M packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf M packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindUsersPageList.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java M portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties M web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/Stylesheet.css A web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/NavigationIcons/CheckDisable.png M web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css M web/portal/src/main/resources/locale/portal/webui_en.properties M web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml M web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl M web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl A web/portal/src/main/webapp/login/jsp/disabled.jsp M web/portal/src/main/webapp/login/jsp/login.jsp M webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountForm.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java M webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterForm.java M webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterInputSet.java Log Message: ----------- GTNPORTAL-3227 Disabled User feature Commit: d139e70c8b7519846b8d15751c8468727a467fc3 https://github.com/gatein/gatein-portal/commit/d139e70c8b7519846b8d15751c... Author: Tran The Trong <trongtt(a)gmail.com&gt; Date: 2013-11-21 (Thu, 21 Nov 2013) Changed paths: A component/identity/DisableUserMigration_Manual.md A component/identity/src/main/java/org/exoplatform/services/organization/idm/DisabledUserMigrationScript.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java A component/identity/src/main/resources/configuration.properties A component/identity/src/main/resources/hibernate.cfg.xml A component/identity/src/main/resources/log4j.properties A component/identity/src/main/resources/picketlink-idm-config.xml Log Message: ----------- Migration scripts for Disabled User feature Commit: a26432097a5af802f18a61ece2ec87c4b6600eac https://github.com/gatein/gatein-portal/commit/a26432097a5af802f18a61ece2... Author: Tran The Trong <trongtt(a)gmail.com&gt; Date: 2013-11-21 (Thu, 21 Nov 2013) Changed paths: A component/identity/DisableUserMigration_Manual.md M component/identity/src/main/java/org/exoplatform/services/organization/idm/Config.java A component/identity/src/main/java/org/exoplatform/services/organization/idm/DisabledUserMigrationScript.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/IDMUserListAccess.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/IntegrationCache.java M component/identity/src/main/java/org/exoplatform/services/organization/idm/UserDAOImpl.java A component/identity/src/main/resources/configuration.properties A component/identity/src/main/resources/hibernate.cfg.xml A component/identity/src/main/resources/log4j.properties A component/identity/src/main/resources/picketlink-idm-config.xml M component/identity/src/test/java/org/exoplatform/services/organization/TestOrganization.java M component/portal/src/main/java/org/gatein/portal/installer/PortalSetupServlet.java M component/portal/src/main/java/org/gatein/portal/installer/SetupOrganizationDatabaseInitializer.java M component/web/oauth-common/src/main/java/org/gatein/security/oauth/data/SocialNetworkServiceImpl.java M component/web/resources/src/test/resources/Stylesheet.css M component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java A component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java M component/web/security/src/main/java/org/exoplatform/web/login/LoginServlet.java M mobile-integration/extension-login-war/src/main/webapp/login/jsp/login.jsp M packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl M packaging/jetty/pkg/src/main/resources/jetty/etc/login.conf M packaging/tomcat/pkg/src/main/resources/tomcat/conf/jaas.conf M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindUsersPageList.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIAccountEditInputSet.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java M portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIUserInfo.java M portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties M web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/Stylesheet.css A web/eXoResources/src/main/webapp/skin/DefaultSkin/skinIcons/16x16/icons/NavigationIcons/CheckDisable.png M web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css M web/portal/src/main/resources/locale/portal/webui_en.properties M web/portal/src/main/webapp/WEB-INF/conf/organization/idm-configuration.xml M web/portal/src/main/webapp/groovy/webui/core/UIGrid.gtmpl M web/portal/src/main/webapp/groovy/webui/organization/account/UIUserSelector.gtmpl A web/portal/src/main/webapp/login/jsp/disabled.jsp M web/portal/src/main/webapp/login/jsp/login.jsp M webui/core/src/main/java/org/exoplatform/webui/form/input/UICheckBoxInput.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountForm.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/UIAccountInputSet.java M webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java M webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterForm.java M webui/portal/src/main/java/org/exoplatform/portal/webui/register/UIRegisterInputSet.java Log Message: ----------- Merge branch 'GTNPORTAL-3227-disabled-user' Compare: https://github.com/gatein/gatein-portal/compare/e127e5fa4ccd...a26432097a5a