Branch: refs/heads/master
Home:
https://github.com/gatein/gatein-portal
Commit: 722675f80757caa688d6394e50797b55b2815155
https://github.com/gatein/gatein-portal/commit/722675f80757caa688d6394e50...
Author: Julien Viet <julien(a)julienviet.com>
Date: 2014-01-31 (Fri, 31 Jan 2014)
Changed paths:
M component/common/pom.xml
M component/common/src/main/java/conf/configuration-jboss.properties
M component/common/src/main/java/conf/configuration-jetty.properties
M component/common/src/main/java/conf/configuration-tomcat.properties
M
component/common/src/main/java/org/exoplatform/commons/cache/SimpleExoCacheCreator.java
M component/identity/pom.xml
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/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
M
component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml
M component/identity/src/test/resources/conf/standalone/test-configuration.xml
M
component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml
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/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml
A
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-infinispan-config.xml
A
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-infinispan-lock.xml
R
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
R
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
M
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
M component/test/web/src/main/java/org/exoplatform/component/test/web/WebAppImpl.java
M
component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java
M
component/web/oauth-common/src/main/java/org/gatein/security/oauth/data/SocialNetworkServiceImpl.java
M
component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
M
component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java
M packaging/jboss-as7/modules/build.xml
M packaging/jboss-as7/modules/pom.xml
M packaging/jetty/pkg/pom.xml
M packaging/tomcat/pkg/pom.xml
M packaging/tomcat/tomcat7/pom.xml
M pom.xml
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/UIGroupEditMembershipForm.java
M
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupMembershipForm.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 web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
A web/portal/src/main/webapp/WEB-INF/conf/infinispan/cluster/config.xml
A web/portal/src/main/webapp/WEB-INF/conf/infinispan/local/config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config.xml
A
web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config_portal-system.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/indexer-config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/lock-config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/config.xml
A
web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/config_portal-system.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/lock-config.xml
M web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
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/application/PortalLogoutLifecycle.java
M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
M
webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.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-3390 : Migration to JCR 1.16.0-Alpha4
Commit: 1de3be4407b9825b19e8800e01951b5217e2af59
https://github.com/gatein/gatein-portal/commit/1de3be4407b9825b19e8800e01...
Author: Marko Strukelj <marko.strukelj(a)gmail.com>
Date: 2014-02-04 (Tue, 04 Feb 2014)
Changed paths:
M packaging/jboss-as7/modules/build.xml
M packaging/jboss-as7/modules/pom.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/apache/lucene/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/portal/container-dependencies/main/module.xml
A
packaging/jboss-as7/modules/src/main/resources/modules/org/infinispan/cachestore/jdbc/gatein/module.xml
A
packaging/jboss-as7/modules/src/main/resources/modules/org/infinispan/gatein/module.xml
R
packaging/jboss-as7/modules/src/main/resources/modules/org/jboss/cache/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/picketlink/idm/main/module.xml
M
packaging/jboss-as7/pkg/src/main/resources/jboss/main/standalone/configuration/gatein/configuration.properties
M packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl
M web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
M
wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
Log Message:
-----------
GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4
- AS 7.1.1 support
Commit: 1464d4dd30c76777b2b111c09dc1b5c0d51c1d12
https://github.com/gatein/gatein-portal/commit/1464d4dd30c76777b2b111c09d...
Author: Julien Viet <julien(a)julienviet.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
Changed paths:
M
component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
M
component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java
Log Message:
-----------
Fix issue with usage of UserStatus.DISABLED instead of UserStatus.BOTH
Commit: 4587b102ce30b0abfe96e1f09fb9a9d1033b1af4
https://github.com/gatein/gatein-portal/commit/4587b102ce30b0abfe96e1f09f...
Author: Julien Viet <julien(a)julienviet.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
Changed paths:
M
examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
M
examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
R web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml
R
web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
R
web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
Log Message:
-----------
- update sample portal and sample ext configuration for infinispan
- remove obsolete jboss cache configuration
Commit: f4542dda3a8e02847ced97a3ffc4de6c7bf611cc
https://github.com/gatein/gatein-portal/commit/f4542dda3a8e02847ced97a3ff...
Author: Marko Strukelj <marko.strukelj(a)gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
Changed paths:
M packaging/jboss-as7/modules/build.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/portal/container-dependencies/main/module.xml
R
packaging/jboss-as7/modules/src/main/resources/modules/org/infinispan/cachestore/jdbc/gatein/module.xml
R
packaging/jboss-as7/modules/src/main/resources/modules/org/infinispan/gatein/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/picketlink/idm/main/module.xml
Log Message:
-----------
GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4
- EAP 6.2 support
Commit: 5fd896553300ec62eb8bdfc2c206872a0fe8aa90
https://github.com/gatein/gatein-portal/commit/5fd896553300ec62eb8bdfc2c2...
Author: Marko Strukelj <marko.strukelj(a)gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
Changed paths:
M
packaging/jboss-as7/modules/src/main/resources/modules/org/jgroups/gatein/module.xml
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/demo-domain-setup.sh
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/portal-setup.bat
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/portal-setup.sh
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/domain/configuration/domain.xml
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/domain/configuration/host.xml
M web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp-ispn.xml
M web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml
Log Message:
-----------
GTNPORTAL-3390 : Migration to JCR 1.16.0-Alpha4
- EAP 6.2 multinode setup and jgroups dependencies and config fixes
Commit: d7a3f2515d8448b314ac0c9e6789a50968a56b54
https://github.com/gatein/gatein-portal/commit/d7a3f2515d8448b314ac0c9e67...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
Changed paths:
M component/common/pom.xml
M component/common/src/main/java/conf/configuration-jboss.properties
M component/common/src/main/java/conf/configuration-jetty.properties
M component/common/src/main/java/conf/configuration-tomcat.properties
M
component/common/src/main/java/org/exoplatform/commons/cache/SimpleExoCacheCreator.java
M component/identity/pom.xml
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/main/java/org/exoplatform/services/organization/idm/UserProfileDAOImpl.java
M
component/identity/src/test/resources/conf/exo.portal.component.identity-configuration.xml
M component/identity/src/test/resources/conf/standalone/test-configuration.xml
M
component/identity/src/test/resources/org/exoplatform/services/organization/TestOrganizationService-configuration.xml
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/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-configuration.xml
A
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-infinispan-config.xml
A
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-infinispan-lock.xml
R
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-config.xml
R
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-jbosscache-lock-config.xml
M
component/test/jcr/src/main/resources/conf/exo.portal.component.test.jcr-repository-configuration.xml
M component/test/web/src/main/java/org/exoplatform/component/test/web/WebAppImpl.java
M
component/web/controller/src/main/java/org/exoplatform/web/controller/QualifiedName.java
M
component/web/oauth-common/src/main/java/org/gatein/security/oauth/data/SocialNetworkServiceImpl.java
M
component/web/security/src/main/java/org/exoplatform/web/CacheUserProfileFilter.java
M
component/web/security/src/main/java/org/exoplatform/web/login/FilterDisabledLoginModule.java
M
examples/extension/war/src/main/webapp/WEB-INF/conf/sample-ext/jcr/repository-configuration.xml
M
examples/portal/war/src/main/webapp/WEB-INF/conf/sample-portal/jcr/repository-configuration.xml
M packaging/jboss-as7/modules/build.xml
M packaging/jboss-as7/modules/pom.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/apache/lucene/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/lib/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/gatein/portal/container-dependencies/main/module.xml
R
packaging/jboss-as7/modules/src/main/resources/modules/org/jboss/cache/main/module.xml
M
packaging/jboss-as7/modules/src/main/resources/modules/org/jgroups/gatein/module.xml
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/demo-domain-setup.sh
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/portal-setup.bat
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/bin/portal-setup.sh
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/domain/configuration/domain.xml
A
packaging/jboss-as7/pkg/src/main/resources/7.3.0.Final-redhat-14/main/domain/configuration/host.xml
M
packaging/jboss-as7/pkg/src/main/resources/jboss/main/standalone/configuration/gatein/configuration.properties
M packaging/jboss-as7/pkg/src/main/xslt/standalone.xsl
M packaging/jetty/pkg/pom.xml
M packaging/tomcat/pkg/pom.xml
M packaging/tomcat/tomcat7/pom.xml
M pom.xml
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/UIGroupEditMembershipForm.java
M
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGroupMembershipForm.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 web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp-ispn.xml
M web/portal/src/main/webapp/WEB-INF/classes/jgroups/gatein-udp.xml
M web/portal/src/main/webapp/WEB-INF/conf/common/common-configuration.xml
A web/portal/src/main/webapp/WEB-INF/conf/infinispan/cluster/config.xml
A web/portal/src/main/webapp/WEB-INF/conf/infinispan/local/config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jbosscache/cluster/config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jbosscache/local/config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config.xml
A
web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/config_portal-system.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/indexer-config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/cluster/lock-config.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/config.xml
A
web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/config_portal-system.xml
A web/portal/src/main/webapp/WEB-INF/conf/jcr/infinispan/local/lock-config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config.xml
R
web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/config_portal-system.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/indexer-config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/cluster/lock-config.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config.xml
R
web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/config_portal-system.xml
R web/portal/src/main/webapp/WEB-INF/conf/jcr/jbosscache/local/lock-config.xml
M web/portal/src/main/webapp/WEB-INF/conf/jcr/jcr-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/jcr/repository-configuration.xml
M web/portal/src/main/webapp/WEB-INF/conf/portal/portal-configuration.xml
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/application/PortalLogoutLifecycle.java
M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIForgetPassword.java
M webui/portal/src/main/java/org/exoplatform/portal/webui/login/UIResetPassword.java
M
webui/portal/src/main/java/org/exoplatform/portal/webui/portal/UIPortalComponentActionListener.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
M
wsrp-integration/extension-war/src/main/webapp/WEB-INF/conf/wsrp/repository-configuration.xml
Log Message:
-----------
Merge branch 'GTNPORTAL-3390'
Commit: 6144c8c8ed3680d71ecad0d6c6e108dcb1d71fb7
https://github.com/gatein/gatein-portal/commit/6144c8c8ed3680d71ecad0d6c6...
Author: nttuyen <tuyennt(a)exoplatform.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
Changed paths:
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
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindUsersPageList.java
A
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGridUsers.java
M
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
M
portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties
A
portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGridUsers.gtmpl
M
web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css
M web/portal/src/main/resources/locale/portal/expression_en.properties
M
webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
M
webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java
Log Message:
-----------
GTNPORTAL-3353 User query improvement based on Enabled/Disabled status
GTNPORTAL-3345 Improve User Management in Organization Application
Commit: 34846f796a96182555d2b922017799f478de2adf
https://github.com/gatein/gatein-portal/commit/34846f796a96182555d2b92201...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
Changed paths:
M
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
Log Message:
-----------
GTNPORTAL-3372 Sometimes I am seeing 'disabled' user even if 'Show
disabled' is unchecked
Commit: d87b94b963b3374c0e615897ab5eeb12063d127c
https://github.com/gatein/gatein-portal/commit/d87b94b963b3374c0e615897ab...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
Changed paths:
M component/identity/DisableUserMigration_Manual.md
Log Message:
-----------
Improve a bit migration script manual
Commit: a213ba2fbed975a9771df955bd3d875c1171d709
https://github.com/gatein/gatein-portal/commit/a213ba2fbed975a9771df955bd...
Author: phuong_vu <phuong.vu(a)exoplatform.com>
Date: 2014-02-10 (Mon, 10 Feb 2014)
Changed paths:
M component/identity/DisableUserMigration_Manual.md
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
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/FindUsersPageList.java
A
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIGridUsers.java
M
portlet/exoadmin/src/main/java/org/exoplatform/organization/webui/component/UIListUsers.java
M
portlet/exoadmin/src/main/resources/locale/portlet/exoadmin/OrganizationPortlet_en.properties
A
portlet/exoadmin/src/main/webapp/groovy/organization/webui/component/UIGridUsers.gtmpl
M
web/eXoResources/src/main/webapp/skin/DefaultSkin/webui/component/UISearch/Stylesheet.css
M web/portal/src/main/resources/locale/portal/expression_en.properties
M
webui/eXo/src/main/java/org/exoplatform/webui/organization/account/UIUserSelector.java
M
webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java
Log Message:
-----------
Merge branch 'disabled-user-update'
Compare:
https://github.com/gatein/gatein-portal/compare/a4d70d9f4be4...a213ba2fbed9