[zanata/zanata-server] 962ce6: Frech updated translations from translate.zanata.o...

GitHub noreply at github.com
Thu Mar 26 03:02:12 UTC 2015


  Branch: refs/heads/update-join-language-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 962ce62b748df35297905a1cd1d0eee825a7b183
      https://github.com/zanata/zanata-server/commit/962ce62b748df35297905a1cd1d0eee825a7b183
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    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

  Log Message:
  -----------
  Frech updated translations from translate.zanata.org


  Commit: 34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
      https://github.com/zanata/zanata-server/commit/34bc4e6bb0d8d138bad21f8d9e0cd5bfdf03d04b
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.6.0


  Commit: 0e2193d26bd84f061af1f99549a27c6eac8efbf0
      https://github.com/zanata/zanata-server/commit/0e2193d26bd84f061af1f99549a27c6eac8efbf0
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: 6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
      https://github.com/zanata/zanata-server/commit/6531ac9fc9014c2890d3f0376af6f2d6f89aad2b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-10 (Tue, 10 Mar 2015)

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

  Log Message:
  -----------
  fail fast if jms is not configured properly


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

  Changed paths:
    A zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1183994 - create DAO query to query user matrix for date range


  Commit: 49f1d622822c408ff1d186621e9ec85eb728599c
      https://github.com/zanata/zanata-server/commit/49f1d622822c408ff1d186621e9ec85eb728599c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  move StatisticsServiceImpl to rest service package


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  rhbz1183994 - add REST api for user matrix stats


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

  Changed paths:
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/ContentStateToWordCount.java
    A zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/MatrixMap.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerLocaleMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/PerProjectVersionMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java

  Log Message:
  -----------
  rhbz1183994 - refactor dto


  Commit: 74a183b7ff7d98330e21a1337311294da4c0b180
      https://github.com/zanata/zanata-server/commit/74a183b7ff7d98330e21a1337311294da4c0b180
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M etc/scripts/cargowait.sh

  Log Message:
  -----------
  change cargowait script


  Commit: 38a9447758ff5ecbbf3d251255cfea399cc8cbc5
      https://github.com/zanata/zanata-server/commit/38a9447758ff5ecbbf3d251255cfea399cc8cbc5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    R zanata-model/src/main/java/org/zanata/model/UserTranslationMatrix.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  rhbz1183994 - remove table and use live query only


  Commit: 21f03e6f03e622ff6705b96c420ccf673d9db9b0
      https://github.com/zanata/zanata-server/commit/21f03e6f03e622ff6705b96c420ccf673d9db9b0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java

  Log Message:
  -----------
  rhbz1183994 - convert timezone in query so the group by column value is correct


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

  Changed paths:
    R zanata-war/src/main/java/org/zanata/dao/DatabaseSpecific.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/DetailMatrix.java
    R zanata-war/src/main/java/org/zanata/rest/dto/matrix/UserWorkMatrix.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java

  Log Message:
  -----------
  rhbz1183994 - refactor to return a list


  Commit: 7332f5021e6269e80b847c9a5790e158e368ae60
      https://github.com/zanata/zanata-server/commit/7332f5021e6269e80b847c9a5790e158e368ae60
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    M zanata-war/src/main/resources/messages.properties
    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/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml

  Log Message:
  -----------
  rhbz1183994 - add user profile page and enable username search


  Commit: 14d2ba86b574dab9689e6124a5ab64a64dd6521a
      https://github.com/zanata/zanata-server/commit/14d2ba86b574dab9689e6124a5ab64a64dd6521a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java

  Log Message:
  -----------
  make search username case insensitive


  Commit: 96c186172789f15589cc173b622bdea90ae5bef1
      https://github.com/zanata/zanata-server/commit/96c186172789f15589cc173b622bdea90ae5bef1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  rhbz1183994 - add to release note


  Commit: 697b4c6caff10b45519c24a646e4ed9bfe33422e
      https://github.com/zanata/zanata-server/commit/697b4c6caff10b45519c24a646e4ed9bfe33422e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java

  Log Message:
  -----------
  rhbz1183994 - reduce the chance of user crashing server log


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  rhbz1183994 - add index on lastModifiedBy column and fail on invalid timezone


  Commit: 01dfdf026f9368b90802d03c174e16624790e012
      https://github.com/zanata/zanata-server/commit/01dfdf026f9368b90802d03c174e16624790e012
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    A docs/user-guide/user-profile.md
    M mkdocs.yml

  Log Message:
  -----------
  rhbz1183994 - add basic doc


  Commit: 7440fcaa577c7c58b8ac041168c4a118bdbac6c3
      https://github.com/zanata/zanata-server/commit/7440fcaa577c7c58b8ac041168c4a118bdbac6c3
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

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

  Log Message:
  -----------
  fix issues


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

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

  Log Message:
  -----------
  Merge pull request #721 from zanata/fail-fast-jms

