[zanata/zanata-server] 542f56: Fix bookmarked url not working

[GitHub]

  Branch: refs/heads/cache-downloads
  Home:   https://github.com/zanata/zanata-server
  Commit: 542f564e9e099b225f4be17c3b7bbb3888af234e
      https://github.com/zanata/zanata-server/commit/542f564e9e099b225f4be17c3b7bbb3888af234e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

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

  Log Message:
  -----------
  Fix bookmarked url not working
https://bugzilla.redhat.com/show_bug.cgi?id=1193699

Squashed commit of the following:

commit d7bd79450d4006581782019a05791441744269b0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 18 08:32:37 2015 +1000

    Fix bookmarked url not working - https://bugzilla.redhat.com/show_bug.cgi?id=1193699


  Commit: 4a2019594da3cb16180ddf59a8a304137000028d
      https://github.com/zanata/zanata-server/commit/4a2019594da3cb16180ddf59a8a304137000028d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Clear document statistic cache when uploading from client
https://bugzilla.redhat.com/show_bug.cgi?id=1192271

Squashed commit of the following:

commit f0c7fe931e77074103371e59cdea0c8806650ddb
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 16 16:22:13 2015 +1000

    clear document statistic cache when uploading from client: https://bugzilla.redhat.com/show_bug.cgi?id=1192271


  Commit: b07873274d76165b9cd4d4358d1c27a0d87fc842
      https://github.com/zanata/zanata-server/commit/b07873274d76165b9cd4d4358d1c27a0d87fc842
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Fix generate api issue
https://bugzilla.redhat.com/show_bug.cgi?id=119359

Squashed commit of the following:

commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 20 10:39:10 2015 +1000

    Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597


  Commit: 59a0b5f347cb8bb52531fb9ecc909221e81cecd8
      https://github.com/zanata/zanata-server/commit/59a0b5f347cb8bb52531fb9ecc909221e81cecd8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: zanata-api version to 3.6.0


  Commit: 32090c317cfed4aa6cf80fa56540cad42233087f
      https://github.com/zanata/zanata-server/commit/32090c317cfed4aa6cf80fa56540cad42233087f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'release' into cache-downloads

Conflicts:
	pom.xml


Compare: https://github.com/zanata/zanata-server/compare/2f8549ec2c73...32090c317cfe