[zanata/zanata-server] 2a1334: Warn on startup if EAP/WildFly too old

GitHub noreply at github.com
Fri Feb 27 02:51:30 UTC 2015


  Branch: refs/heads/infinispan
  Home:   https://github.com/zanata/zanata-server
  Commit: 2a133440d53e182c13ff0fc6f792609547283165
      https://github.com/zanata/zanata-server/commit/2a133440d53e182c13ff0fc6f792609547283165
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-19 (Wed, 19 Nov 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Warn on startup if EAP/WildFly too old


  Commit: 46ba666d6172b4c6d01e7b6177d57a910c585931
      https://github.com/zanata/zanata-server/commit/46ba666d6172b4c6d01e7b6177d57a910c585931
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java

  Log Message:
  -----------
  Use SampleProjectRule as @Rule, not @ClassRule


  Commit: 6a8340d7f239e4686163e5ee217c21ec2d8bd5ae
      https://github.com/zanata/zanata-server/commit/6a8340d7f239e4686163e5ee217c21ec2d8bd5ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Invert test broken by rhbz1168447


  Commit: aec1b316768684f44da29abdd49016de9856913f
      https://github.com/zanata/zanata-server/commit/aec1b316768684f44da29abdd49016de9856913f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-27 (Thu, 27 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java

  Log Message:
  -----------
  Merge pull request #640 from zanata/improve-test-isolation

Use SampleProjectRule as @Rule, not @ClassRule


  Commit: 6904ab969d5d712cdd4a2799bd015d6a79c00261
      https://github.com/zanata/zanata-server/commit/6904ab969d5d712cdd4a2799bd015d6a79c00261
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    A functional-test/etc/mysql-data.groovy
    M functional-test/pom.xml

  Log Message:
  -----------
  Add workaround for "The socket file path is too long (> 107): .../mysql.sock"


  Commit: 0b1c0c6427ca349d8e77c03b8ea7614047ea4b16
      https://github.com/zanata/zanata-server/commit/0b1c0c6427ca349d8e77c03b8ea7614047ea4b16
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-02 (Tue, 02 Dec 2014)

  Changed paths:
    A functional-test/etc/mysql-data.groovy
    M functional-test/pom.xml

  Log Message:
  -----------
  Merge pull request #644 from zanata/avoid-mysql-socket-too-long

Add workaround for "The socket file path is too long (> 107): .../mysql....


  Commit: b6a9598220634ed43221752dfd91dae003042734
      https://github.com/zanata/zanata-server/commit/b6a9598220634ed43221752dfd91dae003042734
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    A etc/scripts/cargowait.sh
    A etc/scripts/functional-test-db-snapshot.sh
    M functional-test/pom.xml

  Log Message:
  -----------
  add scripts to make functional test easier


  Commit: f613e6ded37c60a1a0254994c93bf249913ca883
      https://github.com/zanata/zanata-server/commit/f613e6ded37c60a1a0254994c93bf249913ca883
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  rhbz1120457 - enable email notification on language team permission change


  Commit: 0c29bca70f01d611048031aa0ebe6a1a8a95518c
      https://github.com/zanata/zanata-server/commit/0c29bca70f01d611048031aa0ebe6a1a8a95518c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java

  Log Message:
  -----------
  rhbz1120457 - send email notification when using other ways to change permissions


  Commit: 12ea662f2a91a0f1ac6ac3820451aa849514d0d0
      https://github.com/zanata/zanata-server/commit/12ea662f2a91a0f1ac6ac3820451aa849514d0d0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  rhbz1120457 - change test to test email notification


  Commit: 4f9bf5575d5c3541cb2a01bc60c25c5920d36f4a
      https://github.com/zanata/zanata-server/commit/4f9bf5575d5c3541cb2a01bc60c25c5920d36f4a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M etc/scripts/cargowait.sh
    M etc/scripts/functional-test-db-snapshot.sh
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  rhbz1120457 - add expiry queue and consumer, refactoring...

- extract strings so that it's localizable
- remove netty connector and acceptor and use in vm ones
- add comments


  Commit: c71ecd7029163e00581c01030a93ab479c767e2f
      https://github.com/zanata/zanata-server/commit/c71ecd7029163e00581c01030a93ab479c767e2f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    A etc/scripts/standalone.cli.messaging.config
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml

  Log Message:
  -----------
  rhbz1120457 - add jboss cli script to modify standalone.xml


  Commit: 7f7638f05fd317383ad39cf9f32478d809d4fa9b
      https://github.com/zanata/zanata-server/commit/7f7638f05fd317383ad39cf9f32478d809d4fa9b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-03 (Wed, 03 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  make HasEmailRule more resilient to retry


  Commit: 14055c7dbca6c2f946aed73677ea05ff863bea24
      https://github.com/zanata/zanata-server/commit/14055c7dbca6c2f946aed73677ea05ff863bea24
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Always show projects tab on dashboard page, even when there are no projects.


  Commit: 45ff016476601a8f06c25d0bc9b8fd7d4e4ce786
      https://github.com/zanata/zanata-server/commit/45ff016476601a8f06c25d0bc9b8fd7d4e4ce786
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-12-10 (Wed, 10 Dec 2014)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Merge pull request #649 from zanata/show-projects-tab

Always show projects tab on dashboard page, even when there are no projects.


  Commit: 3d6514e0073d53d3cdc563f153977d0c2c3da61f
      https://github.com/zanata/zanata-server/commit/3d6514e0073d53d3cdc563f153977d0c2c3da61f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm

  Log Message:
  -----------
  rhbz1120457 - remove admin/team coordinator email address from email template


  Commit: b8585264c693e9e087ce9ca58652f8d282121ac1
      https://github.com/zanata/zanata-server/commit/b8585264c693e9e087ce9ca58652f8d282121ac1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-11 (Thu, 11 Dec 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java

  Log Message:
  -----------
  rhbz1132271 - contact admin or team coordinator without logging in will get proper redirect


  Commit: 16180cfb85c2e27b02b4220caa26e23f08b495d3
      https://github.com/zanata/zanata-server/commit/16180cfb85c2e27b02b4220caa26e23f08b495d3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    A functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
    A zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java

  Log Message:
  -----------
  Streamline and simplify the test system

Squashed commit of the following:

commit c3a3064d63dc5cf25039e4832a536e548a54ecc3
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Dec 5 11:15:09 2014 +1000

    Shift login actions to a single step where possible

    Resetting the database does not clear a login session, so use that
    to apply to all tests where a single log in is evident.

commit 1cbdd512a59f665f51c7e78e921ab04a6cd28d6c
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Dec 5 10:20:49 2014 +1000

    Add webhooks to test plan, move project tests to separate class

    The entity clearing needed to be fixed for the webhooks test to work.

commit ae8fc4aaea514518dc61969484b5de99916e5e0c
Author: Damian Jansen <djansen at redhat.com>
Date:   Thu Dec 4 14:59:39 2014 +1000

    Remove RetryRule

    RetryRule was causing more problems than it fixed, such as
    altering failure reasons and hiding real failures.

commit d477beea4acc04d265c2f3e392d531c23a2ac80a
Author: Damian Jansen <djansen at redhat.com>
Date:   Wed Dec 3 14:34:54 2014 +1000

    Streamline some tests

    Move logic testing of validators from the UI tests to unit.
    Don't test Hibernate email logic.
    Add a small check on goToHome to make sure we actually got home.


  Commit: cc1b8039b1412989e94cbfbfb90badf6a3ee4393
      https://github.com/zanata/zanata-server/commit/cc1b8039b1412989e94cbfbfb90badf6a3ee4393
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-12-16 (Tue, 16 Dec 2014)

  Changed paths:
    M .gitignore
    R zanata-dist/etc/assembly.xml
    R zanata-dist/etc/sql/config_setup.sql
    R zanata-dist/pom.xml
    A zanata-overlay/.gitignore
    A zanata-overlay/build.gradle
    A zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    A zanata-overlay/common/bin/zanata-installer/install.bat
    A zanata-overlay/common/bin/zanata-installer/install.sh
    A zanata-overlay/common/bin/zanata-installer/installer.properties
    A zanata-overlay/config/remote-deps.groovy
    A zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    A zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml

  Log Message:
  -----------
  Add a Zanata overlay zip submodule.

Pull Request: https://github.com/zanata/zanata-server/pull/637
Squashed commit of the following:

commit ac46d8051275c9738db875dd29d7f4c1a43b85b1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Dec 15 15:57:40 2014 +1000

    Minor zanata installer changes

    - Reverted to latest mysql driver info
    - Added a few log lines to know what's happening

commit 4110de2921804b5e37874b65385986b1b8878790
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Dec 10 16:54:00 2014 +1000

    More review changes:

    Fix issues with the windows script for installation
    Change wording and correct spelling for installer messages.

commit fc5daf1bf29b484e5a4e41c7d71f728f4c2c2b6b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Dec 8 16:19:19 2014 +1000

    Make sure the installation process is repeatable if there is a failure.

    Also, downgraded the mysql driver version as the one used before did not deploy on wildfly.

commit 482604e2c9d66be67810b3906d3c501c4d46528e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Dec 1 11:11:04 2014 +1000

    Remove the need for a custom standalone.xml when installing Zanata.

commit 362a2653d51ba402a84e56a22835b0677c558174
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Fri Nov 28 15:38:48 2014 +1000

    Add missing newline characters and change shell scripts.

commit a99f9310d418bb560ae6ecadb9c31789d5ab86f1
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Nov 21 12:07:58 2014 +1000

    Add zanata-overlay submodule.

    This submodule takes care of building an overlay zip file that when extracted on top of the different supported JBoss distributions, will supply the necessary components for Zanata to run. In this iteration it contains:
    - Necessary jboss submodules
    - Configuration and startup scripts for zanata
    - Installation scripts which fetches the war file from the web and configures some parts of the application.

    Currently, it builds 2 distributions:
    Wildfly 8.1
    EAP 6 (6.3 recommended)


  Commit: 1e5ef16d2c3cc8dffed951c43efe422184027088
      https://github.com/zanata/zanata-server/commit/1e5ef16d2c3cc8dffed951c43efe422184027088
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    A etc/scripts/cargowait.sh
    A etc/scripts/functional-test-db-snapshot.sh
    A etc/scripts/standalone.cli.messaging.config
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #639 from zanata/rhbz1120457-email-queue

Rhbz1120457 email notification when language team permission changed


  Commit: ea7dafb01881c2b02a95bd012f3d6b66128b681a
      https://github.com/zanata/zanata-server/commit/ea7dafb01881c2b02a95bd012f3d6b66128b681a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  rhbz1174071 - add validation failure result in translation results


  Commit: 56b631eab28a83b2424e689517a2078806aaae73
      https://github.com/zanata/zanata-server/commit/56b631eab28a83b2424e689517a2078806aaae73
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-18 (Thu, 18 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Use example.com instead of test.com for tests


  Commit: 92f33ee740e085eaa940b75409bfa2d6767d1875
      https://github.com/zanata/zanata-server/commit/92f33ee740e085eaa940b75409bfa2d6767d1875
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #654 from zanata/use-example-com

Use example.com instead of test.com for tests


  Commit: 0cdb13e01d4153884e3283e43f52ae4697473225
      https://github.com/zanata/zanata-server/commit/0cdb13e01d4153884e3283e43f52ae4697473225
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-12-19 (Fri, 19 Dec 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/config/AsyncConfig.java
    A zanata-war/src/main/java/org/zanata/config/ConfigStore.java
    A zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java

  Log Message:
  -----------
  Remove hard-coded thread pool size for Async tasks.

Pull Request: https://github.com/zanata/zanata-server/pull/643
Squashed commit of the following:

commit a772b78b841a7ec374d4ee9674510b3d73e6e3db
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Dec 8 16:35:45 2014 +1000

    Code review changes.

commit d43bb366ed753b960374b3bbd565638e10a34aed
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Dec 3 17:09:39 2014 +1000

    Remove hard-coded thread pool size for Async tasks.

    Made it configurable via system properties, and added some infrastructure classes to implement different types of configuration stores. All configuration stores should migrate to this design in the future.


  Commit: 42433bf0b329eeef7caa6356e53b8febce43d037
      https://github.com/zanata/zanata-server/commit/42433bf0b329eeef7caa6356e53b8febce43d037
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-12-22 (Mon, 22 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java

  Log Message:
  -----------
  Email address is not part of the role changes message


  Commit: 9db1ceae3da15de96c53276b2a1d11e02172d8be
      https://github.com/zanata/zanata-server/commit/9db1ceae3da15de96c53276b2a1d11e02172d8be
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-12-23 (Tue, 23 Dec 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java

  Log Message:
  -----------
  Merge pull request #656 from zanata/fix-language-join-test

Email address is not part of the role changes message


  Commit: b17e4e8c9d835a20f15cbdac83df71863e5676a7
      https://github.com/zanata/zanata-server/commit/b17e4e8c9d835a20f15cbdac83df71863e5676a7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-07 (Wed, 07 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/ksysv.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    R zanata-war/src/main/resources/images/openid/myopenid.png
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/language.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    R zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    R zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    R zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Update admin pages

https://bugzilla.redhat.com/show_bug.cgi?id=1162383

Squashed commit of the following:

commit a4b0b39ab1905dd7b11f8bdfdb82fae775a8d4f1
Merge: e271951 9db1cea
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Jan 5 11:28:47 2015 +1000

    Merge branch 'integration/master' into admin-page

    Conflicts:
    	functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    	functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    	functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    	zanata-war/src/main/java/org/zanata/action/SendEmailAction.java

commit e271951bead7d242b51458ec18e4ae28f1bbc234
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Dec 9 11:08:15 2014 +1000

    Fix add new language

commit bb1c9b388f7ba6762fc06a577aa54f538d01fef1
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Dec 8 11:24:19 2014 +1000

    Fix underscore new language

commit ef168a1ea94617781f112132b114181a99407c4b
Merge: 8fd3612 0b1c0c6
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Dec 8 07:32:50 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 8fd361270a82b9662e86117eb06a862fb1d1a390
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Nov 30 20:10:47 2014 +1000

    Allow new arbitrary language

commit a81ed306b02901ef49d5a336c5a5006ec62593e9
Merge: 5acf197 aec1b31
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Nov 30 19:23:46 2014 +1000

    Merge branch 'integration/master' into admin-page

    Conflicts:
    	zanata-war/src/main/webapp/admin/languagemanager.xhtml
    	zanata-war/src/main/webapp/admin/search.xhtml
    	zanata-war/src/main/webapp/admin/usermanager.xhtml
    	zanata-war/src/main/webapp/language/home.xhtml
    	zanata-war/src/main/webapp/tm/home.xhtml

commit 5acf197f2c50f9fe8bf8b265c781d1c5290110a1
Author: Damian Jansen <djansen at redhat.com>
Date:   Wed Nov 26 14:27:00 2014 +1000

    Fix tests and bugs in admin UI update

    - Many tests had to be updated for the new UI
    - Fix bug where Clear / Delete TM options were not visible
    - Fix bug where max file uploads was saved in max api requests config

commit 988755bc4af794167e2b6f4ae8fcfc0093c576c2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 24 08:47:20 2014 +1000

    Update help page and contact admin page

commit 2cb23f9388ae3664ad085f87f24f100ca64ac352
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Nov 21 14:52:36 2014 +1000

    Update contact coordinator page

commit 9f30ff7795fb0967394c750e7707d0279c84e1b8
Merge: 50abdf9 9e86c7d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Nov 20 15:56:44 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 50abdf9be986450470373222098fb75bc98fcd20
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 18 15:31:28 2014 +1000

    Update tm page

commit 90c09820897e8c65c70058089f8c080d81344449
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 18 11:20:19 2014 +1000

    Update TM page

commit 75c69bd3524b66f3f5371f6ac184b0e4d9065efd
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 17 08:25:47 2014 +1000

    Update search and process manager page

commit 05771828d55f9b688b89496140b14325d1efe4b6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 11 15:32:43 2014 +1000

    Update process manager page

commit c742327abf5e3c0641aa5e6642927c55f8c60d48
Merge: 7b91f76 395a7d5
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 10 14:01:24 2014 +1000

    Merge branch 'integration/master' into admin-page

commit 7b91f769abb74666783185bdca7e4b8acac9a0b7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Nov 4 15:44:30 2014 +1000

    Update UI in admin page


  Commit: 3116f95beb3f16ba3e351eece078881d895dada4
      https://github.com/zanata/zanata-server/commit/3116f95beb3f16ba3e351eece078881d895dada4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  rhbz1149968 - record last modified by person from client pushed translation


  Commit: a5dc199a4719ccc73983022060f5a1d94b6d2f0c
      https://github.com/zanata/zanata-server/commit/a5dc199a4719ccc73983022060f5a1d94b6d2f0c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-08 (Thu, 08 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  merge zanata-spa 0.0.6


  Commit: 1bdb99277804f6135355d2459f8ee5a22d081021
      https://github.com/zanata/zanata-server/commit/1bdb99277804f6135355d2459f8ee5a22d081021
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-09 (Fri, 09 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #659 from zanata/rhbz1149968-offline-trans

rhbz1149968 - record last modified by person from client pushed translation


  Commit: a53a419f05fcfdf5719b8fa248d94b947a4b21cb
      https://github.com/zanata/zanata-server/commit/a53a419f05fcfdf5719b8fa248d94b947a4b21cb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Merge pull request #648 from zanata/shortcuts

Merge zanata-spa 0.0.6


  Commit: 29df461d37b6bb97d237d1160fa3f0ac5be68dc0
      https://github.com/zanata/zanata-server/commit/29df461d37b6bb97d237d1160fa3f0ac5be68dc0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java

  Log Message:
  -----------
  fix adding custom language in zanata


  Commit: b09e616c452ff4f754a5b98cb6d516a0e55ba46f
      https://github.com/zanata/zanata-server/commit/b09e616c452ff4f754a5b98cb6d516a0e55ba46f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-13 (Tue, 13 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java

  Log Message:
  -----------
  Merge pull request #660 from zanata/fix-custom-language

fix adding arbitrary language in zanata


  Commit: 39ab4495d1d3b58010bd65697aa38e2eec191921
      https://github.com/zanata/zanata-server/commit/39ab4495d1d3b58010bd65697aa38e2eec191921
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge pull request #636 from zanata/eap-version-check

Warn on startup if EAP/WildFly too old


  Commit: 84aca2f2dc1beff8d234897265ee4ab757401b92
      https://github.com/zanata/zanata-server/commit/84aca2f2dc1beff8d234897265ee4ab757401b92
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java

  Log Message:
  -----------
  Fix admin and related tests after UI update


  Commit: f75a66b6146d06a46728bc234db8675c0e6a75b8
      https://github.com/zanata/zanata-server/commit/f75a66b6146d06a46728bc234db8675c0e6a75b8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 46f51a368ab7daf3ca7289cbccfc4c5bd040a625
Merge: a76a174 b09e616
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Jan 14 11:14:37 2015 +1000

    Merge remote-tracking branch 'origin/master' into fix-formatting

    Conflicts:
    	functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java

commit a76a1742ebc68da04f1bd7b69da4a56ef4c22986
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 5 11:43:08 2014 +1000

    Fix formatting


  Commit: 5a031ca53e9c03db916acb1f3cb63e59b86a80d8
      https://github.com/zanata/zanata-server/commit/5a031ca53e9c03db916acb1f3cb63e59b86a80d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-14 (Wed, 14 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/config/AsyncConfig.java

  Log Message:
  -----------
  Fix formatting


  Commit: bdf70b78470f5ecea832d10ec39b11a5bc408168
      https://github.com/zanata/zanata-server/commit/bdf70b78470f5ecea832d10ec39b11a5bc408168
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-15 (Thu, 15 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java

  Log Message:
  -----------
  Look for chromedriver on the system PATH too

Squashed commit of the following:

commit cf1c1ecd2e05cb8641c253d9a61558e5ae02fedd
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jan 13 16:56:33 2015 +1000

    Add suggestions from djansen

commit be3e8a4645b9ae38e7cd47e8e37560a9bc6c67f7
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Dec 19 15:13:58 2014 +1000

    Look for chromedriver on the system PATH too


  Commit: 98d4ddc9c99ff3c41841b7e5acafe3189f7d4d6a
      https://github.com/zanata/zanata-server/commit/98d4ddc9c99ff3c41841b7e5acafe3189f7d4d6a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java

  Log Message:
  -----------
  Merge pull request #661 from zanata/fix-admin-tests

Fix admin and related tests after UI update


  Commit: a22fdd713e91da2ddfbe559e08e265aefe786a96
      https://github.com/zanata/zanata-server/commit/a22fdd713e91da2ddfbe559e08e265aefe786a96
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  Fix checkstyle errors in Language test pages


  Commit: 2d84f53fad50236d6ddd7f82b93fe80b181d4f5b
      https://github.com/zanata/zanata-server/commit/2d84f53fad50236d6ddd7f82b93fe80b181d4f5b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-16 (Fri, 16 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java

  Log Message:
  -----------
  Merge pull request #663 from zanata/fix-checkstyle-admin-ui-test

Fix checkstyle errors in Language test pages


  Commit: e49b08200aab9a7f69c28edf8d6f86bacaeaf913
      https://github.com/zanata/zanata-server/commit/e49b08200aab9a7f69c28edf8d6f86bacaeaf913
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  Fix getContents for plural in zanata-spa


  Commit: e901909fe748080fc42849bb8203b13d4a51c6af
      https://github.com/zanata/zanata-server/commit/e901909fe748080fc42849bb8203b13d4a51c6af
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java

  Log Message:
  -----------
  Merge pull request #664 from zanata/zanata-spa-plural

Fix getContents for plural in zanata-spa


  Commit: 0e9518c4810f0eaa303db868f46ae04132401143
      https://github.com/zanata/zanata-server/commit/0e9518c4810f0eaa303db868f46ae04132401143
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java

  Log Message:
  -----------
  Fix broken logic of test add/manage language pages


  Commit: 4f25d318bf2e29d7f1c2b6e62cba8beb61903538
      https://github.com/zanata/zanata-server/commit/4f25d318bf2e29d7f1c2b6e62cba8beb61903538
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java

  Log Message:
  -----------
  Merge pull request #665 from zanata/fix-add-language-test

Fix broken logic of test add/manage language pages


  Commit: 1e0115e38d4953364fe64e50dcbbdd137b99c233
      https://github.com/zanata/zanata-server/commit/1e0115e38d4953364fe64e50dcbbdd137b99c233
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/test/resources/log4j.xml
    A zanata-model/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Tweak logging config in tests


  Commit: 0f25bdddbc8eb1cd6c87ebcc478a753f73dd6cdd
      https://github.com/zanata/zanata-server/commit/0f25bdddbc8eb1cd6c87ebcc478a753f73dd6cdd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Only start SMTP server once for all tests


  Commit: 49d2df95a2ed00d88d32a1272131131457099661
      https://github.com/zanata/zanata-server/commit/49d2df95a2ed00d88d32a1272131131457099661
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java

  Log Message:
  -----------
  Log async exceptions as WARN


  Commit: 6c5bb2c943d07d219cdc0be725d314accc0427c3
      https://github.com/zanata/zanata-server/commit/6c5bb2c943d07d219cdc0be725d314accc0427c3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-19 (Mon, 19 Jan 2015)

  Changed paths:
    R functional-test/etc/mysql-data.groovy
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    M pom.xml

  Log Message:
  -----------
  Move mysql data (but not socket) back under 'target'


  Commit: acb834906d62314566e8ccdf0e1c557008e05ddc
      https://github.com/zanata/zanata-server/commit/acb834906d62314566e8ccdf0e1c557008e05ddc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-20 (Tue, 20 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Fix test element focus issues

In some cases, element.blur works more reliably than a page click


  Commit: 45784f612e95129f7963471676e84b8deca87fa1
      https://github.com/zanata/zanata-server/commit/45784f612e95129f7963471676e84b8deca87fa1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java

  Log Message:
  -----------
  Wait for settings tab, be less wait-ish in waiting for it

Remove superfluous waits
Wait for the project version settings page to exist before moving to it
Add logging as to exactly what the system is waiting for


  Commit: 991f9fd77018abc9153182d963e1fcf2ac443cc1
      https://github.com/zanata/zanata-server/commit/991f9fd77018abc9153182d963e1fcf2ac443cc1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    R functional-test/etc/mysql-data.groovy
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/log4j.xml
    M pom.xml
    A zanata-model/src/test/resources/log4j.xml
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Merge pull request #666 from zanata/fix-intermittent-smtp-tests

Fix intermittent smtp tests


  Commit: 038a2616ef6e13e6ea7199e9769d9e05c103e881
      https://github.com/zanata/zanata-server/commit/038a2616ef6e13e6ea7199e9769d9e05c103e881
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade classloader-leak-prevention to 1.11.0


  Commit: 2f9da44beded196ed3a684e73449e6c0eb96443f
      https://github.com/zanata/zanata-server/commit/2f9da44beded196ed3a684e73449e6c0eb96443f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #670 from zanata/classloader-leak-prevention-1-11-0

Upgrade classloader-leak-prevention to 1.11.0


  Commit: fc374cc6da69e049f25dfbafe627aee17db9e59a
      https://github.com/zanata/zanata-server/commit/fc374cc6da69e049f25dfbafe627aee17db9e59a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Fetch updated translations from translate.zanata.org


  Commit: bb25da8608cc5ac1ad0680db315e49049cd2ec46
      https://github.com/zanata/zanata-server/commit/bb25da8608cc5ac1ad0680db315e49049cd2ec46
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  prepare for next development iteration


  Commit: c1013ab796803b4d5a831b2ae0853b1f7398c1d0
      https://github.com/zanata/zanata-server/commit/c1013ab796803b4d5a831b2ae0853b1f7398c1d0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  Initialise SMTP server as late as possible

Otherwise it might be initialised in the Maven process rather
than the test process.


  Commit: fbdf66756b86fe75c991bc48c52d5d7aa43fce6a
      https://github.com/zanata/zanata-server/commit/fbdf66756b86fe75c991bc48c52d5d7aa43fce6a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Log Message:
  -----------
  Count all outstanding AJAX requests


  Commit: e83d4f429484414e19742145f7e998f4994154b6
      https://github.com/zanata/zanata-server/commit/e83d4f429484414e19742145f7e998f4994154b6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java

  Log Message:
  -----------
  Merge pull request #669 from zanata/fix-test-settings-tab

Wait for settings tab, be less wait-ish in waiting for it


  Commit: 478eae5c2c88d641b9ec8c9cc744200cdaf1532b
      https://github.com/zanata/zanata-server/commit/478eae5c2c88d641b9ec8c9cc744200cdaf1532b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/fix-test-settings-tab' into functional-test-fixes


  Commit: 49b364dc6c6fda846b69d8302621c2d915380f8e
      https://github.com/zanata/zanata-server/commit/49b364dc6c6fda846b69d8302621c2d915380f8e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-22 (Thu, 22 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Include descriptions in some timeout exceptions


  Commit: 10969c060592cca3933ea982ae65dc5fa90b396f
      https://github.com/zanata/zanata-server/commit/10969c060592cca3933ea982ae65dc5fa90b396f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-23 (Fri, 23 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java

  Log Message:
  -----------
  Stabilise some tab related test functions


  Commit: 880b79569ef2162a827a9559a3ecc452f41d1619
      https://github.com/zanata/zanata-server/commit/880b79569ef2162a827a9559a3ecc452f41d1619
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-01-27 (Tue, 27 Jan 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Merge pull request #668 from zanata/fix-focus-issues

Fix test element focus issues


  Commit: 4793c88fd098947972d1ca9b855870251755ceab
      https://github.com/zanata/zanata-server/commit/4793c88fd098947972d1ca9b855870251755ceab
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Implement plural support for zanata-spa

Squashed commit of the following:

commit 8eaf6a4f1bec90815ab461d7fa7bfdfa5a5a5d0d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Jan 27 13:22:24 2015 +1000

    Implement plural support for zanata-spa: https://bugzilla.redhat.com/show_bug.cgi?id=1172437


  Commit: 3eae95f598ff57e13657b169621ab23de1c81e17
      https://github.com/zanata/zanata-server/commit/3eae95f598ff57e13657b169621ab23de1c81e17
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: f34ad3b1c74ab2d4cf50829ee759134a635fdea0
      https://github.com/zanata/zanata-server/commit/f34ad3b1c74ab2d4cf50829ee759134a635fdea0
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Replace CSS file with JS for loading Google Web Fonts


  Commit: fe5c02ccd42750840eeae62448c36f726e1b3fdb
      https://github.com/zanata/zanata-server/commit/fe5c02ccd42750840eeae62448c36f726e1b3fdb
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Merge branch 'release' into integration/master

* release:
  Replace CSS file with JS for loading Google Web Fonts


  Commit: 4be04f5e536047adfa7f5434b0916804b7bcf92d
      https://github.com/zanata/zanata-server/commit/4be04f5e536047adfa7f5434b0916804b7bcf92d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Fix placeholder in server config page

https://bugzilla.redhat.com/show_bug.cgi?id=1185134

Squashed commit of the following:

commit 42265a7669cddca3a5bb518cbee0b9f67988756d
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 09:29:07 2015 +1000

    Fix input field not save when using same text as placeholder: https://bugzilla.redhat.com/show_bug.cgi?id=1185134


  Commit: a100b9f97b0d43054ae841e995af1cb19011c122
      https://github.com/zanata/zanata-server/commit/a100b9f97b0d43054ae841e995af1cb19011c122
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-01-28 (Wed, 28 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge branch 'release' into integration/master


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Fix readonly first version issue: https://bugzilla.redhat.com/show_bug.cgi?id=1185170

Squashed commit of the following:

commit 10fb15a9645eb4a021ffcfe1d00542842bc30d96
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jan 29 11:24:15 2015 +1000

    Fix readonly first version issue: https://bugzilla.redhat.com/show_bug.cgi?id=1185170


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: b11149002adf4e092d71b5136fecb721f42dab4e
      https://github.com/zanata/zanata-server/commit/b11149002adf4e092d71b5136fecb721f42dab4e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Fix test element focus issues

In some cases, element.blur works more reliably than a page click


  Commit: caee3adbe1e8e564743c97d7d2d44efa103f47b2
      https://github.com/zanata/zanata-server/commit/caee3adbe1e8e564743c97d7d2d44efa103f47b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/util/TestLogger.java

  Log Message:
  -----------
  Add TestLogger so that we can see in the log which tests have run or failed


  Commit: e81f45cb326ee4acde633edebba24a6285ecbb64
      https://github.com/zanata/zanata-server/commit/e81f45cb326ee4acde633edebba24a6285ecbb64
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Fix AJAX counter


  Commit: 66636811a14783f7499cc31444369181169c8eaf
      https://github.com/zanata/zanata-server/commit/66636811a14783f7499cc31444369181169c8eaf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Fix and simplify config for Arquillian/functional tests

Default to BasicAcceptanceTestSuite, but add -DallFuncTests option,
  also -DskipArqTests and -DskipFuncTests.  Remove -Dfunctional-test.
Make -Dappserver=wildfly8 or -Dappserver=jbosseap6 container installation
  logic consistent between zanata-war and functional-test modules.
Warn if required container properties not set.
Use same config (antrun) to install wildfly modules in both cases.
Ensure that build fails if no integration tests are found.
Generally reduce duplication of config where possible.


  Commit: f9a01ff27bba2edac1ba1d8008cc1f4a72b85296
      https://github.com/zanata/zanata-server/commit/f9a01ff27bba2edac1ba1d8008cc1f4a72b85296
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-02 (Mon, 02 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Attempt to fix intermittent test failure


  Commit: 2c4f8ec240745b9ca7baac7b53168814e9e87046
      https://github.com/zanata/zanata-server/commit/2c4f8ec240745b9ca7baac7b53168814e9e87046
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M zanata-overlay/build.gradle
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml

  Log Message:
  -----------
  Add JMS configuration to standalone.xml for Zanata overlay.

See: https://github.com/zanata/zanata-server/pull/679
Squashed commit of the following:

commit a420d1607d39d2b3c7d7c1d0efb10ed5e46a451f
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Jan 30 16:30:16 2015 +1000

    Decrease the mysql driver version installed in the Zanata overlay.

commit f46fc54cb3c195363ee6d0e218e14f1a1111690a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Jan 30 15:45:15 2015 +1000

    Add JMS configuration to standalone.xml

    The necessary JMS configuration was missing from the overlay's standalone files.


  Commit: 478d11e54247f93e456c0f94256dbc1ff1a3f22b
      https://github.com/zanata/zanata-server/commit/478d11e54247f93e456c0f94256dbc1ff1a3f22b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Fix warning from maven-dependency-plugin


  Commit: 77455584f1a3e3e9ce0e50ded4cd64a93927fce9
      https://github.com/zanata/zanata-server/commit/77455584f1a3e3e9ce0e50ded4cd64a93927fce9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'functional-test-fixes' into release


  Commit: e4ad6db52d2036ea077d718deffb7e3df97864e3
      https://github.com/zanata/zanata-server/commit/e4ad6db52d2036ea077d718deffb7e3df97864e3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/build.gradle
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	zanata-war/pom.xml


  Commit: a5790638aec3a4d4903f9a4c59801906af9a447d
      https://github.com/zanata/zanata-server/commit/a5790638aec3a4d4903f9a4c59801906af9a447d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M pom.xml
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java

  Log Message:
  -----------
  Improve unit test coverage


  Commit: b03c36c46ebc833875532747bc11af30f74ce3a1
      https://github.com/zanata/zanata-server/commit/b03c36c46ebc833875532747bc11af30f74ce3a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java

  Log Message:
  -----------
  Add reason to Cobertura annotation


  Commit: 6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
      https://github.com/zanata/zanata-server/commit/6603f7cb6bd0bf5afed63c3a03b721cfd073ed48
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Fix reindex page and remove duplicate language page.

https://bugzilla.redhat.com/show_bug.cgi?id=1097464

Squashed commit of the following:

commit e31dc3331db8c77b6ca6e692fca77d7105c01ba5
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 3 09:40:51 2015 +1000

    remove duplicate language page

commit e5c47ab602ad26627efa5b85c4ec8a8db8f64b38
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 17:14:39 2015 +1000

    Fix reindex page: https://bugzilla.redhat.com/show_bug.cgi?id=1097464


  Commit: b4b3c384afed9e220f996b648b0256bc4d2c6c92
      https://github.com/zanata/zanata-server/commit/b4b3c384afed9e220f996b648b0256bc4d2c6c92
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M pom.xml
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java

  Log Message:
  -----------
  Merge pull request #682 from zanata/improve-coverage

Improve unit test coverage


  Commit: 72054be5182a417ba30ab83d4e0c12b8c7a92108
      https://github.com/zanata/zanata-server/commit/72054be5182a417ba30ab83d4e0c12b8c7a92108
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Ignore intermittent test


  Commit: a2afc86b1c13074c63cbeb9f831acac6bab0c9f7
      https://github.com/zanata/zanata-server/commit/a2afc86b1c13074c63cbeb9f831acac6bab0c9f7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 32cf21550509986ce63476e44295784d32b17b3e
      https://github.com/zanata/zanata-server/commit/32cf21550509986ce63476e44295784d32b17b3e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Fix activation of functional-test profile in zanata-test-war


  Commit: 3b2474ef80a36490a5d08136af1c367e1d8d3a86
      https://github.com/zanata/zanata-server/commit/3b2474ef80a36490a5d08136af1c367e1d8d3a86
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Merge pull request #684 from zanata/functional-test-fixes

Fix activation of functional-test profile in zanata-test-war


  Commit: 1308b9da6f1ff267c4ea09fa20540dbe47f482de
      https://github.com/zanata/zanata-server/commit/1308b9da6f1ff267c4ea09fa20540dbe47f482de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-05 (Thu, 05 Feb 2015)

  Changed paths:
    M zanata-test-war/pom.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/release' into integration/master


  Commit: f374e740fe602175e5557460527271ed54b2fc3e
      https://github.com/zanata/zanata-server/commit/f374e740fe602175e5557460527271ed54b2fc3e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-06 (Fri, 06 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Implement myTrans options when upload translation
https://bugzilla.redhat.com/show_bug.cgi?id=1184299

Squashed commit of the following:

commit 573fc4182e8113a9d98923fe0b64d7e1ad8697f3
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 07:12:00 2015 +1000

    Fix unit test

commit 31a614edb0eda39858bf3094592b26c8c994adc1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 15:17:04 2015 +1000

    Update zanata-api version to 3.7.0-SNAPSHOT

commit 5e6d63127c3dea1ef379c72dba88ca664783a61c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 14:07:42 2015 +1000

    Fix test for pushing translations

commit 15bdc2efbdc65a9e06e54fdd5f6bae72f99e81b4
Merge: ebd1d43 b4b3c38
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 11:30:43 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

    Conflicts:
    	zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml

commit ebd1d43ede7ca44611c1110cc31c6f1d801c233d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 2 12:55:41 2015 +1000

    Fix unit test

commit dffc9aefc4f0aae823effb76e2ac15ed19f1fb41
Merge: 5abeaad cc96b2f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Jan 30 12:12:20 2015 +1000

    Merge branch 'integration/master' into rhbz1184299

commit 5abeaad65f116fccb19423a7a6eeb1df9f6eeaaa
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jan 28 15:56:13 2015 +1000

    Implement myTrans options when upload translation

    https://bugzilla.redhat.com/show_bug.cgi?id=1184299


  Commit: 93444cb838d1ef7d07cd307b41894fea40e3a985
      https://github.com/zanata/zanata-server/commit/93444cb838d1ef7d07cd307b41894fea40e3a985
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java

  Log Message:
  -----------
  Eliminate all BOMs except jboss-javaee-6.0


  Commit: cb789da24cb3f4db1b5069c78ff5ecd53a75035c
      https://github.com/zanata/zanata-server/commit/cb789da24cb3f4db1b5069c78ff5ecd53a75035c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml

  Log Message:
  -----------
  Simplify webdriver config (use DISPLAY from env)


  Commit: d8b169b56af3bed8a42455154ed9a33f2c3eb0ba
      https://github.com/zanata/zanata-server/commit/d8b169b56af3bed8a42455154ed9a33f2c3eb0ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-10 (Tue, 10 Feb 2015)

  Changed paths:
    M build.sh

  Log Message:
  -----------
  Update build.sh to use xvfb-run


  Commit: ecbb1f3b8e96ea34d5a047bdba5969173030d82e
      https://github.com/zanata/zanata-server/commit/ecbb1f3b8e96ea34d5a047bdba5969173030d82e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Remove obsolete config


  Commit: 2f8549ec2c7365f9911b97a11370251a5e81a93f
      https://github.com/zanata/zanata-server/commit/2f8549ec2c7365f9911b97a11370251a5e81a93f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Cache downloaded wildfly modules to ~/Downloads


  Commit: 0049e9464b1d74f6adf5eec47bdc373a5759a5ca
      https://github.com/zanata/zanata-server/commit/0049e9464b1d74f6adf5eec47bdc373a5759a5ca
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java

  Log Message:
  -----------
  Remove fragile file upload tests

We don't need functional tests to check the file storage back-end
(implementation detail).  General upload functionality is covered by
other tests in this package.


  Commit: d48794ca8885b64544520dd6ed694dfb8bcf0aa5
      https://github.com/zanata/zanata-server/commit/d48794ca8885b64544520dd6ed694dfb8bcf0aa5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Rerun failing integration tests up to three times


  Commit: 062565c69a67bdfba201613c3a47a41a012a0edf
      https://github.com/zanata/zanata-server/commit/062565c69a67bdfba201613c3a47a41a012a0edf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708

Squashed commit of the following:

commit 863b2bb5727cd993cbb9982e0a2267c285b40369
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 14:39:25 2015 +1000

    Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708

commit f147b27487715611901dc45aa45417fc31712919
Merge: d42e58f f374e74
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 11:10:57 2015 +1000

    Merge branch 'integration/master' into rhbz1184708

commit d42e58ff84ac3e5b24531c274f58c8694a71125d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 09:53:45 2015 +1000

    Implement override plural forms:
    https://bugzilla.redhat.com/show_bug.cgi?id=1184708


  Commit: c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
      https://github.com/zanata/zanata-server/commit/c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml

  Log Message:
  -----------
  Update inactive account, password reset page. Remove captcha from password reset page.
https://bugzilla.redhat.com/show_bug.cgi?id=1191321

Squashed commit of the following:

commit 94837356020e34784e0ed8e67b89daa3709a5aa1
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 10 16:08:18 2015 +1000

    Update inactive account, password reset page. Remove captcha from password reset page.

    https://bugzilla.redhat.com/show_bug.cgi?id=1191321


  Commit: 51fd4b3e3c756b831026f9e01682edebd9fd40b1
      https://github.com/zanata/zanata-server/commit/51fd4b3e3c756b831026f9e01682edebd9fd40b1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

  Log Message:
  -----------
  disable rendering in filter list if empty string
https://bugzilla.redhat.com/show_bug.cgi?id=1190557

Squashed commit of the following:

commit a1c6547965cacd3f1cac600524486f007d689e7e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 11 13:43:00 2015 +1000

    disable rendering in filter list if empty string: https://bugzilla.redhat.com/show_bug.cgi?id=1190557


  Commit: a828049979c44bab4d0415ac8784afacf35f04b7
      https://github.com/zanata/zanata-server/commit/a828049979c44bab4d0415ac8784afacf35f04b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Fix inactive account redirection with openid account

https://bugzilla.redhat.com/show_bug.cgi?id=1191827

Squashed commit of the following:

commit 0ddec629799a6bacc9c24c67d545a841dcd2e0ff
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 12:20:07 2015 +1000

    Fix inactive account redirection with openid account


  Commit: 8fe5f44d3483742730881a16b3974e940f0613a1
      https://github.com/zanata/zanata-server/commit/8fe5f44d3483742730881a16b3974e940f0613a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Selenium config changes

Upgrade Selenium version.
Send all cargo logging to stdout for easier correlation.
Enable a timeout for container startup (two minutes).


  Commit: 0f3d6b4e30ab872cb92506be49629f81ead7e2e5
      https://github.com/zanata/zanata-server/commit/0f3d6b4e30ab872cb92506be49629f81ead7e2e5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java

  Log Message:
  -----------
  Speed up successful login during tests


  Commit: 777698210d077fef28548468d70b3713badb7f89
      https://github.com/zanata/zanata-server/commit/777698210d077fef28548468d70b3713badb7f89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java

  Log Message:
  -----------
  Enhance AbstractPage and AjaxCounterBean

- Count outstanding timeouts with AjaxCounterBean too
- Use new WebDriverWait for each wait, instead of reusing
  FluentWait<WebDriver>
- Add AbstractPage.getExecutor() to minimise casting
- Add NamedPredicate for better failure messages


  Commit: 53ff0071b711cad41d1803eb6db448ce5ff54efe
      https://github.com/zanata/zanata-server/commit/53ff0071b711cad41d1803eb6db448ce5ff54efe
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java

  Log Message:
  -----------
  Change lookup for upload list elements to work around apparent Selenium bug


  Commit: d1d680da06cb17ae1123a9db381fa5ee029548f4
      https://github.com/zanata/zanata-server/commit/d1d680da06cb17ae1123a9db381fa5ee029548f4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Fix management port mismatch


  Commit: e099e57f0a0887010a0b85cdfc39d87098e31127
      https://github.com/zanata/zanata-server/commit/e099e57f0a0887010a0b85cdfc39d87098e31127
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Warn if EAP version < 6.3.3


  Commit: 3b59176ca0acf58f3e76d92e5723d2df931336f0
      https://github.com/zanata/zanata-server/commit/3b59176ca0acf58f3e76d92e5723d2df931336f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/log4j.xml

  Log Message:
  -----------
  Enable logging in ad hoc functional tests


  Commit: e6eb6ec1e9fc59be0f2ead3d3eb5efebb6a890f9
      https://github.com/zanata/zanata-server/commit/e6eb6ec1e9fc59be0f2ead3d3eb5efebb6a890f9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Log Message:
  -----------
  Disable waiting for timeouts until tests can be updated


  Commit: 5520514517057ee9dbe0e755c502c96a844cd1c9
      https://github.com/zanata/zanata-server/commit/5520514517057ee9dbe0e755c502c96a844cd1c9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml

  Log Message:
  -----------
  Remove ANSI colour and UTC timezone from functional tests' logging


  Commit: 95cff3ed99a8c1a994e9da36d6824638ab1de1a6
      https://github.com/zanata/zanata-server/commit/95cff3ed99a8c1a994e9da36d6824638ab1de1a6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-16 (Mon, 16 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Attempt to fix some error message-related functional tests


  Commit: 2949c09e715ec902374eafb92892eb5df2cd32bc
      https://github.com/zanata/zanata-server/commit/2949c09e715ec902374eafb92892eb5df2cd32bc
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-17 (Tue, 17 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Change the way we wait for errors in tests


  Commit: 542f564e9e099b225f4be17c3b7bbb3888af234e
      https://github.com/zanata/zanata-server/commit/542f564e9e099b225f4be17c3b7bbb3888af234e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Fix bookmarked url not working
https://bugzilla.redhat.com/show_bug.cgi?id=1193699

Squashed commit of the following:

commit d7bd79450d4006581782019a05791441744269b0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 18 08:32:37 2015 +1000

    Fix bookmarked url not working - https://bugzilla.redhat.com/show_bug.cgi?id=1193699


  Commit: c32305a3d01e90a05be88909e4d7e45cbbc7119b
      https://github.com/zanata/zanata-server/commit/c32305a3d01e90a05be88909e4d7e45cbbc7119b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 62414b66bfa4b2de32b5b4b4ff8253e6ccc36742
      https://github.com/zanata/zanata-server/commit/62414b66bfa4b2de32b5b4b4ff8253e6ccc36742
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Wait for AJAX validation


  Commit: a46fb537f25fa773f8a0cb16e7310eee4b36c3d3
      https://github.com/zanata/zanata-server/commit/a46fb537f25fa773f8a0cb16e7310eee4b36c3d3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Wait for at least one notification message


  Commit: fd4300e62eab59f2672e4e4d4ac5ced7c350e2a4
      https://github.com/zanata/zanata-server/commit/fd4300e62eab59f2672e4e4d4ac5ced7c350e2a4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java

  Log Message:
  -----------
  Defocus each field after clearing it


  Commit: 4a2019594da3cb16180ddf59a8a304137000028d
      https://github.com/zanata/zanata-server/commit/4a2019594da3cb16180ddf59a8a304137000028d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Clear document statistic cache when uploading from client
https://bugzilla.redhat.com/show_bug.cgi?id=1192271

Squashed commit of the following:

commit f0c7fe931e77074103371e59cdea0c8806650ddb
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 16 16:22:13 2015 +1000

    clear document statistic cache when uploading from client: https://bugzilla.redhat.com/show_bug.cgi?id=1192271


  Commit: 17c6646608c6920fab8964b22e3ce654617f79b7
      https://github.com/zanata/zanata-server/commit/17c6646608c6920fab8964b22e3ce654617f79b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 37c3344253f831b16925b0ff19061f2f98a4b06e
      https://github.com/zanata/zanata-server/commit/37c3344253f831b16925b0ff19061f2f98a4b06e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Avoid debug config when stopping cargo

This should prevent the following error at the end of test run:

[INFO] [talledLocalContainer] FATAL ERROR in native method: JDWP No transports initialized, jvmtiError=AGENT_ERROR_TRANSPORT_INIT(197)
[WARNING] [talledLocalContainer] ERROR: transport error 202: bind failed: Address already in use
[WARNING] [talledLocalContainer] ERROR: JDWP Transport dt_socket failed to initialize, TRANSPORT_INIT(510)
[WARNING] [talledLocalContainer] JDWP exit error AGENT_ERROR_TRANSPORT_INIT(197): No transports initialized [../../../src/share/back/debugInit.c:741]


  Commit: 61e28424edc21d1366b62ec34a3884d1ac591022
      https://github.com/zanata/zanata-server/commit/61e28424edc21d1366b62ec34a3884d1ac591022
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Allow 'no tests' when -Dit.test is used


  Commit: 81054b713c3d9b1e1962915188c8d40c6513c0b5
      https://github.com/zanata/zanata-server/commit/81054b713c3d9b1e1962915188c8d40c6513c0b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement customise language display name
https://bugzilla.redhat.com/show_bug.cgi?id=1169662

Squashed commit of the following:

commit 8a72ed3dfddee2a89cabe62a02df1cfd4f8862bb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 19:24:09 2015 +1000

    Implement customise language display name
    https://bugzilla.redhat.com/show_bug.cgi?id=1169662


  Commit: b319ce824c4fd49ce86b2814f17977b2bb16eae8
      https://github.com/zanata/zanata-server/commit/b319ce824c4fd49ce86b2814f17977b2bb16eae8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  Fix global messages in password reset page
https://bugzilla.redhat.com/show_bug.cgi?id=1191779

Squashed commit of the following:

commit 5aa8e22358bb84498dc566faeb43635d5bdf3212
Merge: 9be6611 a828049
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 17 14:54:32 2015 +1000

    Merge branch 'integration/master' into rhbz1191779

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java

commit 9be6611801a09407879af1b8bf8eed2b466814d4
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 13:59:17 2015 +1000

    Fix global messages in password reset page: https://bugzilla.redhat.com/show_bug.cgi?id=1191779


  Commit: b07873274d76165b9cd4d4358d1c27a0d87fc842
      https://github.com/zanata/zanata-server/commit/b07873274d76165b9cd4d4358d1c27a0d87fc842
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Fix generate api issue
https://bugzilla.redhat.com/show_bug.cgi?id=119359

Squashed commit of the following:

commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 20 10:39:10 2015 +1000

    Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597


  Commit: d22d4432651da7bad8139ee736edaa7f045fb2d2
      https://github.com/zanata/zanata-server/commit/d22d4432651da7bad8139ee736edaa7f045fb2d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 7a2a35d3d1799d514828fb12d3941f225308f02c
      https://github.com/zanata/zanata-server/commit/7a2a35d3d1799d514828fb12d3941f225308f02c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Log Message:
  -----------
  Add ability to wait for new page to load


  Commit: 5268b778530463e894b68f4ec5be10f7ca5cef9d
      https://github.com/zanata/zanata-server/commit/5268b778530463e894b68f4ec5be10f7ca5cef9d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html

  Log Message:
  -----------
  Add script to help with page load detection


  Commit: 58a21012fe86262b2c4a1b676ee7227759f5e2ce
      https://github.com/zanata/zanata-server/commit/58a21012fe86262b2c4a1b676ee7227759f5e2ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    A zanata-war/src/main/webapp/resources/script/finished.js

  Log Message:
  -----------
  Use deferred script for better testing accuracy


  Commit: a3e7763531fe17385d562d6a5ec3a066b5917748
      https://github.com/zanata/zanata-server/commit/a3e7763531fe17385d562d6a5ec3a066b5917748
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Update expected error message


  Commit: 79fbac57284db84fa4caa6fd8b83da3145766afa
      https://github.com/zanata/zanata-server/commit/79fbac57284db84fa4caa6fd8b83da3145766afa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Merge pull request #699 from zanata/fix-broken-password-tests

Fix validation messages for password reset


  Commit: 59a0b5f347cb8bb52531fb9ecc909221e81cecd8
      https://github.com/zanata/zanata-server/commit/59a0b5f347cb8bb52531fb9ecc909221e81cecd8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: zanata-api version to 3.6.0


  Commit: 79dff1996867f15ca58365c311a5770096b02ba7
      https://github.com/zanata/zanata-server/commit/79dff1996867f15ca58365c311a5770096b02ba7
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Fix security functional test error


  Commit: 848ec39ca8bdeb81b587d8563e1e52a683e0bba2
      https://github.com/zanata/zanata-server/commit/848ec39ca8bdeb81b587d8563e1e52a683e0bba2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Merge pull request #701 from zanata/fix-invalidresetpassword-test

Fix security functional test error


  Commit: 8deed904a4d9e7a99b89c9d2656b9c024d4500f0
      https://github.com/zanata/zanata-server/commit/8deed904a4d9e7a99b89c9d2656b9c024d4500f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update parent version


  Commit: 3b0d55a8d4113479be77d0e9c667e9c4ef017066
      https://github.com/zanata/zanata-server/commit/3b0d55a8d4113479be77d0e9c667e9c4ef017066
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java

  Log Message:
  -----------
  Fix password reset with null pointer exception

Squashed commit of the following:

commit 4d6467768326f236379b302a80567bc5f93de6dc
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 24 10:38:19 2015 +1000

    Fix password reset with null pointer exception


  Commit: f57207b299ec138bee32388da8da5197d657f7fd
      https://github.com/zanata/zanata-server/commit/f57207b299ec138bee32388da8da5197d657f7fd
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "pom.xml: zanata-api version to 3.6.0"

This reverts commit 59a0b5f347cb8bb52531fb9ecc909221e81cecd8.


  Commit: e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
      https://github.com/zanata/zanata-server/commit/e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix pom.xml


  Commit: b95cca564b085bb7d5ec99a725bbdbbbd008f49f
      https://github.com/zanata/zanata-server/commit/b95cca564b085bb7d5ec99a725bbdbbbd008f49f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'release' into cache-downloads


  Commit: b23fc52284e9bf7db48975bc535ff850e4b903b6
      https://github.com/zanata/zanata-server/commit/b23fc52284e9bf7db48975bc535ff850e4b903b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge pull request #693 from zanata/eap633

Warn if EAP version < 6.3.3


  Commit: 8dc5e95a27b63ede8b0da707e26a10fe1b90d873
      https://github.com/zanata/zanata-server/commit/8dc5e95a27b63ede8b0da707e26a10fe1b90d873
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #686 from zanata/cache-downloads

Cache downloaded wildfly modules to ~/Downloads


  Commit: 009a0ddec84ebfea66fe9b494eaed84f96029310
      https://github.com/zanata/zanata-server/commit/009a0ddec84ebfea66fe9b494eaed84f96029310
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	pom.xml


  Commit: d3660bbdccaa682a51e257fee4f5a71c389c069a
      https://github.com/zanata/zanata-server/commit/d3660bbdccaa682a51e257fee4f5a71c389c069a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Fix failed functional test


  Commit: 7b339d81fe6393fe3c87ea2977fbf784d65c90e6
      https://github.com/zanata/zanata-server/commit/7b339d81fe6393fe3c87ea2977fbf784d65c90e6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java

  Log Message:
  -----------
  Fix MultiFileUploadTest.removeFileFromUploadList


  Commit: de4737af69432f0d4ba8aff846510eafed749f5d
      https://github.com/zanata/zanata-server/commit/de4737af69432f0d4ba8aff846510eafed749f5d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java

  Log Message:
  -----------
  Merge branch 'fix-MultiFileUploadTest' into fix-functional-test


  Commit: afc9708f7f66ff8c93e328b69c60aaac926eda8c
      https://github.com/zanata/zanata-server/commit/afc9708f7f66ff8c93e328b69c60aaac926eda8c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/fix-functional-test' into reduce-boms

Conflicts:
	functional-test/src/main/java/org/zanata/page/AbstractPage.java
	functional-test/src/main/java/org/zanata/page/CorePage.java
	functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
	functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
	functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
	functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java


  Commit: ee0c8ecd3cc2eae120340f74b17da71238790161
      https://github.com/zanata/zanata-server/commit/ee0c8ecd3cc2eae120340f74b17da71238790161
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #702 from zanata/fix-functional-test

Fix failed functional test


  Commit: 90758c22c904837577b07260bf93b227d71dc494
      https://github.com/zanata/zanata-server/commit/90758c22c904837577b07260bf93b227d71dc494
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Fix AjaxCounterBean


  Commit: 65445c90dc9be20e36025646eaafb1e0c7c3dada
      https://github.com/zanata/zanata-server/commit/65445c90dc9be20e36025646eaafb1e0c7c3dada
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M .gitignore
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml

  Log Message:
  -----------
  Fix the <script> tag for finished.js


  Commit: f4531d0c78f3b1f22ea32550303b50675035ae60
      https://github.com/zanata/zanata-server/commit/f4531d0c78f3b1f22ea32550303b50675035ae60
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java

  Log Message:
  -----------
  Retry test cleanup


  Commit: a83084c5d10b77bc1f70363761ebc86ef7912d52
      https://github.com/zanata/zanata-server/commit/a83084c5d10b77bc1f70363761ebc86ef7912d52
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-25 (Wed, 25 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Enable browser logging after each test


  Commit: 071d3b0ce41bc90c1276e6577337786eaaa5904c
      https://github.com/zanata/zanata-server/commit/071d3b0ce41bc90c1276e6577337786eaaa5904c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java

  Log Message:
  -----------
  Clean up


  Commit: 130579a8fedc9b1a466468a9977e07a690753720
      https://github.com/zanata/zanata-server/commit/130579a8fedc9b1a466468a9977e07a690753720
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    R zanata-war/src/main/webapp/resources/script/finished.js
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Tidy up finished.js


  Commit: db94455f1a424ccd23419d275a9d7d7db643566d
      https://github.com/zanata/zanata-server/commit/db94455f1a424ccd23419d275a9d7d7db643566d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Merge pull request #685 from zanata/reduce-boms

Eliminate all BOMs except jboss-javaee-6.0


  Commit: 2807aefce38ca7210e4ac4f4cac761e9f6eace2c
      https://github.com/zanata/zanata-server/commit/2807aefce38ca7210e4ac4f4cac761e9f6eace2c
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-02-27 (Fri, 27 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    A etc/scripts/cargowait.sh
    A etc/scripts/functional-test-db-snapshot.sh
    A etc/scripts/standalone.cli.messaging.config
    A functional-test/etc/mysql-socket.groovy
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TableRow.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    R functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/document/FileTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    A functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    R zanata-dist/etc/assembly.xml
    R zanata-dist/etc/sql/config_setup.sql
    R zanata-dist/pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-model/src/test/resources/log4j.xml
    A zanata-overlay/.gitignore
    A zanata-overlay/build.gradle
    A zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    A zanata-overlay/common/bin/zanata-installer/install.bat
    A zanata-overlay/common/bin/zanata-installer/install.sh
    A zanata-overlay/common/bin/zanata-installer/installer.properties
    A zanata-overlay/config/remote-deps.groovy
    A zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    A zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/config/AsyncConfig.java
    A zanata-war/src/main/java/org/zanata/config/ConfigStore.java
    A zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/java/org/zanata/email/LanguageTeamPermissionChangeEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    A zanata-war/src/main/java/org/zanata/notification/DeadLetterQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/EmailQueueMessageReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/ExpiryQueueReceiver.java
    A zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    A zanata-war/src/main/java/org/zanata/notification/MessageUnwrapper.java
    A zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Login Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/Service Manager.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kappfinder.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/ksysv.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/personal.png
    R zanata-war/src/main/resources/images/openid/myopenid.png
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/language_team_permission_changed.vm
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/ejb-jar.xml
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-ejb3.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    R zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/css/libs.css
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    R zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/test/finished.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/ForceLoadClass.java
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/config/AsyncConfigTest.java
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/seam/MethodComponentAccessor.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/validator/SlugValidatorTest.java
    A zanata-war/src/test/java/org/zanata/validator/UsernameValidationTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    M zanata-war/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into infinispan

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java


Compare: https://github.com/zanata/zanata-server/compare/8d9862f84ceb...2807aefce38c


More information about the zanata-commits mailing list