[zanata-commits] [zanata/zanata] f02f1d: Use list of emails or admin users for 'contact adm...

[noreply at github.com]

  Branch: refs/heads/rhbz742083
  Home:   https://github.com/zanata/zanata

  Commit: f02f1d8e4ec4b49faa74412c9fba0644a83bc16b
      https://github.com/zanata/zanata/commit/f02f1d8e4ec4b49faa74412c9fba0644a83bc16b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailList.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  M server/zanata-war/src/main/webapp/help/contact_admin.xhtml
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/help/view.xhtml

  Log Message:
  -----------
  Use list of emails or admin users for 'contact admin' messages.


  Commit: 9cd1a54898286c11187b12443c012a532dca63db
      https://github.com/zanata/zanata/commit/9cd1a54898286c11187b12443c012a532dca63db
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  A server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailList.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  A server/zanata-war/src/main/webapp/help/contact_admin.xhtml
  A server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/help/view.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz742854' into rhbz742083

Conflicts:
	server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
	server/zanata-war/src/main/resources/messages.properties
            - removed jsf.AdminEmail, pretty sure jsf.config.AdminEmail is used everywhere instead


  Commit: cb6d124d69e303fd3efb4a7ea41f7fb132d26f0e
      https://github.com/zanata/zanata/commit/cb6d124d69e303fd3efb4a7ea41f7fb132d26f0e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  add pages layout file to ignore


Compare: https://github.com/zanata/zanata/compare/2ed83b2...cb6d124