[zanata/zanata-server] 185d04: Update UI for the sorting options in list (groups ...

Tue Feb 11 03:01:37 UTC 2014

  Branch: refs/heads/project-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 185d04842295f7e98fd1e8711f0c0d81e54b11e6
      https://github.com/zanata/zanata-server/commit/185d04842295f7e98fd1e8711f0c0d81e54b11e6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/resources/script/component-autocomplete.js
    A zanata-war/src/main/webapp/resources/script/script.js
    A zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Update UI for the sorting options in list (groups page)


  Commit: 58cd14859547c7b32e8363e6c7f1b775bb40585c
      https://github.com/zanata/zanata-server/commit/58cd14859547c7b32e8363e6c7f1b775bb40585c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/script/script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml

  Log Message:
  -----------
  Fix checkstyle, remove unused file


  Commit: 30c0f4dc6a3da9eba615edb1a9802e194a077493
      https://github.com/zanata/zanata-server/commit/30c0f4dc6a3da9eba615edb1a9802e194a077493
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/sample-projects/plural/pl/test.po
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java

  Log Message:
  -----------
  add functional test for plural push and pull


  Commit: 1fc5dcf3d18cf5b57a0db3d4d28eec7dbfde437d
      https://github.com/zanata/zanata-server/commit/1fc5dcf3d18cf5b57a0db3d4d28eec7dbfde437d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java

  Log Message:
  -----------
  add functional test for gettext plural push and pull


  Commit: b7c3615ff24cf80f5c7c971df14dd6c981ee388d
      https://github.com/zanata/zanata-server/commit/b7c3615ff24cf80f5c7c971df14dd6c981ee388d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java

  Log Message:
  -----------
  add functional test for properties push and pull


  Commit: fc4618f5840dc929ee81d618956d27544d592718
      https://github.com/zanata/zanata-server/commit/fc4618f5840dc929ee81d618956d27544d592718
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  fix dependency problem


  Commit: 4a04424ed4c989835662db4df989beb48f76e61f
      https://github.com/zanata/zanata-server/commit/4a04424ed4c989835662db4df989beb48f76e61f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    R functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html

  Log Message:
  -----------
  remove test that is covered in other test


  Commit: 2e2aa3dddab93b57bde249fc31a1422a19b80110
      https://github.com/zanata/zanata-server/commit/2e2aa3dddab93b57bde249fc31a1422a19b80110
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  automate obsolete text test as in TCMS 137717


  Commit: 31205feb41ca7b0583fa112de2c5d7a70630dd98
      https://github.com/zanata/zanata-server/commit/31205feb41ca7b0583fa112de2c5d7a70630dd98
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

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

  Log Message:
  -----------
  make firefox driver also works with screenshot


  Commit: 54a3d81793e2e22e45bbcfdcd52c9e9abf0f2e13
      https://github.com/zanata/zanata-server/commit/54a3d81793e2e22e45bbcfdcd52c9e9abf0f2e13
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    A functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/setup.properties
    M zanata-war/src/main/webapp/help/contact_admin.xhtml

  Log Message:
  -----------
  add email testing infrastructure and add test


  Commit: f0d4c54fa6524bd2fee4c41812500d0c739525c6
      https://github.com/zanata/zanata-server/commit/f0d4c54fa6524bd2fee4c41812500d0c739525c6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java

  Log Message:
  -----------
  fix after rebase


  Commit: 518ca3f5d6a450a1cd3eb180b08d7b2368324a9d
      https://github.com/zanata/zanata-server/commit/518ca3f5d6a450a1cd3eb180b08d7b2368324a9d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  fix enforcer violation


  Commit: 907964cc2fc0ab0b582b8f4b89fbbe2dfe9299a1
      https://github.com/zanata/zanata-server/commit/907964cc2fc0ab0b582b8f4b89fbbe2dfe9299a1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.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/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.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/misc/ContactAdminTest.java

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


  Commit: 31b2bbe4b252578b61759290ab71b15a31cb419e
      https://github.com/zanata/zanata-server/commit/31b2bbe4b252578b61759290ab71b15a31cb419e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    R zanata-war/src/main/webapp/resources/script/component-autocomplete.js
    A zanata-war/src/main/webapp/resources/script/components-script.js
    R zanata-war/src/main/webapp/resources/script/script.js
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Implement suggested changes from code review


  Commit: 2d9b08c24c588c9e22f08f1ec4ef9bb545749197
      https://github.com/zanata/zanata-server/commit/2d9b08c24c588c9e22f08f1ec4ef9bb545749197
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java

  Log Message:
  -----------
  fix functional test


  Commit: 77b98988e2dd27b6d4a1a6d4d847433597882d92
      https://github.com/zanata/zanata-server/commit/77b98988e2dd27b6d4a1a6d4d847433597882d92
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.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/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    A functional-test/src/test/java/org/zanata/util/HasEmailRule.java

  Log Message:
  -----------
  add new method to click on buttons and fix tests after email port change


  Commit: 5fa8a8c377ec82e4caeb5b73f668fc4ba1520cc5
      https://github.com/zanata/zanata-server/commit/5fa8a8c377ec82e4caeb5b73f668fc4ba1520cc5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-09 (Sun, 09 Feb 2014)

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

  Log Message:
  -----------
  Update loading component


  Commit: 132122e5c596cf24eb1ce652ad353af4188a4ace
      https://github.com/zanata/zanata-server/commit/132122e5c596cf24eb1ce652ad353af4188a4ace
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  fix translators count in admin stats page, update admin stats ui


  Commit: f3baa9dc2dbce08765b98c9e57b967d4c6b63da2
      https://github.com/zanata/zanata-server/commit/f3baa9dc2dbce08765b98c9e57b967d4c6b63da2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

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

  Log Message:
  -----------
  Remove unuse commented lines


  Commit: c4b2596c38694e1e09cdbeea80d707731094aa66
      https://github.com/zanata/zanata-server/commit/c4b2596c38694e1e09cdbeea80d707731094aa66
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java

  Log Message:
  -----------
  refactor


  Commit: 53f2313c2018addcf6faa6991f18f36689905f4f
      https://github.com/zanata/zanata-server/commit/53f2313c2018addcf6faa6991f18f36689905f4f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  Merge pull request #365 from zanata/rhbz1062011

fix translators count in admin stats page, update admin stats ui


  Commit: 7d2ade0fddebf301c2c1426d20fcb129a35476b4
      https://github.com/zanata/zanata-server/commit/7d2ade0fddebf301c2c1426d20fcb129a35476b4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    R zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  1) Include version details in request to join group email: https://bugzilla.redhat.com/show_bug.cgi?id=1060970
2) Change of wording in confirmation email: https://bugzilla.redhat.com/show_bug.cgi?id=1060959


  Commit: 497774147327b97c7529ec1bbb7a246eb54d018f
      https://github.com/zanata/zanata-server/commit/497774147327b97c7529ec1bbb7a246eb54d018f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

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

  Log Message:
  -----------
  Update copyright notice - remove extra astericks


  Commit: e02ecdb64a5d461a1b903b2fa814222e278b31c7
      https://github.com/zanata/zanata-server/commit/e02ecdb64a5d461a1b903b2fa814222e278b31c7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java

  Log Message:
  -----------
  update test a bit


  Commit: e70601a890cb77afc9fd156be0e07aec263ca0cd
      https://github.com/zanata/zanata-server/commit/e70601a890cb77afc9fd156be0e07aec263ca0cd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    R zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge pull request #366 from zanata/rhbz1060970

