[zanata/zanata-server] fc79d1: Change Password Tests

GitHub noreply at github.com
Fri Aug 2 05:31:07 UTC 2013 

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: fc79d16abd43e1d4e0b2199ce19784651a291831
      https://github.com/zanata/zanata-server/commit/fc79d16abd43e1d4e0b2199ce19784651a291831
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Change Password Tests

Detailed tests for changing of an account password.
Uses Rule, rather than ClassRule, for resetting the database
between test functions.
Also rename Register to Account tests/suites, and the 'full'
is unnecessary.


  Commit: 6515af7f5807fae5c6e6fb705c395c7fbac7e757
      https://github.com/zanata/zanata-server/commit/6515af7f5807fae5c6e6fb705c395c7fbac7e757
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Add password change length test


  Commit: 304a80a595a46927e8485c676902ee06153b2ab4
      https://github.com/zanata/zanata-server/commit/304a80a595a46927e8485c676902ee06153b2ab4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

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

  Log Message:
  -----------
  Use some better names in password tests


  Commit: 1c2e1c7b94dde130c01997ff43d228f8a8394717
      https://github.com/zanata/zanata-server/commit/1c2e1c7b94dde130c01997ff43d228f8a8394717
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Clean up the chaining of function calls


  Commit: 137ebb7375e8cc1c4aaaf2e182275b502837526c
      https://github.com/zanata/zanata-server/commit/137ebb7375e8cc1c4aaaf2e182275b502837526c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  rhbz980658 add liquibase param for document storage directory migration


  Commit: 4f1b4259a19327bd4798dbaf698a7092857ae399
      https://github.com/zanata/zanata-server/commit/4f1b4259a19327bd4798dbaf698a7092857ae399
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Alter test code for consistency and readability


  Commit: a8b27039325d7397bee2363b3b9067ff72e90732
      https://github.com/zanata/zanata-server/commit/a8b27039325d7397bee2363b3b9067ff72e90732
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Add placeholder methods for TranslationMemory REST service


  Commit: 7bca5e200f4a498d8e0f25d89b8da7aa7739fb7f
      https://github.com/zanata/zanata-server/commit/7bca5e200f4a498d8e0f25d89b8da7aa7739fb7f
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java

  Log Message:
  -----------
  Merge pull request #79 from zanata/tm-placeholders

Add placeholder methods for TranslationMemory REST service


  Commit: e8b2e3e8c7b031e78875072c219cd143b5a239b7
      https://github.com/zanata/zanata-server/commit/e8b2e3e8c7b031e78875072c219cd143b5a239b7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Merge pull request #75 from zanata/change-password-tests

Change Password Tests


  Commit: 044c5d67bff9efdcca6e6c2e8f74da2ca67197c7
      https://github.com/zanata/zanata-server/commit/044c5d67bff9efdcca6e6c2e8f74da2ca67197c7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  rhbz980658 update changelog


  Commit: 408c41c7a593f538143661c459f90489375bd40f
      https://github.com/zanata/zanata-server/commit/408c41c7a593f538143661c459f90489375bd40f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-28 (Sun, 28 Jul 2013)

  Changed paths:
    M CHANGELOG.md
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  Merge pull request #77 from zanata/isolate-file-storage

Add liquibase param for document storage directory migration


  Commit: 15558edcb47472072d4142c891e63520bae1d258
      https://github.com/zanata/zanata-server/commit/15558edcb47472072d4142c891e63520bae1d258
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  fix ConcurrentModificationException triggered by jsf

- refactoring
- fix an issue where a field blur event in jsf triggers an ajax validation call, while another selenium action triggers another server call, the server will in error state


  Commit: 23a8ea970317e6ba96ebe08cf4052dba97957649
      https://github.com/zanata/zanata-server/commit/23a8ea970317e6ba96ebe08cf4052dba97957649
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

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

  Log Message:
  -----------
  fix functional cargo deployment after file storage changelog change


  Commit: e26c3bf7257ded45abdd7dcabd0b46833096e70b
      https://github.com/zanata/zanata-server/commit/e26c3bf7257ded45abdd7dcabd0b46833096e70b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

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

  Log Message:
  -----------
  rename methods and add javadoc


  Commit: ca2d55a8d587843224d407b526a291c1b61b3c0d
      https://github.com/zanata/zanata-server/commit/ca2d55a8d587843224d407b526a291c1b61b3c0d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  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/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml

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

