[zanata/zanata-server] 770b77: fix: url for documents with paths

Mon Nov 23 05:37:45 UTC 2015

  Branch: refs/heads/list-contributors
  Home:   https://github.com/zanata/zanata-server
  Commit: 770b77c28646a4e4e3d41056cb572243cc16da4d
      https://github.com/zanata/zanata-server/commit/770b77c28646a4e4e3d41056cb572243cc16da4d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-10-08 (Thu, 08 Oct 2015)

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

  Log Message:
  -----------
  fix: url for documents with paths

Currently the navigation to the version page, Document tab, to a
specific document is broken (when entering the url provided by Zanata
directly on the browser bar the server returns a 404). This commit
should fix that problem.

  Commit: d0fd8253bdc4f6aac0ea3cab0bca6fee0b80cacf
      https://github.com/zanata/zanata-server/commit/d0fd8253bdc4f6aac0ea3cab0bca6fee0b80cacf
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  Updated Zanata UI

  Commit: 532f95b6532a80c4c5a96d4497de703ab9dedcce
      https://github.com/zanata/zanata-server/commit/532f95b6532a80c4c5a96d4497de703ab9dedcce
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-09 (Mon, 09 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx

  Log Message:
  -----------
  Add empty state to glossary table

  Commit: 2a997ba9f310cf1e80464b48d6dbdfd80d213018
      https://github.com/zanata/zanata-server/commit/2a997ba9f310cf1e80464b48d6dbdfd80d213018
  Author: daisy-ycguo <guoyingc at cn.ibm.com>
  Date:   2015-11-11 (Wed, 11 Nov 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/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Add a new parameter includeAutomatedEntry to API getContributionStatistics

  Commit: 211b74da79118c4717ff585ab0666aaaa951ba55
      https://github.com/zanata/zanata-server/commit/211b74da79118c4717ff585ab0666aaaa951ba55
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #1002 from zanata/doc-path-fix

fix: url for documents with paths

  Commit: e808cfe1faf093117d7db9bd5cb9925cd7747317
      https://github.com/zanata/zanata-server/commit/e808cfe1faf093117d7db9bd5cb9925cd7747317
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-api version

  Commit: 0fda6bef603b1f59709cbeabbf09d1787d06d6df
      https://github.com/zanata/zanata-server/commit/0fda6bef603b1f59709cbeabbf09d1787d06d6df
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Add tooltip to readonly descriptions

  Commit: bb9a0ca00bc580702a03bbad8aec1bb0f73aa6b7
      https://github.com/zanata/zanata-server/commit/bb9a0ca00bc580702a03bbad8aec1bb0f73aa6b7
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx

  Log Message:
  -----------
  Add autofocus to new term dialog

  Commit: fd909284eb7b7fe18d4c94afae14763295f3f401
      https://github.com/zanata/zanata-server/commit/fd909284eb7b7fe18d4c94afae14763295f3f401
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-12 (Thu, 12 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/package.json

  Log Message:
  -----------
  Add better filtering with no results support

  Commit: 7e06dbe2b9ff4dc1a1875638c36ec1b931c711ce
      https://github.com/zanata/zanata-server/commit/7e06dbe2b9ff4dc1a1875638c36ec1b931c711ce
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Better formatting of language select list

  Commit: b615ede0aeabe3e61f3aaf122fd1959a69ca9e50
      https://github.com/zanata/zanata-server/commit/b615ede0aeabe3e61f3aaf122fd1959a69ca9e50
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-13 (Fri, 13 Nov 2015)

  Changed paths:
    R frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml

  Log Message:
  -----------
  Separate front-end CSS into separate file

  Commit: 968ac7b6a0ceb81936a90a223cbbbd15f294c963
      https://github.com/zanata/zanata-server/commit/968ac7b6a0ceb81936a90a223cbbbd15f294c963
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java

  Log Message:
  -----------
  fix(glossary):hide delete button for non-glossary admin user

https://zanata.atlassian.net/browse/ZNTA-757

  Commit: 30036b61ee24aa858b04e912a2aff03ce2efc383
      https://github.com/zanata/zanata-server/commit/30036b61ee24aa858b04e912a2aff03ce2efc383
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx

  Log Message:
  -----------
  fix(glossary): show not supported file message

https://zanata.atlassian.net/browse/ZNTA-756
Q

  Commit: a06e9f7208fe63f9a3fec5eb9edac5d578c7a094
      https://github.com/zanata/zanata-server/commit/a06e9f7208fe63f9a3fec5eb9edac5d578c7a094
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    M frontend/src/main/web/index.html
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    R frontend/src/main/web/lib/components/glossary/Comment.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M mkdocs.yml

  Log Message:
  -----------
  fix(glossary):fix update comment,sort,and tooltip on source

https://zanata.atlassian.net/browse/ZNTA-760
https://zanata.atlassian.net/browse/ZNTA-759

  Commit: dcca12edfd2dbdad25254f979f0d170fd94bbd83
      https://github.com/zanata/zanata-server/commit/dcca12edfd2dbdad25254f979f0d170fd94bbd83
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(dependencies): Update zanata dependencies for 3.8.0

  Commit: f3d36891ae243356bdbed22676a4d5ee74b505ac
      https://github.com/zanata/zanata-server/commit/f3d36891ae243356bdbed22676a4d5ee74b505ac
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M docs/images/glossary-edit.png
    M docs/user-guide/glossary/edit-glossaries.md
    M docs/user-guide/glossary/insert-term.md
    M frontend/src/main/web/lib/actions/GlossaryActions.js
    M frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/constants/Messages.js
    M frontend/src/main/web/lib/stores/testData/glossary/entries.json
    M frontend/src/main/web/lib/utils/GlossaryHelper.js
    M frontend/src/main/web/package.json
    M mkdocs.yml

  Log Message:
  -----------
  Update documentations for glossary

  Commit: dc7b8794220044fb70ac4e01cae5c9625fe272fb
      https://github.com/zanata/zanata-server/commit/dc7b8794220044fb70ac4e01cae5c9625fe272fb
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update assets version to 8.0.5

  Commit: 62c357d5a98a602c65b45ba108fe2afacb58a721
      https://github.com/zanata/zanata-server/commit/62c357d5a98a602c65b45ba108fe2afacb58a721
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Remove duplicate module requirement

  Commit: 5912667c0f52b21cafd12bd699ea8089c8a14cf9
      https://github.com/zanata/zanata-server/commit/5912667c0f52b21cafd12bd699ea8089c8a14cf9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    A docs/images/glossary-edit-trans.png
    A docs/images/glossary-edit.png
    A docs/images/glossary-new-term-modal.png
    A docs/images/glossary-new-term.png
    A docs/images/glossary-page.png
    A docs/images/glossary-select-language.png
    M docs/images/glossary-upload-windows-po.png
    M docs/images/glossary-upload-windows.png
    M docs/images/glossary-upload.png
    M docs/release-notes.md
    M docs/user-guide/glossary/edit-glossaries.md
    A docs/user-guide/glossary/insert-term.md
    M docs/user-guide/glossary/upload-glossaries.md
    A docs/user-guide/system-admin/configuration/mac-installation.md
    M frontend/pom.xml
    A frontend/src/main/web/.gitignore
    A frontend/src/main/web/README.md
    A frontend/src/main/web/copy.sh
    A frontend/src/main/web/index.css
    A frontend/src/main/web/index.html
    A frontend/src/main/web/index.js
    A frontend/src/main/web/lib/actions/GlossaryActions.js
    A frontend/src/main/web/lib/actions/UserMatrixActions.js
    A frontend/src/main/web/lib/components/CalendarMonthMatrix.jsx
    A frontend/src/main/web/lib/components/CalendarPeriodHeading.jsx
    A frontend/src/main/web/lib/components/CategoryItemMatrix.jsx
    A frontend/src/main/web/lib/components/CategoryMatrixTable.jsx
    A frontend/src/main/web/lib/components/ContentStateFilter.jsx
    A frontend/src/main/web/lib/components/ContributionChart.jsx
    A frontend/src/main/web/lib/components/DayMatrix.jsx
    A frontend/src/main/web/lib/components/DropDown.jsx
    A frontend/src/main/web/lib/components/FilterableMatrixTable.jsx
    A frontend/src/main/web/lib/components/MessageModal.jsx
    A frontend/src/main/web/lib/components/RecentContributions.jsx
    A frontend/src/main/web/lib/components/RootContent.jsx
    A frontend/src/main/web/lib/components/SystemGlossary.jsx
    A frontend/src/main/web/lib/components/UserProfile.jsx
    A frontend/src/main/web/lib/components/glossary/ActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/ColumnHeader.jsx
    A frontend/src/main/web/lib/components/glossary/DataTable.jsx
    A frontend/src/main/web/lib/components/glossary/DeleteEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    A frontend/src/main/web/lib/components/glossary/InputCell.jsx
    A frontend/src/main/web/lib/components/glossary/LoadingCell.jsx
    A frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    A frontend/src/main/web/lib/components/glossary/SourceActionCell.jsx
    A frontend/src/main/web/lib/components/glossary/__tests__/ActionCellTest.js
    A frontend/src/main/web/lib/constants/ActionTypes.js
    A frontend/src/main/web/lib/constants/Configs.js
    A frontend/src/main/web/lib/constants/Messages.js
    A frontend/src/main/web/lib/constants/Options.js
    A frontend/src/main/web/lib/constants/Views.js
    A frontend/src/main/web/lib/dispatchers/GlossaryDispatcher.js
    A frontend/src/main/web/lib/dispatchers/UserMatrixDispatcher.js
    A frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    A frontend/src/main/web/lib/stores/GlossaryStore.js
    A frontend/src/main/web/lib/stores/UserMatrixStore.js
    A frontend/src/main/web/lib/stores/__mocks__/superagent.js
    A frontend/src/main/web/lib/stores/__tests__/GlossaryStoreTest.js
    A frontend/src/main/web/lib/stores/__tests__/UserMatrixStoreTest.js
    A frontend/src/main/web/lib/stores/testData/glossary/entries.json
    A frontend/src/main/web/lib/stores/testData/glossary/info.json
    A frontend/src/main/web/lib/stores/testData/stats/user/test-user.json
    A frontend/src/main/web/lib/utils/DateHelper.js
    A frontend/src/main/web/lib/utils/GlossaryHelper.js
    A frontend/src/main/web/lib/utils/StringUtils.js
    A frontend/src/main/web/lib/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/web/lib/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/web/package.json
    A frontend/src/main/web/preprocessor.js
    A frontend/src/main/web/server.js
    R frontend/src/main/web/user-profile-page/README.md
    R frontend/src/main/web/user-profile-page/copy.sh
    R frontend/src/main/web/user-profile-page/index.html
    R frontend/src/main/web/user-profile-page/index.js
    R frontend/src/main/web/user-profile-page/lib/actions/Actions.js
    R frontend/src/main/web/user-profile-page/lib/components/CalendarMonthMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CalendarPeriodHeading.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryItemMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/CategoryMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContentStateFilter.jsx
    R frontend/src/main/web/user-profile-page/lib/components/ContributionChart.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DayMatrix.jsx
    R frontend/src/main/web/user-profile-page/lib/components/DropDown.jsx
    R frontend/src/main/web/user-profile-page/lib/components/FilterableMatrixTable.jsx
    R frontend/src/main/web/user-profile-page/lib/components/RecentContributions.jsx
    R frontend/src/main/web/user-profile-page/lib/constants/ActionTypes.js
    R frontend/src/main/web/user-profile-page/lib/constants/Configs.js
    R frontend/src/main/web/user-profile-page/lib/constants/Options.js
    R frontend/src/main/web/user-profile-page/lib/dispatchers/UserMatrixDispatcher.js
    R frontend/src/main/web/user-profile-page/lib/stores/UserMatrixStore.js
    R frontend/src/main/web/user-profile-page/lib/stores/__mocks__/superagent.js
    R frontend/src/main/web/user-profile-page/lib/stores/__tests__/UserMatrixStoreTest.js
    R frontend/src/main/web/user-profile-page/lib/stores/userStats.json
    R frontend/src/main/web/user-profile-page/lib/utils/DateHelper.js
    R frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    R frontend/src/main/web/user-profile-page/package.json
    R frontend/src/main/web/user-profile-page/preprocessor.js
    R frontend/src/main/web/user-profile-page/server.js
    R frontend/src/main/web/user-profile-page/webpack.config.js
    R frontend/src/main/web/user-profile-page/webpack.prod.config.js
    A frontend/src/main/web/webpack.config.js
    A frontend/src/main/web/webpack.prod.config.js
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M mkdocs.yml
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    R zanata-model/src/main/java/org/zanata/model/HTermComment.java
    A zanata-model/src/main/java/org/zanata/util/GlossaryUtil.java
    M zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-overlay/common/bin/zanata-installer/InstallZanata.groovy
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandler.java
    A zanata-war/src/main/java/org/zanata/exception/AjaxViewExpiredExceptionHandlerFactory.java
    A zanata-war/src/main/java/org/zanata/exception/DuplicateGlossaryEntryException.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/GenerateHashForGlossaryEntry.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateHTermCommentToString.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Permission.java
    M zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/CommonMarkRenderer.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateGlossaryTermAction.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.8.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.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
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/error/viewexpiredexception.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    M zanata-war/src/test/java/org/zanata/rest/editor/service/UserServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LockManagerServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/util/CommonMarkRendererTest.java
    A zanata-war/src/test/java/org/zanata/util/Repeat.java
    A zanata-war/src/test/java/org/zanata/util/RepeatRule.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
    M zanata-war/src/test/resources/performance/GlossaryTest.dbunit.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin' into automatedEntry

  Commit: c4796da4dc3d708be34adb39f2f2b779f88218b7
      https://github.com/zanata/zanata-server/commit/c4796da4dc3d708be34adb39f2f2b779f88218b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-16 (Mon, 16 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/stores/GlossaryStore.js

  Log Message:
  -----------
  Add loader to load,sort,filter action

  Commit: db05811fde48cbe397c5833538a4bcc6a7d22d95
      https://github.com/zanata/zanata-server/commit/db05811fde48cbe397c5833538a4bcc6a7d22d95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx

  Log Message:
  -----------
  Merge branch 'integration/master' into ZNTA-758-glossary-usability

  Commit: 607cfecedc459e8bdf069444a0c6b2617e7bf146
      https://github.com/zanata/zanata-server/commit/607cfecedc459e8bdf069444a0c6b2617e7bf146
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

  Log Message:
  -----------
  fix(search page icon): update project icon in search page

https://zanata.atlassian.net/browse/ZNTA-775

  Commit: cffb202ff06a91be9897a701fad4ca3a2ce94587
      https://github.com/zanata/zanata-server/commit/cffb202ff06a91be9897a701fad4ca3a2ce94587
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

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

* origin/release:
  fix: url for documents with paths

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml

  Commit: 7b2050aedbbd1ea48ce3114f6b95626892c80d0b
      https://github.com/zanata/zanata-server/commit/7b2050aedbbd1ea48ce3114f6b95626892c80d0b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

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

  Log Message:
  -----------
  Merge pull request #1038 from zanata/ZNTA-775-Icon

fix(search page icon): update project icon in search page

  Commit: 613b9788539bcc8548de43b51faac1b117372660
      https://github.com/zanata/zanata-server/commit/613b9788539bcc8548de43b51faac1b117372660
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  fix(activate account): redirect to login page after account activate

https://zanata.atlassian.net/browse/ZNTA-720

  Commit: 7ac5b6ce1de3efa58ba3645af605768cf7a0f4b2
      https://github.com/zanata/zanata-server/commit/7ac5b6ce1de3efa58ba3645af605768cf7a0f4b2
  Author: anipeter <apeter at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/webapp/account/activate.xhtml

  Log Message:
  -----------
  Merge pull request #1039 from zanata/ZNTA-720-login

fix(activate account): redirect to login page after account activate

  Commit: 5f9a5c79e4c02335eacbb4e6aa153bf2c8aa7330
      https://github.com/zanata/zanata-server/commit/5f9a5c79e4c02335eacbb4e6aa153bf2c8aa7330
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  fix(user-profile): fix user profile page display

https://zanata.atlassian.net/browse/ZNTA-774

  Commit: cb5db743596d26266fa49b38589979ee249ffc7e
      https://github.com/zanata/zanata-server/commit/cb5db743596d26266fa49b38589979ee249ffc7e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M pom.xml
    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/rest/service/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #1029 from daisy-ycguo/automatedEntry

Add a new parameter includeAutomatedEntry to API getContributionStatistics

  Commit: 0053b6c4ba0deded0ee7bd831578ed432d99e979
      https://github.com/zanata/zanata-server/commit/0053b6c4ba0deded0ee7bd831578ed432d99e979
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Merge pull request #1037 from zanata/ZNTA-774-User-Profile-Page

fix(user-profile): fix user profile page display

  Commit: a04dd60ea7518d37d15305fef612575ac5d9b6ff
      https://github.com/zanata/zanata-server/commit/a04dd60ea7518d37d15305fef612575ac5d9b6ff
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-17 (Tue, 17 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java

  Log Message:
  -----------
  Change column title to selected locale, set utf-8 for file upload

  Commit: 382bec3f1becaa9a2af960504560f5f40de1d8c7
      https://github.com/zanata/zanata-server/commit/382bec3f1becaa9a2af960504560f5f40de1d8c7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    R frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml

  Log Message:
  -----------
  Merge pull request #1036 from zanata/ZNTA-758-glossary-usability

ZNTA-758 Glossary Usability

  Commit: 1997154af5975c3afc59fcb7fccb52bde1a0972b
      https://github.com/zanata/zanata-server/commit/1997154af5975c3afc59fcb7fccb52bde1a0972b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update zanata-api to 3.8.3-SNAPSHOT

  Commit: b913ce7a95366386eb68b7388202a5cd6066afc7
      https://github.com/zanata/zanata-server/commit/b913ce7a95366386eb68b7388202a5cd6066afc7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 3.4.1

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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  fix(revert translation): fix null pointer exception when revert translation

https://zanata.atlassian.net/browse/ZNTA-738

  Commit: a8ebd9758525ddd340da14833b79482f91e969f1
      https://github.com/zanata/zanata-server/commit/a8ebd9758525ddd340da14833b79482f91e969f1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-18 (Wed, 18 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #1040 from zanata/update-zanata-api-version

Downgrade zanata-api to 3.8.3-SNAPSHOT

  Commit: 2126030ea7937b5110428a5236b0f54f9106b8d1
      https://github.com/zanata/zanata-server/commit/2126030ea7937b5110428a5236b0f54f9106b8d1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java

  Log Message:
  -----------
  Merge pull request #1044 from zanata/ZNTA-738-null-pointer

fix(revert translation): fix null pointer exception when revert translation

  Commit: 3b5fa67799e9454da4d072998d8519a6ee7be63f
      https://github.com/zanata/zanata-server/commit/3b5fa67799e9454da4d072998d8519a6ee7be63f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    M pom.xml
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java

  Log Message:
  -----------
  fix(glossary):Add utf8 for glossary po file upload

  Commit: 324b49fa7b75f33e1091e38e6ddcceed4fa37bb5
      https://github.com/zanata/zanata-server/commit/324b49fa7b75f33e1091e38e6ddcceed4fa37bb5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-19 (Thu, 19 Nov 2015)

  Changed paths:
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java

  Log Message:
  -----------
  Merge pull request #1043 from zanata/ZNTA-778-utf-8

fix(glossary):Add utf8 for glossary po file upload

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

  Changed paths:
    M docs/user-guide/glossary/delete-glossaries.md

  Log Message:
  -----------
  fix(doc): update glossary delete

  Commit: 72a283d0f758e20ab069e821f9cb98515861dc71
      https://github.com/zanata/zanata-server/commit/72a283d0f758e20ab069e821f9cb98515861dc71
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

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

  Log Message:
  -----------
  [zanata-release-branching] prepare for next development iteration

  Commit: 2f92c8d21cac4ae310d9d2fd702c75c52f955df0
      https://github.com/zanata/zanata-server/commit/2f92c8d21cac4ae310d9d2fd702c75c52f955df0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  chore(dependency): remove duplicate dependency

  Commit: 08fe342a95a9e173cdc397e3bed34f6dbb9129f0
      https://github.com/zanata/zanata-server/commit/08fe342a95a9e173cdc397e3bed34f6dbb9129f0
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.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_es.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_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata.xml

  Log Message:
  -----------
  misc(translation): Update zanata.xml and translation

  Commit: 8f718fc114532fbbbcbc159acf81847101233a08
      https://github.com/zanata/zanata-server/commit/8f718fc114532fbbbcbc159acf81847101233a08
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-11-20 (Fri, 20 Nov 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.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_es.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_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata.xml

  Log Message:
  -----------
  Merge commit '08fe342a95a9e173cdc397e3bed34f6dbb9129f0' into HEAD

  Commit: 1bb88c1a3d894f5c147391ead32e949197107823
      https://github.com/zanata/zanata-server/commit/1bb88c1a3d894f5c147391ead32e949197107823
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-11-21 (Sat, 21 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies to latest release

  Commit: f752a1797d75076542205e850cbb5eb220e41be7
      https://github.com/zanata/zanata-server/commit/f752a1797d75076542205e850cbb5eb220e41be7
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-11-22 (Sun, 22 Nov 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge commit '1bb88c1a3d894f5c147391ead32e949197107823' into HEAD

  Commit: 9a9e0317053d1fd193e47d6ebafb7b3e155e45e1
      https://github.com/zanata/zanata-server/commit/9a9e0317053d1fd193e47d6ebafb7b3e155e45e1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-11-23 (Mon, 23 Nov 2015)

  Changed paths:
    M docs/release-notes.md
    M docs/user-guide/glossary/delete-glossaries.md
    M frontend/pom.xml
    R frontend/src/main/web/index.css
    M frontend/src/main/web/index.html
    M frontend/src/main/web/index.js
    M frontend/src/main/web/lib/components/SystemGlossary.jsx
    M frontend/src/main/web/lib/components/glossary/DataTable.jsx
    M frontend/src/main/web/lib/components/glossary/ImportModal.jsx
    M frontend/src/main/web/lib/components/glossary/NewEntryModal.jsx
    M frontend/src/main/web/lib/stores/GlossaryAPIStore.js
    M frontend/src/main/web/lib/stores/GlossaryStore.js
    M frontend/src/main/web/package.json
    M frontend/src/main/web/webpack.config.js
    M frontend/src/main/web/webpack.prod.config.js
    M functional-test/pom.xml
    M pom.xml
    M zanata-liquibase/pom.xml
    M zanata-model/pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    M zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.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_es.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_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_ui.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/GlossaryFileServiceImplTest.java
    M zanata.xml

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

Compare: https://github.com/zanata/zanata-server/compare/789d8666bc80...9a9e0317053d