Include version details in request to join group email, change of wording


  Commit: 70c25df73d59fb26e5cf67d84fffde23db365048
      https://github.com/zanata/zanata-server/commit/70c25df73d59fb26e5cf67d84fffde23db365048
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/resources/script/component-autocomplete.js
    A zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    A zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #364 from zanata/sort-menu-update

Update UI for the sorting options in list (groups page)


  Commit: 14576f51e2700c0454e54234669608ee9ee994b4
      https://github.com/zanata/zanata-server/commit/14576f51e2700c0454e54234669608ee9ee994b4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/sample-projects/plural/pl/test.po
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    A functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.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/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.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/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.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
    A functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    R functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    A functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/setup.properties
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #353 from zanata/gettext-plural-ft

Automate TCMS test cases as functional test


  Commit: 5fd9d62efd7b559b9514406a718c31ede6f384ea
      https://github.com/zanata/zanata-server/commit/5fd9d62efd7b559b9514406a718c31ede6f384ea
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/sample-projects/plural/pl/test.po
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    A functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/page/webtrans/Plurals.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.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/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.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/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.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
    A functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    R functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/setup.properties
    M zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/action/AdminStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    R zanata-war/src/main/webapp/resources/script/component-autocomplete.js
    A zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    R zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into project-page

Conflicts:
	zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
	zanata-war/src/main/java/org/zanata/action/SortingType.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
	zanata-war/src/main/webapp/iteration/view.xhtml
	zanata-war/src/main/webapp/resources/script/component-autocomplete.js
	zanata-war/src/main/webapp/resources/zanata/loader.xhtml
	zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
	zanata-war/src/main/webapp/version-group/version_group.xhtml


Compare: https://github.com/zanata/zanata-server/compare/b69520f8fdc5...5fd9d62efd7b