fail fast if jms is not configured properly


  Commit: dddea7d131297e6c3168cee8d527dc2c006b6eab
      https://github.com/zanata/zanata-server/commit/dddea7d131297e6c3168cee8d527dc2c006b6eab
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    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
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  rhbz1194543 - change resId for plaintext and libreoffice to be content hash.

Closes #734

Squashed commit of the following:

commit 823f613f8829d0110623f248bfe99c3a626c75e9
Author: David Mason <drdmason at gmail.com>
Date:   Mon Mar 16 13:57:17 2015 +1000

    Improve logging during id migration from positional to hash-based.

commit e4ad8892ff54f7a2b5b6f26af32dce29db7285e4
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:57:29 2015 +1000

    Use try-with-resources for prepared statements when migrating resId from positional to content hash

commit 03d48b6bdd438881e23776f2f70e20d50eb50682
Author: David Mason <drdmason at gmail.com>
Date:   Thu Mar 12 13:33:13 2015 +1000

    Add warning note to some text unit id sources

commit fe76f4fb8cf95ddb7d6eaaad4f76185dc7505a9e
Author: David Mason <drdmason at gmail.com>
Date:   Tue Mar 10 13:23:47 2015 +1000

    Change resId for plaintext and libreoffice to use content hash.

    This includes migration of resId in all existing documents of
    the above types to be the content hash.

    Conflicts:
    	zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

    The conflicting file did not yet exist on this branch (this is a back-ported change)
    so it was added with only the basic xml structure and the relevant change.

    An element was also added in the main db.changelog file to import the conflicting
    file.


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

  Changed paths:
    M docs/release-notes.md
    A docs/user-guide/user-profile.md
    M etc/scripts/cargowait.sh
    M mkdocs.yml
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.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/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #694 from zanata/rhbz1183994-user-stats

Rhbz1183994 user contribution matrix


  Commit: b021f28b7ebb455d092aff96420d038a97409ae1
      https://github.com/zanata/zanata-server/commit/b021f28b7ebb455d092aff96420d038a97409ae1
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Bug 1066780 should be in asset, not part of 3.6