fix ConcurrentModificationException triggered by jsf


  Commit: 5be9d28429a58bdc56823276678810a93389b77c
      https://github.com/zanata/zanata-server/commit/5be9d28429a58bdc56823276678810a93389b77c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  delete old exploded deployment before redeploy


  Commit: 930aee17123121e40cc87b6c97f57f03fdf56e13
      https://github.com/zanata/zanata-server/commit/930aee17123121e40cc87b6c97f57f03fdf56e13
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-29 (Mon, 29 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #82 from zanata/exploded-deploy

delete old exploded deployment before redeploy


  Commit: db0bba41577638db2cd7a60bea3868282eb6986e
      https://github.com/zanata/zanata-server/commit/db0bba41577638db2cd7a60bea3868282eb6986e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  Fix reset password test

An unstable behaviour of the reset password form results in either
one of two error messages showing, so expect one or the other.


  Commit: f230fc64f7ecae62dea5d96407f5d80c13b4b45b
      https://github.com/zanata/zanata-server/commit/f230fc64f7ecae62dea5d96407f5d80c13b4b45b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

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

  Log Message:
  -----------
  Merge pull request #83 from zanata/fix-reset-password-test

Fix reset password test


  Commit: bcbb271424347d4231c5e82a9e541d20c26a64dd
      https://github.com/zanata/zanata-server/commit/bcbb271424347d4231c5e82a9e541d20c26a64dd
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

  Log Message:
  -----------
  Added new classes and tweaks to history UI


  Commit: d73beb72e54f7bc38d9ed1a6b6460f7153b5f3c1
      https://github.com/zanata/zanata-server/commit/d73beb72e54f7bc38d9ed1a6b6460f7153b5f3c1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-30 (Tue, 30 Jul 2013)

  Changed paths:
    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

  Log Message:
  -----------
  separate icon for review and tranlate entries


  Commit: 6ea385d4becd91fc526d1cdff7d14965b90990bb
      https://github.com/zanata/zanata-server/commit/6ea385d4becd91fc526d1cdff7d14965b90990bb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

  Log Message:
  -----------
  fix database script in functional test


  Commit: 63185e448cc300a3fb4ecf7d7cd16984544b69c9
      https://github.com/zanata/zanata-server/commit/63185e448cc300a3fb4ecf7d7cd16984544b69c9
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java

  Log Message:
  -----------
  ensure sign out before register test


  Commit: d891da9bf4ee37829e44f9123463e8c0c56d0bcb
      https://github.com/zanata/zanata-server/commit/d891da9bf4ee37829e44f9123463e8c0c56d0bcb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

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

  Log Message:
  -----------
  move admin visible elements out of annotated fields


  Commit: b85f72decb188eb1fdc5fb76da5354a0ae05113a
      https://github.com/zanata/zanata-server/commit/b85f72decb188eb1fdc5fb76da5354a0ae05113a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  change tests that go to registration page delete cookies first(sign out)


  Commit: a07a9f1e88423e12f7172407da9f6a03074b047d
      https://github.com/zanata/zanata-server/commit/a07a9f1e88423e12f7172407da9f6a03074b047d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-31 (Wed, 31 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql

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

fix functional test


  Commit: 3c4502b60e16fcb8e1ac2d94e18428bc3feff59a
      https://github.com/zanata/zanata-server/commit/3c4502b60e16fcb8e1ac2d94e18428bc3feff59a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    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/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml

  Log Message:
  -----------
  Merge pull request #86 from zanata/translation-history-tweaks

Translation history tweaks


  Commit: 58178363591d154fa2207d36aa9a9eb3498c5f24
      https://github.com/zanata/zanata-server/commit/58178363591d154fa2207d36aa9a9eb3498c5f24
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

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

  Log Message:
  -----------
  web driver delete cookies and also refresh page


  Commit: 221722a05fa3dbec11c63039b7280412ad4ee71a
      https://github.com/zanata/zanata-server/commit/221722a05fa3dbec11c63039b7280412ad4ee71a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

  Log Message:
  -----------
  rename method


  Commit: 5fec7d8d4b42c2d9373903071d013d03f250115b
      https://github.com/zanata/zanata-server/commit/5fec7d8d4b42c2d9373903071d013d03f250115b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java

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

Fix functional test


  Commit: 27bd89895a7bd14f8ff952606455d0ab1ed09cb8
      https://github.com/zanata/zanata-server/commit/27bd89895a7bd14f8ff952606455d0ab1ed09cb8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    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
    A functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/MyAccountPage.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/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/util/DatabaseHelper.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    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/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java


Compare: https://github.com/zanata/zanata-server/compare/860f62f3952f...27bd89895a7b

More information about the zanata-commits mailing list