[zanata-commits] [zanata/zanata] 614ac0: Change toggleCoordinator method name per code revi...

[noreply at github.com]

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

  Commit: 614ac0e17fa6297f6274db026152b39ed43274d4
      https://github.com/zanata/zanata/commit/614ac0e17fa6297f6274db026152b39ed43274d4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Change toggleCoordinator method name per code review


  Commit: 8eaf36ec50b277f1c30d6ef116ff2c753d7257d9
      https://github.com/zanata/zanata/commit/8eaf36ec50b277f1c30d6ef116ff2c753d7257d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M .gitignore
  M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  A server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.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
  A server/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
  M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/db.changelog.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
  A server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  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
  A server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  A server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css

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


  Commit: 73f129b89860e54c243a9913e865141e02144b4f
      https://github.com/zanata/zanata/commit/73f129b89860e54c243a9913e865141e02144b4f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Add missing class to persistence.xml for the benefit of Seam tests


  Commit: 38581b9bc8865098edbac72827fb9ed39a1f5110
      https://github.com/zanata/zanata/commit/38581b9bc8865098edbac72827fb9ed39a1f5110
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml

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


  Commit: 3c8bacf05c9313e0671453a1b2c514dd0ec5babc
      https://github.com/zanata/zanata/commit/3c8bacf05c9313e0671453a1b2c514dd0ec5babc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-10-11 (Tue, 11 Oct 2011)

  Changed paths:
    M .gitignore
  M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  A server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.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
  A server/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
  M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/db.changelog.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
  A server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  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
  A server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  A server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
	server/zanata-war/src/main/resources/db/db.changelog.xml
	server/zanata-war/src/main/webapp/admin/server_configuration.xhtml


Compare: https://github.com/zanata/zanata/compare/9a8a8e3...3c8bacf