* [1066780](https://bugzilla.redhat.com/show_bug.cgi?id=1066780) - RFE: Improve the project list page [proto]


  Commit: 75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
      https://github.com/zanata/zanata-server/commit/75a212749e4d6f4d7e2ef2cfc7fde2d0a0f40171
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-19 (Thu, 19 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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


  Commit: a1a8a605c96c870550858063cecc3038ee43cd68
      https://github.com/zanata/zanata-server/commit/a1a8a605c96c870550858063cecc3038ee43cd68
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    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

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

Conflicts:
	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

The pom conflicts were just the release version conflicting with the
development version. Kept the development version (3.7.0-SNAPSHOT) in
all cases.

The conflict in db.changelog-3.7.xml was caused by the file being created
in both release and master branches. In the release branch it had a single
changeset that was already in the master branch, so the master copy was
kept in its entirety. There was an XML comment on the changeset in release,
this was kept and put above the identical changeset in master.


  Commit: 9f0f82d030497b1bdd133dcab653fa0ab55b9390
      https://github.com/zanata/zanata-server/commit/9f0f82d030497b1bdd133dcab653fa0ab55b9390
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-20 (Fri, 20 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add 3.6.1 section

Also move Bug 1194543 to 3.6.1


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

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    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/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Increase timeout on server startup in all standalone.xml files.

Changes the timeout to 1000 seconds (16min 40s) from default 300s (5min)
to prevent timeout when liquibase changesets take longer than 5 minutes
to run.


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

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    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/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #739 from zanata/increase-startup-timeout

Increase timeout on server startup in all standalone.xml files.


  Commit: 600d7882e7e666bdec3e62537d3c3541225fb611
      https://github.com/zanata/zanata-server/commit/600d7882e7e666bdec3e62537d3c3541225fb611
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    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
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  rhbz1183412 Uses server's default locale when sending emails


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

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    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/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


  Commit: 03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
      https://github.com/zanata/zanata-server/commit/03d7921daa2b8cd9e4d43d4da29364bb1c8b8aa3
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release-notes.md


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

  Changed paths:
    M docs/release-notes.md
    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


  Commit: 21e1f2173cb8358ff74c1d0666b2addf360710c8
      https://github.com/zanata/zanata-server/commit/21e1f2173cb8358ff74c1d0666b2addf360710c8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    A docs/release-notes.md

  Log Message:
  -----------
  Copy release notes from master (except 3.7)


  Commit: e45bed1ab688e57a87eaa90d985d58a21a69079d
      https://github.com/zanata/zanata-server/commit/e45bed1ab688e57a87eaa90d985d58a21a69079d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-23 (Mon, 23 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes for rhbz1183412


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

  Changed paths:
    M docs/release-notes.md
    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:
  -----------
  Merge pull request #733 from zanata/rhbz1197902-push-slow

rhbz1197902 - clear hibernate session after each translation batch save


  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.


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

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

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


  Commit: fe9939daf11fdd3feb2302e241cda4aab85de8cd
      https://github.com/zanata/zanata-server/commit/fe9939daf11fdd3feb2302e241cda4aab85de8cd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    A docs/release-notes.md
    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
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Merge pull request #740 from zanata/rhbz1183412

rhbz1183412 Use server's default locale when sending emails


  Commit: 3e944285f6b92a4729729bcd6fb8feda54f297bb
      https://github.com/zanata/zanata-server/commit/3e944285f6b92a4729729bcd6fb8feda54f297bb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    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
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.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

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

Conflicts:
	docs/release-notes.md


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

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  Use version label template on version merge dialog.

This can be seen by navigating to:

 - version -> merge translations dialog


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

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add bugfix rhbz1202670 to release notes


  Commit: c002cb30f87db1b176809e3716ca3f6ce1714c28
      https://github.com/zanata/zanata-server/commit/c002cb30f87db1b176809e3716ca3f6ce1714c28
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M docs/index.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    M mkdocs.yml

  Log Message:
  -----------
  Add command hook docs and update home page


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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml

  Log Message:
  -----------
  Merge pull request #741 from zanata/display-version-state

Update version display for version merge, add release notes entry.


  Commit: 188ca6872305995ccb6e8d0e9dee2992d9c48b4f
      https://github.com/zanata/zanata-server/commit/188ca6872305995ccb6e8d0e9dee2992d9c48b4f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-24 (Tue, 24 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update assets version to 6.1
https://bugzilla.redhat.com/show_bug.cgi?id=875965


  Commit: a75bb3378e532346982deec02b3357362f76986e
      https://github.com/zanata/zanata-server/commit/a75bb3378e532346982deec02b3357362f76986e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml

  Log Message:
  -----------
  display email only to admin in language page


  Commit: a330cb1e6123c4a0346fcfb437b7cde2ded547cc
      https://github.com/zanata/zanata-server/commit/a330cb1e6123c4a0346fcfb437b7cde2ded547cc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/index.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    M mkdocs.yml

  Log Message:
  -----------
  Merge pull request #744 from zanata/update-docs

Update docs


  Commit: d90b3d3b899ca5daba661646e0667da146e25cd5
      https://github.com/zanata/zanata-server/commit/d90b3d3b899ca5daba661646e0667da146e25cd5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Fix language sorting in members size: https://bugzilla.redhat.com/show_bug.cgi?id=1205468


  Commit: c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
      https://github.com/zanata/zanata-server/commit/c8b35140dd43bd9aaf782f6d0e34362cb697dcbb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml

  Log Message:
  -----------
  Merge pull request #745 from zanata/rhbz1205465

display email only to admin in language page


  Commit: 0ea0d3c3fb48eda646ce820575dfc6bf11254503
      https://github.com/zanata/zanata-server/commit/0ea0d3c3fb48eda646ce820575dfc6bf11254503
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

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

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

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


  Commit: cabb3de7dfa49f075749263d806eda143e5ba7a8
      https://github.com/zanata/zanata-server/commit/cabb3de7dfa49f075749263d806eda143e5ba7a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Merge pull request #746 from zanata/rhbz1205468

Fix language sorting in members size


  Commit: 735b6666641495262fc216e5541fdaf6219bd8e0
      https://github.com/zanata/zanata-server/commit/735b6666641495262fc216e5541fdaf6219bd8e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/webapp/language/home.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
	zanata-war/src/main/webapp/language/home.xhtml


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

  Changed paths:
    M docs/user-guide/project-types.md

  Log Message:
  -----------
  Update docs for project type


  Commit: 76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
      https://github.com/zanata/zanata-server/commit/76eaefe82cd930eb60b6768dd401fa4b4ecf0a8c
  Author: David Mason <drdmason at gmail.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/user-guide/project-types.md

  Log Message:
  -----------
  Merge pull request #748 from zanata/project-type-docs

Update docs for project type


  Commit: 90df3ec5fe4a3e441a8aafe77be5367246ecad1c
      https://github.com/zanata/zanata-server/commit/90df3ec5fe4a3e441a8aafe77be5367246ecad1c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Merge pull request #742 from zanata/rhbz875965

Update assets version to 6.1 for whitespace changes


  Commit: bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
      https://github.com/zanata/zanata-server/commit/bfeace93bca7daeede9a8ca6f8ef13f6e2013bf9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Update release notes for bugzilla 875965, 1205465, 1205468


  Commit: c58827464f92f6007757f9e987495762bb2a9685
      https://github.com/zanata/zanata-server/commit/c58827464f92f6007757f9e987495762bb2a9685
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Merge pull request #749 from zanata/add-release-note

Update release notes for bugzilla 875965, 1205465, 1205468


  Commit: df6cae674be93b1d3be41283695028c431bc45c6
      https://github.com/zanata/zanata-server/commit/df6cae674be93b1d3be41283695028c431bc45c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-25 (Wed, 25 Mar 2015)

  Changed paths:
    M docs/release-notes.md

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

Conflicts:
	docs/release-notes.md
	zanata-war/pom.xml


  Commit: 9fd2486b7932d983c0ce64617658816119a2c42e
      https://github.com/zanata/zanata-server/commit/9fd2486b7932d983c0ce64617658816119a2c42e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    R CHANGELOG.md
    M docs/configuration/installation.md
    M docs/release-notes.md

  Log Message:
  -----------
  Moved changelog.md to readthedocs section

Squashed commit of the following:

commit 426132892e13a79a9db90ed9fd548e4faf513756
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 08:41:10 2015 +1000

    Remove changeLog.md, all moved to readthedocs

commit 08aac89c4974270af093fd11ba51a5af858c2545
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 25 16:36:23 2015 +1000

    Update old release notes for readthedocs


  Commit: ccee996ab97c09b497c5c52fe3c1b2f17010b28b
      https://github.com/zanata/zanata-server/commit/ccee996ab97c09b497c5c52fe3c1b2f17010b28b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    R CHANGELOG.md
    M docs/configuration/installation.md
    M docs/index.md
    M docs/release-notes.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    M docs/user-guide/project-types.md
    A docs/user-guide/user-profile.md
    M etc/scripts/cargowait.sh
    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 mkdocs.yml
    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/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.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/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.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/language/members-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-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.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/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.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
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.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 'integration/master' into update-join-language-page


  Commit: 24cd0af46d1cfafae92a4de2b4e38c8a98e5b6c1
      https://github.com/zanata/zanata-server/commit/24cd0af46d1cfafae92a4de2b4e38c8a98e5b6c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-26 (Thu, 26 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Rename selectableProject to selectableVersion


Compare: https://github.com/zanata/zanata-server/compare/b155f2e22d8a...24cd0af46d1c


More information about the zanata-commits mailing list