[zanata/zanata-server] e55326: rhbz1197902 - clear hibernate session after each t...

Mon Mar 23 22:52:59 UTC 2015

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: e553261205e458509d3268aa4acb7f2504667777
      https://github.com/zanata/zanata-server/commit/e553261205e458509d3268aa4acb7f2504667777
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1197902 - clear hibernate session after each translation batch save

Conflicts:
	docs/release-notes.md
	zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
	zanata-war/src/test/resources/arquillian/persistence.xml


  Commit: 36ed1f6d76a7796cee49e54e1ce3946743b9956b
      https://github.com/zanata/zanata-server/commit/36ed1f6d76a7796cee49e54e1ce3946743b9956b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  fix IT test


  Commit: 0a283b990e35515070d1a80a9266066c1029d9ea
      https://github.com/zanata/zanata-server/commit/0a283b990e35515070d1a80a9266066c1029d9ea
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.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-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

  Log Message:
  -----------
  rhbz1202670 - display version state in a standard way

Closes #738

commit 70f9cb2453e954cac6f3c2e1671958706b929cca
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 19 12:32:01 2015 +1000

    Show appropriate icon for readonly and obsolete in the editor

commit a99c8361511ae3ca2c34d5f6ed2f2eac311ebd4f
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 19 09:24:21 2015 +1000

    Use version label template in site.

    Use label in all the places I could find:

     - project -> versions tab
     - project: your latest activity
     - version page
     - create version page
     - group -> projects tab
     - group -> languages tab -> projects
     - group -> settings -> projects tab
     - group -> request to join
     - dashboard -> activity tab
     - dashboard -> projects: versions dropdown

commit dbd1101a0019d0dd1dcd3a53d96c10a400370dc6
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 19 09:23:40 2015 +1000

    Create template for displaying version slugs with state-dependent styling and icons.


  Commit: 2f750bc267be4b8f0c85347d92e2f92f7c665023
      https://github.com/zanata/zanata-server/commit/2f750bc267be4b8f0c85347d92e2f92f7c665023
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: 42c2ebcfb49aad1d89236de8b94407c63d4fbf6d
      https://github.com/zanata/zanata-server/commit/42c2ebcfb49aad1d89236de8b94407c63d4fbf6d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: d53570694462c945bcfcd889081313e12f373f63
      https://github.com/zanata/zanata-server/commit/d53570694462c945bcfcd889081313e12f373f63
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: 59f69871de495e8e10a85bd866286411b1f72311
      https://github.com/zanata/zanata-server/commit/59f69871de495e8e10a85bd866286411b1f72311
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: dd4b92fafa5d40443b60da064b4fa8e9521602ca
      https://github.com/zanata/zanata-server/commit/dd4b92fafa5d40443b60da064b4fa8e9521602ca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: cccbd4f9695df2b0645e9937382394a59ee2227d
      https://github.com/zanata/zanata-server/commit/cccbd4f9695df2b0645e9937382394a59ee2227d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  try to fix IT case


  Commit: fd1eab80d3cecefd3b6460e438bf3b8c17209c9f
      https://github.com/zanata/zanata-server/commit/fd1eab80d3cecefd3b6460e438bf3b8c17209c9f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java

  Log Message:
  -----------
  try to fix IT case


  Commit: 1e5a2f13cf189851edc0c383b125349c1c80d58e
      https://github.com/zanata/zanata-server/commit/1e5a2f13cf189851edc0c383b125349c1c80d58e
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.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/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.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-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

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

Conflicts:
	zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
       A call to addAfterTestOperation() to delete all database entries had been removed in
      commit 0fa0a8ea34fe1a5c6463daa29f70f081748df0e4 but modified on release branch. Kept
      the integration/master version with the call absent.

	zanata-war/src/test/resources/arquillian/persistence.xml
       A property had been added in integration/master branch. Kept it.


Compare: https://github.com/zanata/zanata-server/compare/0206a8b242d6...1e5a2f13cf18