[zanata/zanata-server] 4ea355: Merge branch 'release' into integration/master

[GitHub]

  Branch: refs/heads/merge-release
  Home:   https://github.com/zanata/zanata-server
  Commit: 4ea355f1c84fb4a18a4689cfd765dd70cee32f84
      https://github.com/zanata/zanata-server/commit/4ea355f1c84fb4a18a4689cfd765dd70cee32f84
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    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/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.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/email/EmailStrategyTest.java
    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
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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

Conflicts:
	docs/release-notes.md
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-test-war/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml