[zanata/zanata-server] 085c03: feat(user email): admin can configure to display u...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 085c038514967b4e3ff594b4c947b1551fc0f0c3
      https://github.com/zanata/zanata-server/commit/085c038514967b4e3ff594b4c947b1551fc0f0c3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-29 (Fri, 29 Jan 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/lib/components/UserProfile.jsx
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionServiceUnitTest.java

  Log Message:
  -----------
  feat(user email): admin can configure to display user email

https://zanata.atlassian.net/browse/ZNTA-879


  Commit: a1126df42caebaab174c30db1d732b053c762a58
      https://github.com/zanata/zanata-server/commit/a1126df42caebaab174c30db1d732b053c762a58
  Author: Alex Eng <aeng at redhat.com>
  Date:   2016-01-29 (Fri, 29 Jan 2016)

  Changed paths:
    M docs/release-notes.md
    M frontend/src/main/web/lib/components/UserProfile.jsx
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectVersionServiceUnitTest.java

  Log Message:
  -----------
  Merge pull request #1082 from zanata/ZNTA-879-user-email

feat(user email): admin can configure to display user email


Compare: https://github.com/zanata/zanata-server/compare/79ed341f2c61...a1126df42cae