[zanata/zanata-server] 0bad9f: User Registration tests

Tue Jul 16 22:01:22 UTC 2013

  Branch: refs/heads/rhbz981067
  Home:   https://github.com/zanata/zanata-server
  Commit: 0bad9feb50c94fe490cecb4c909b104875c57b3d
      https://github.com/zanata/zanata-server/commit/0bad9feb50c94fe490cecb4c909b104875c57b3d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  User Registration tests

Currently, successful registration testing is blocked by Captcha validation.
Includes register page, and testcases for field validation on usernames and
email RFC2822 compliance.
Basic validation for password matching and Captcha rejection.

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

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

  Log Message:
  -----------
  Better description of the RFC2822 class

The description was lacking / inaccurate.

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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/RFC2822NegativeTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RFC2822PositiveTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java

  Log Message:
  -----------
  Make RFC2822 and username tests use Theories rather than loops

Control functions (for, if, etc) in tests are bad. The (experimental) Therories
class looks to handle data based tests quite elegantly.
Move username and email validation to separate classes to test.
Also, fix minor bug in GlossaryTestSuite (database reset rules) and
give the Register tests a waitFor for the fields/errors to become visible,
to prevent element stale / not found problems.

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

  Changed paths:
    R functional-test/src/main/java/org/zanata/util/RFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RFC2822NegativeTest.java
    R functional-test/src/test/java/org/zanata/feature/account/RFC2822PositiveTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  Improve the RFC2822 files to be more descriptive and clean

Split email addresses into valid and non-valid.
Use an enum for the address entries.
Improve docs.

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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    M functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java

  Log Message:
  -----------
  Fix some line length and function calls

Function calls (specifically new BasicWorkFlow) replaced.
Wrapped some long lines.

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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update xom version for server

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

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  Update formatter rules, particularly: Never join already wrapped lines

  Commit: 3174b234ab15bcf4a15b27640744d1a88d98e9a4
      https://github.com/zanata/zanata-server/commit/3174b234ab15bcf4a15b27640744d1a88d98e9a4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java

  Log Message:
  -----------
  rhbz983373 - de-reference obsolete variable when context change

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

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #45 from zanata/update-xom

Update xom version for server

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Merge pull request #47 from zanata/rhbz983373-2

Implement fix for bug: https://bugzilla.redhat.com/show_bug.cgi?id=983373

  Commit: 80a361221c1915bc3314692d9dbc148ef24315e2
      https://github.com/zanata/zanata-server/commit/80a361221c1915bc3314692d9dbc148ef24315e2
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge commit '927db71ba400871a8d913e9cf60f384a5b8f7d2d' into HEAD

  Commit: bf195b65f9fcdca5c1ed8ce527a749b6e0736f70
      https://github.com/zanata/zanata-server/commit/bf195b65f9fcdca5c1ed8ce527a749b6e0736f70
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Merge pull request #31 from zanata/register-functional-tests

User Registration tests

  Commit: bc81b3eac8c2856a68331198b4d3b035d7a483b7
      https://github.com/zanata/zanata-server/commit/bc81b3eac8c2856a68331198b4d3b035d7a483b7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Merge commit 'bf195b65f9fcdca5c1ed8ce527a749b6e0736f70' into HEAD

  Commit: 2daf865ee2228f10d344d8b8a7ffa04be84f1959
      https://github.com/zanata/zanata-server/commit/2daf865ee2228f10d344d8b8a7ffa04be84f1959
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  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

  Log Message:
  -----------
  Allow the use of different displays for functional test

Using the DISPLAY variable allows a less "obnoxious" running of
tests in an Xserver, preventing popup windows and accidental
interaction with a running test environment.

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

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

  Log Message:
  -----------
  add wait until logic around dynamic field

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

  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

  Log Message:
  -----------
  Merge pull request #48 from zanata/run-xnest

Allow the use of different displays for functional test

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

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

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

add wait until logic around dynamic field

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

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  sort eclipse formatting rules to enhance future diffs

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

  Changed paths:
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml

  Log Message:
  -----------
  Merge pull request #46 from zanata/modified-formatter

Update formatter rules, particularly: Never join already wrapped lines

  Commit: 521a30e300763ebcc4160cda6b93e3c9091df3d8
      https://github.com/zanata/zanata-server/commit/521a30e300763ebcc4160cda6b93e3c9091df3d8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java

  Commit: ddb3a3b72db48ad8426ccfbcc2617890121345b9
      https://github.com/zanata/zanata-server/commit/ddb3a3b72db48ad8426ccfbcc2617890121345b9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

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

  Log Message:
  -----------
  refactor code as suggested

  Commit: 0eda6426fcbc5090f9f602e8d174ee41224c13cd
      https://github.com/zanata/zanata-server/commit/0eda6426fcbc5090f9f602e8d174ee41224c13cd
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.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/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz981067' of github.com:zanata/zanata-server into rhbz981067

Compare: https://github.com/zanata/zanata-server/compare/32123ed8ea58...0eda6426fcbc