[zanata/zanata-server] f95143: fix Dialog 'Invalid translation' popup

GitHub noreply at github.com
Sun Jun 22 22:48:33 UTC 2014 

  Branch: refs/heads/rhbz1110048
  Home:   https://github.com/zanata/zanata-server
  Commit: f95143418a719778863b027e53985ca6f7fab200
      https://github.com/zanata/zanata-server/commit/f95143418a719778863b027e53985ca6f7fab200
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-03 (Tue, 03 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml

  Log Message:
  -----------
  fix Dialog 'Invalid translation' popup


  Commit: 50b145f108db607718eb919fc7b93e988022bc2b
      https://github.com/zanata/zanata-server/commit/50b145f108db607718eb919fc7b93e988022bc2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

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

  Log Message:
  -----------
  Merge branch 'release' into rhbz1103947


  Commit: e9a0929623be996026db63858cdac5a08d75a7ed
      https://github.com/zanata/zanata-server/commit/e9a0929623be996026db63858cdac5a08d75a7ed
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Remove unused images and seam component


  Commit: 88b998e926d54b84a3b33fd7fa9a7b6501ff1b92
      https://github.com/zanata/zanata-server/commit/88b998e926d54b84a3b33fd7fa9a7b6501ff1b92
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  cleanup of unused dependency


  Commit: 7aa7e94721f2d8b36aac51e84c1a96fe0c75cf15
      https://github.com/zanata/zanata-server/commit/7aa7e94721f2d8b36aac51e84c1a96fe0c75cf15
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  update jboss-deployment-structure


  Commit: a01965f65132c01973214e6057f1fcf3efd5ee44
      https://github.com/zanata/zanata-server/commit/a01965f65132c01973214e6057f1fcf3efd5ee44
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  remove version for hibernate-commons-annotations


  Commit: 94da9ae65ffe85c42f41379472b421fd40e6c8f7
      https://github.com/zanata/zanata-server/commit/94da9ae65ffe85c42f41379472b421fd40e6c8f7
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-04 (Wed, 04 Jun 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java

  Log Message:
  -----------
  Add a JBoss SSO Login module.


  Commit: 98ea6cd231e8709ed2ec6a7154800535249149f7
      https://github.com/zanata/zanata-server/commit/98ea6cd231e8709ed2ec6a7154800535249149f7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-05 (Thu, 05 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  reorganise jboss-deployment


  Commit: be946277a66bcbe82d238b91a1edcb54913bc663
      https://github.com/zanata/zanata-server/commit/be946277a66bcbe82d238b91a1edcb54913bc663
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-10 (Tue, 10 Jun 2014)

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

  Log Message:
  -----------
  Add explicit dependencies.

JBoss SSO Login module code refactoring to bring it in line with other JAAS LoginModules.
Stop maven dependency plugin from failing the build.


  Commit: c343ba7ca150a15e0232d0a940cf09978bcc40d1
      https://github.com/zanata/zanata-server/commit/c343ba7ca150a15e0232d0a940cf09978bcc40d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java

  Log Message:
  -----------
  Allow firing of onValueChange from plain text area


  Commit: 8caaa8ce1b8bcfd36b9c69bb20977eef06521932
      https://github.com/zanata/zanata-server/commit/8caaa8ce1b8bcfd36b9c69bb20977eef06521932
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  replace spacing with <h:outputText value=


  Commit: 1bf222ab85177a50df95569cdacb12f188fdace4
      https://github.com/zanata/zanata-server/commit/1bf222ab85177a50df95569cdacb12f188fdace4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  add comment for hibernate-commons-annotations


  Commit: f5efbfbd56530692caeda23365162b7b09880378
      https://github.com/zanata/zanata-server/commit/f5efbfbd56530692caeda23365162b7b09880378
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java

  Log Message:
  -----------
  Add explicit serialVersionUID to subclasses of AbstractStatistic


  Commit: f92660147109ce9d8165d23d596b6c4952593c59
      https://github.com/zanata/zanata-server/commit/f92660147109ce9d8165d23d596b6c4952593c59
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java

  Log Message:
  -----------
  Fix position on textflow in editor after validation popup


  Commit: 642e2a7855ffee19c0b8830f8d8a33a1e876b956
      https://github.com/zanata/zanata-server/commit/642e2a7855ffee19c0b8830f8d8a33a1e876b956
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-11 (Wed, 11 Jun 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Clear ehcaches before and after each JPA test


  Commit: 2c5b438a816b0d2c3667144c0ca4c13acde06a06
      https://github.com/zanata/zanata-server/commit/2c5b438a816b0d2c3667144c0ca4c13acde06a06
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add iText for PDF/email support in JavaMelody


  Commit: 94cac7259a6e7d740fdd4c33822ca025d4e84e5d
      https://github.com/zanata/zanata-server/commit/94cac7259a6e7d740fdd4c33822ca025d4e84e5d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Moved Seam bom to be the last bom


  Commit: 06ad789f4ae8af1ca458ec0e282c351b550d68eb
      https://github.com/zanata/zanata-server/commit/06ad789f4ae8af1ca458ec0e282c351b550d68eb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-13 (Fri, 13 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  Mark more dependencies as provided


  Commit: 5efc86be8292828d2f9448250f3518b0df77467f
      https://github.com/zanata/zanata-server/commit/5efc86be8292828d2f9448250f3518b0df77467f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Add paging for manage user page: https://bugzilla.redhat.com/show_bug.cgi?id=1107882


  Commit: 4fde3caa207b47b43b14823eafe32565e5f44594
      https://github.com/zanata/zanata-server/commit/4fde3caa207b47b43b14823eafe32565e5f44594
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  Enable action drop down in version: https://bugzilla.redhat.com/show_bug.cgi?id=1109611


  Commit: 7fee48e2d51806d68c3641b6388143be48f9620d
      https://github.com/zanata/zanata-server/commit/7fee48e2d51806d68c3641b6388143be48f9620d
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Merge pull request #491 from zanata/rhbz1107882

Add paging for manage user page


  Commit: 21d6370e4c1fbed7421316cd1a92609070e3d0fb
      https://github.com/zanata/zanata-server/commit/21d6370e4c1fbed7421316cd1a92609070e3d0fb
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml

  Log Message:
  -----------
  Merge pull request #485 from zanata/rhbz1103947

fix Dialog 'Invalid translation' popup


  Commit: fa99636b34e5fb20cbbd8793ff4783eee2876f75
      https://github.com/zanata/zanata-server/commit/fa99636b34e5fb20cbbd8793ff4783eee2876f75
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Update and fix administration tests

- Use assertj instead of hamcrest
- remove change username test (invalid)
- add admin change user password test
- formatting cleanup


  Commit: 8df9a6a483c4192c655c6d137140312e58b066f4
      https://github.com/zanata/zanata-server/commit/8df9a6a483c4192c655c6d137140312e58b066f4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java

  Log Message:
  -----------
  add annotation and test run listener to enable recording zanata features


  Commit: d6297b849dc95b5641d4ea33fe5d5132f670bcc4
      https://github.com/zanata/zanata-server/commit/d6297b849dc95b5641d4ea33fe5d5132f670bcc4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-16 (Mon, 16 Jun 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java

  Log Message:
  -----------
  add support to record TCMS test case and plan


  Commit: f9bfda8c5f19a708e5fa2b32d7af400f1d965d74
      https://github.com/zanata/zanata-server/commit/f9bfda8c5f19a708e5fa2b32d7af400f1d965d74
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

  Log Message:
  -----------
  Merge branch 'release' into rhbz1109611


  Commit: f05859e94636cbc4046feeffc697e2481bf31cbe
      https://github.com/zanata/zanata-server/commit/f05859e94636cbc4046feeffc697e2481bf31cbe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

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

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


  Commit: cf2188e9aef2f78f5b47ed1160de8e6b5aaaa909
      https://github.com/zanata/zanata-server/commit/cf2188e9aef2f78f5b47ed1160de8e6b5aaaa909
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Use feature inventory on a per test basis

Add the Feature annotation to individual tests for validation
test of concept.

Also:
- stabilise the maintaner settings functions, as they were a
bit flaky
- better checks for the version link as, in some cases, the
Translate Options menu is detected instead


  Commit: aba2c63cb761f0779ae0961352fb83fcbc2f23eb
      https://github.com/zanata/zanata-server/commit/aba2c63cb761f0779ae0961352fb83fcbc2f23eb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

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

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


  Commit: cb8a130430989f27a564d0ef0ae325065fb4af1c
      https://github.com/zanata/zanata-server/commit/cb8a130430989f27a564d0ef0ae325065fb4af1c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.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
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #413 from zanata/feature-inventory

add annotation and test run listener to enable recording zanata features


  Commit: 65dfb90c81cd82a600716bc214bf1120d1c99694
      https://github.com/zanata/zanata-server/commit/65dfb90c81cd82a600716bc214bf1120d1c99694
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge remote branch 'origin/serialid-wordstat' into rhbz1067288


  Commit: 70c8d20891f3e9d3326ecfc056f649e1eee4297d
      https://github.com/zanata/zanata-server/commit/70c8d20891f3e9d3326ecfc056f649e1eee4297d
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml

  Log Message:
  -----------
  Merge pull request #492 from zanata/rhbz1109611

Enable action drop down in version


  Commit: 636dc1848d5df1478d9b2b8075b8d35294b042d9
      https://github.com/zanata/zanata-server/commit/636dc1848d5df1478d9b2b8075b8d35294b042d9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java


  Commit: 85c7bce5544fae49c81a7725274f6c7c42425db4
      https://github.com/zanata/zanata-server/commit/85c7bce5544fae49c81a7725274f6c7c42425db4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Merge pull request #494 from zanata/update-to-assertj-admin

Update and fix administration tests


  Commit: 2df53679d8c4c9600748818bac7328a272ab2a68
      https://github.com/zanata/zanata-server/commit/2df53679d8c4c9600748818bac7328a272ab2a68
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Move eventservice-rpc back to compile scope


  Commit: 421501dfef767db0ba2881836c36b3e3234ff1a2
      https://github.com/zanata/zanata-server/commit/421501dfef767db0ba2881836c36b3e3234ff1a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge pull request #490 from zanata/serialid-wordstat

Add explicit serialVersionUID to subclasses of AbstractStatistic


  Commit: 9555dad5722e4f87f0601117c941e3c0ed351db3
      https://github.com/zanata/zanata-server/commit/9555dad5722e4f87f0601117c941e3c0ed351db3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java

  Log Message:
  -----------
  Merge pull request #488 from zanata/jboss-sso

Add a JBoss SSO Login module.


  Commit: 23e5eed79d3933d053d65602dfb319adb4e713a6
      https://github.com/zanata/zanata-server/commit/23e5eed79d3933d053d65602dfb319adb4e713a6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A 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/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    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/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

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


  Commit: de5cb5a4141fd3daedca8a058249303412d774d8
      https://github.com/zanata/zanata-server/commit/de5cb5a4141fd3daedca8a058249303412d774d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Replace jcommander Lists with guava Lists


  Commit: f9d5c0a41dc5a580cc7c0497cad0255147bf4826
      https://github.com/zanata/zanata-server/commit/f9d5c0a41dc5a580cc7c0497cad0255147bf4826
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/Feature.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A 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/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    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/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java

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


  Commit: 8007166ae143d09992ab379853c52e25f241945a
      https://github.com/zanata/zanata-server/commit/8007166ae143d09992ab379853c52e25f241945a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Fix whitespace causing language list not loading: https://bugzilla.redhat.com/show_bug.cgi?id=1109653


  Commit: 02c2c47f3d6bc83130c4715d320dbc50a80d0806
      https://github.com/zanata/zanata-server/commit/02c2c47f3d6bc83130c4715d320dbc50a80d0806
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Remove unused import


  Commit: 14298a88c5be1d6dbdedf48d3987b622580cb032
      https://github.com/zanata/zanata-server/commit/14298a88c5be1d6dbdedf48d3987b622580cb032
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

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

  Log Message:
  -----------
  Update comments


  Commit: 20b007e67c05e8b69a8ab4b661adc53e89019839
      https://github.com/zanata/zanata-server/commit/20b007e67c05e8b69a8ab4b661adc53e89019839
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Merge pull request #501 from zanata/rhbz1109653

Fix whitespace causing language list not loading


  Commit: d3b41046ef626f130e323f47a4aaad4d5f4beed6
      https://github.com/zanata/zanata-server/commit/d3b41046ef626f130e323f47a4aaad4d5f4beed6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    R 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/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Remove unused page


  Commit: e07f565a75547f6e6a16bce149f390b21bb7c7df
      https://github.com/zanata/zanata-server/commit/e07f565a75547f6e6a16bce149f390b21bb7c7df
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

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


  Commit: eb8e744f325c706b24c1f31709bf4e336f096862
      https://github.com/zanata/zanata-server/commit/eb8e744f325c706b24c1f31709bf4e336f096862
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Fix Hibernate/H2 warnings in tests


  Commit: ebbaeca5dd9500a5a6f8698c62fb7034844b7dac
      https://github.com/zanata/zanata-server/commit/ebbaeca5dd9500a5a6f8698c62fb7034844b7dac
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge pull request #503 from zanata/fix-hibernate-h2-warnings

Fix Hibernate/H2 warnings in tests


  Commit: abab9590f1b412c1b8fb09cc2deae8c8f76e9a55
      https://github.com/zanata/zanata-server/commit/abab9590f1b412c1b8fb09cc2deae8c8f76e9a55
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

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


  Commit: dcde0a7fb937e4c75ccffd36d52ed8362b89732f
      https://github.com/zanata/zanata-server/commit/dcde0a7fb937e4c75ccffd36d52ed8362b89732f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java

  Log Message:
  -----------
  Add more sort options into version doc list: https://bugzilla.redhat.com/show_bug.cgi?id=1110959


  Commit: b2a10a06eea4571442b184d8312a9ac520726e92
      https://github.com/zanata/zanata-server/commit/b2a10a06eea4571442b184d8312a9ac520726e92
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.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/InactiveUserLoginTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  Convert to assertj and clean up Account tests

- Annotate feature inventory
- Replace hamcrest with assertj
- Remove some unnecessary steps
- Add 'throws Exception' on tests
- Start using static variables for page messages


  Commit: 5b0bed830c522d901913211d6b4e439ae80a895e
      https://github.com/zanata/zanata-server/commit/5b0bed830c522d901913211d6b4e439ae80a895e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
  fix unit test


  Commit: 99b5e1e1f21660467aceb7120d398a8b565ea126
      https://github.com/zanata/zanata-server/commit/99b5e1e1f21660467aceb7120d398a8b565ea126
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #471 from zanata/javamelody-email

Add iText for PDF/email support in JavaMelody


  Commit: 14b9970b0b1597dd167c3e4a0177020a4ad5bd4b
      https://github.com/zanata/zanata-server/commit/14b9970b0b1597dd167c3e4a0177020a4ad5bd4b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml

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


  Commit: b9435301cfc2933ce5aba1aab8ad3495a3a46df7
      https://github.com/zanata/zanata-server/commit/b9435301cfc2933ce5aba1aab8ad3495a3a46df7
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.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/InactiveUserLoginTest.java
    M 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
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java

  Log Message:
  -----------
  Merge pull request #437 from zanata/update-to-assertj

Convert to assertj and clean up Account tests


  Commit: e770711314b8c3111f10259a0a1781d3a4457c37
      https://github.com/zanata/zanata-server/commit/e770711314b8c3111f10259a0a1781d3a4457c37
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  rhbz1111012 - edit selected user


  Commit: be0c9b67be7efa937b6fa073cb75ced5003a3949
      https://github.com/zanata/zanata-server/commit/be0c9b67be7efa937b6fa073cb75ced5003a3949
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Merge pull request #463 from zanata/rhbz1067288

Cleanup dependency and unused files


  Commit: ab5e864800fcb8564cc88e4bb0a1ab793bc8fe9e
      https://github.com/zanata/zanata-server/commit/ab5e864800fcb8564cc88e4bb0a1ab793bc8fe9e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    R 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/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge pull request #502 from zanata/remove-unused-page

Remove unused page


  Commit: 9c117767108997ba963ad5d9f2a1a3f26b65cf6f
      https://github.com/zanata/zanata-server/commit/9c117767108997ba963ad5d9f2a1a3f26b65cf6f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
  Merge pull request #504 from zanata/rhbz1110959

Add more sort options into version doc list: https://bugzilla.redhat.com...


  Commit: ae5f06bc9ad1559a0866fa3003e5e27581dc66ba
      https://github.com/zanata/zanata-server/commit/ae5f06bc9ad1559a0866fa3003e5e27581dc66ba
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  Fix edit user after filter


  Commit: 4e1c73f4457c09d072a7a25286a2735cbb2eb7f6
      https://github.com/zanata/zanata-server/commit/4e1c73f4457c09d072a7a25286a2735cbb2eb7f6
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

  Log Message:
  -----------
  Merge pull request #506 from zanata/rhbz1111012-edit-user

rhbz1111012 - edit selected user


  Commit: 810d8950ff136676d467b563969566356c349d8b
      https://github.com/zanata/zanata-server/commit/810d8950ff136676d467b563969566356c349d8b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml

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


  Commit: 26379c8a04191e25b64c8f88e07f57d2985ed0f8
      https://github.com/zanata/zanata-server/commit/26379c8a04191e25b64c8f88e07f57d2985ed0f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M 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
    M 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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.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/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

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

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


Compare: https://github.com/zanata/zanata-server/compare/8f688ea6f12d...26379c8a0419

More information about the zanata-commits mailing list