Branch: refs/heads/merging-ZNTA-1154
  Home:   https://github.com/zanata/zanata-server
  Commit: fec56c8a7d4ac874890b053612bd5d510d9584fe
      
https://github.com/zanata/zanata-server/commit/fec56c8a7d4ac874890b053612bd5d510d9584fe
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  wip


  Commit: 39c3b5b6114c77a83159207d9fb03144c5a8ebf7
      
https://github.com/zanata/zanata-server/commit/39c3b5b6114c77a83159207d9fb03144c5a8ebf7
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/cachestats.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml

  Log Message:
  -----------
  feat(ZNTA-1154):Create a cache stats page

* Use infinispan as a cache manager
* Create cache stats table on the administration side
* Do 'clear cache' and 'clear all caches' actions
* Enable to internalize cache stats' properties names.


  Commit: a3c1ef80b438a5a9868dae2a0da5a95fb0ee4240
      
https://github.com/zanata/zanata-server/commit/a3c1ef80b438a5a9868dae2a0da5a95fb0ee4240
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  feat(ZNTA-1154): Changings according to feedbacks

* Change returning value from ArrayList to List of getCacheList
* Create another method and button for reset Cache Stats
* Add role checking to CacheAction
* Add strings for i18n


  Commit: 589b839cd75b01b9aec07d2e67c33b263e709fc9
      
https://github.com/zanata/zanata-server/commit/589b839cd75b01b9aec07d2e67c33b263e709fc9
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  fix(ZNTA-1154) : Make changes on comment block

* Make proper comment block style
* Make more reasonable explanation for getCacheStatsProperties
* Fix some misspelling


  Commit: e0308a070c9f6d749dd1c86cc094f831587edae8
      
https://github.com/zanata/zanata-server/commit/e0308a070c9f6d749dd1c86cc094f831587edae8
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  fix(ZNTA-1154) : Change quotes for message bundles


  Commit: 693a82892057be46d6d7659611ca24febb93fc99
      
https://github.com/zanata/zanata-server/commit/693a82892057be46d6d7659611ca24febb93fc99
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  fix(ZNTA-1154) : Make the page more admin friendly

* Add tooltips for "reset" and "clear" button
* Make table design more plausible


  Commit: 12c2ddae2a928dacab06d7350c443a84653e31b4
      
https://github.com/zanata/zanata-server/commit/12c2ddae2a928dacab06d7350c443a84653e31b4
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  fix(ZNTA-1154) : Make the messages clearer

* Make the message bundles clearer
* Change the cache names type from public to private


  Commit: 3f80d1ede837a8bc7e4e2c71aee58d8bc2b095a2
      
https://github.com/zanata/zanata-server/commit/3f80d1ede837a8bc7e4e2c71aee58d8bc2b095a2
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-01 (Fri, 01 Jul 2016)

  Changed paths:
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  feat(ZNTA-1154) : Make clearer the cache table

* Add tooltips for "reset" and "clear" buttons
* Change "" cache`s name to "(empty string)"


  Commit: 89e89b1821285f5b217a69014843ab8eb63fcb42
      
https://github.com/zanata/zanata-server/commit/89e89b1821285f5b217a69014843ab8eb63fcb42
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-04 (Mon, 04 Jul 2016)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/admin/cachestats.xhtml

  Log Message:
  -----------
  feat(ZNTA-1154) : Work on displaying italic string

* Carry if-else control from xhtml to the java side
* Return "em" tag for italic "empty string"
* Get rid of jstl library on the xhtml page


  Commit: d99f809f6a404e6909bfd41bf7a9b2891ed137cb
      
https://github.com/zanata/zanata-server/commit/d99f809f6a404e6909bfd41bf7a9b2891ed137cb
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-08 (Fri, 08 Jul 2016)

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

  Log Message:
  -----------
  feat(ZNTA-1154) : Escape html not sanitise


  Commit: 073cea7160fd0e54fd83f01ded4277cfe5e5569a
      
https://github.com/zanata/zanata-server/commit/073cea7160fd0e54fd83f01ded4277cfe5e5569a
  Author: broccolinisoup <armagan.er...@gmail.com>
  Date:   2016-07-25 (Mon, 25 Jul 2016)

  Changed paths:
    M docker/Dockerfile
    M docker/README.md
    M docker/rundev.sh
    M docs/release-notes.md
    M docs/user-guide/system-admin/configuration/infinispan.md
    M frontend/README.md
    A frontend/docs/actions.md
    A frontend/docs/build.md
    A frontend/docs/components.md
    A frontend/docs/constants.md
    A frontend/docs/containers.md
    A frontend/docs/esnext.md
    A frontend/docs/index.md
    A frontend/docs/legacy.md
    A frontend/docs/linting.md
    A frontend/docs/middleware.md
    A frontend/docs/readme.md
    A frontend/docs/reducers.md
    A frontend/docs/schemas.md
    A frontend/docs/scripts.md
    A frontend/docs/styleguide.md
    A frontend/docs/styles.md
    A frontend/docs/technology.md
    A frontend/docs/testing.md
    M frontend/pom.xml
    A frontend/src/.eslintignore
    A frontend/src/.eslintrc
    A frontend/src/.gitignore
    A frontend/src/atomicCssConfig.js
    A frontend/src/index.html
    A frontend/src/main/actions/common.js
    A frontend/src/main/actions/explore.js
    A frontend/src/main/actions/glossary.js
    A frontend/src/main/actions/index.js
    A frontend/src/main/actions/profile.js
    A frontend/src/main/components/Nav/NavIcon.jsx
    A frontend/src/main/components/Nav/NavItem.jsx
    A frontend/src/main/components/Nav/index.jsx
    A frontend/src/main/components/Notification/index.js
    A frontend/src/main/components/index.js
    A frontend/src/main/constants/Messages.js
    A frontend/src/main/constants/Options.js
    A frontend/src/main/containers/App.js
    A frontend/src/main/containers/Explore/GroupTeaser.jsx
    A frontend/src/main/containers/Explore/LanguageTeamTeaser.jsx
    A frontend/src/main/containers/Explore/ProjectTeaser.jsx
    A frontend/src/main/containers/Explore/TeaserList.jsx
    A frontend/src/main/containers/Explore/TeaserListHeader.jsx
    A frontend/src/main/containers/Explore/UserTeaser.jsx
    A frontend/src/main/containers/Explore/index.js
    A frontend/src/main/containers/Glossary/DeleteAllEntriesModal.jsx
    A frontend/src/main/containers/Glossary/DeleteEntryModal.jsx
    A frontend/src/main/containers/Glossary/Entry.js
    A frontend/src/main/containers/Glossary/EntryModal.js
    A frontend/src/main/containers/Glossary/ExportModal.js
    A frontend/src/main/containers/Glossary/Header.jsx
    A frontend/src/main/containers/Glossary/ImportModal.js
    A frontend/src/main/containers/Glossary/NewEntryModal.js
    A frontend/src/main/containers/Glossary/ViewHeader.js
    A frontend/src/main/containers/Glossary/index.js
    A frontend/src/main/containers/Root.js
    A frontend/src/main/containers/UserProfile/CalendarMonthMatrix.jsx
    A frontend/src/main/containers/UserProfile/CalendarPeriodHeading.jsx
    A frontend/src/main/containers/UserProfile/CategoryItemMatrix.jsx
    A frontend/src/main/containers/UserProfile/CategoryMatrixTable.jsx
    A frontend/src/main/containers/UserProfile/ContentStateFilter.jsx
    A frontend/src/main/containers/UserProfile/ContributionChart.jsx
    A frontend/src/main/containers/UserProfile/DayMatrix.jsx
    A frontend/src/main/containers/UserProfile/FilterableMatrixTable.jsx
    A frontend/src/main/containers/UserProfile/RecentContributions.jsx
    A frontend/src/main/containers/UserProfile/index.jsx
    A frontend/src/main/index.js
    A frontend/src/main/legacy.js
    A frontend/src/main/reducers/common.js
    A frontend/src/main/reducers/explore.js
    A frontend/src/main/reducers/glossary.js
    A frontend/src/main/reducers/index.js
    A frontend/src/main/reducers/profile.js
    A frontend/src/main/schemas.js
    A frontend/src/main/utils/DateHelper.js
    A frontend/src/main/utils/GlossaryHelper.js
    A frontend/src/main/utils/RoutingHelpers.js
    A frontend/src/main/utils/StringUtils.js
    A frontend/src/main/utils/__tests__/GlossaryHelperTest.js
    A frontend/src/main/utils/__tests__/StringUtilsTest.js
    A frontend/src/main/utils/callWithSameArgs.js
    A frontend/src/main/web/.babelrc
    R frontend/src/main/web/.eslintignore
    R frontend/src/main/web/.eslintrc
    R frontend/src/main/web/.gitignore
    R frontend/src/main/web/atomicCssConfig.js
    R frontend/src/main/web/copy.sh
    R frontend/src/main/web/docs/actions.md
    R frontend/src/main/web/docs/build.md
    R frontend/src/main/web/docs/components.md
    R frontend/src/main/web/docs/constants.md
    R frontend/src/main/web/docs/containers.md
    R frontend/src/main/web/docs/esnext.md
    R frontend/src/main/web/docs/index.md
    R frontend/src/main/web/docs/legacy.md
    R frontend/src/main/web/docs/linting.md
    R frontend/src/main/web/docs/middleware.md
    R frontend/src/main/web/docs/readme.md
    R frontend/src/main/web/docs/reducers.md
    R frontend/src/main/web/docs/schemas.md
    R frontend/src/main/web/docs/scripts.md
    R frontend/src/main/web/docs/styleguide.md
    R frontend/src/main/web/docs/styles.md
    R frontend/src/main/web/docs/technology.md
    R frontend/src/main/web/docs/testing.md
    R frontend/src/main/web/index.html
    R frontend/src/main/web/npm-shrinkwrap.json
    R frontend/src/main/web/package.json
    R frontend/src/main/web/scripts/createIconsComponent.js
    R frontend/src/main/web/scripts/generateIconList.js
    R frontend/src/main/web/scripts/writeVariablesJson.js
    R frontend/src/main/web/src/actions/common.js
    R frontend/src/main/web/src/actions/explore.js
    R frontend/src/main/web/src/actions/glossary.js
    R frontend/src/main/web/src/actions/index.js
    R frontend/src/main/web/src/actions/profile.js
    R frontend/src/main/web/src/components/Base/index.jsx
    R frontend/src/main/web/src/components/Base/readme.md
    R frontend/src/main/web/src/components/Button/index.jsx
    R frontend/src/main/web/src/components/Button/readme.md
    R frontend/src/main/web/src/components/ButtonLink/index.jsx
    R frontend/src/main/web/src/components/ButtonLink/readme.md
    R frontend/src/main/web/src/components/ButtonRound/index.jsx
    R frontend/src/main/web/src/components/ButtonRound/readme.md
    R frontend/src/main/web/src/components/EditableText.js
    R frontend/src/main/web/src/components/Flex/index.jsx
    R frontend/src/main/web/src/components/Flex/readme.md
    R frontend/src/main/web/src/components/Header.jsx
    R frontend/src/main/web/src/components/Heading.jsx
    R frontend/src/main/web/src/components/Icon/index.jsx
    R frontend/src/main/web/src/components/Icon/readme.md
    R frontend/src/main/web/src/components/Icons/icons.svg
    R frontend/src/main/web/src/components/Icons/index.jsx
    R frontend/src/main/web/src/components/Icons/index.jsx.src
    R frontend/src/main/web/src/components/Icons/readme.md
    R frontend/src/main/web/src/components/Icons/svgs/Icon-admin.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-all.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-attach.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-block.svg
    R 
frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down-double.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-down.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-left.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-right.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up-double.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-chevron-up.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-circle.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-clock.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-code.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-comment.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-copy.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-cross-circle.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-cross.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-dashboard.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-document.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-dot.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-download.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-edit.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-ellipsis.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-export.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-external-link.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-filter.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-folder.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-glossary.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-help.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-history.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-import.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-inbox.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-info.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-keyboard.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-language.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-link.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-location.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-locked.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-logout.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-mail.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-maintain.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-menu.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-minus.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-next.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-notification.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-plus.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-previous.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-project.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-refresh.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-review.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-search.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-settings.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-star-outline.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-star.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-statistics.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-suggestions.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-tick-circle.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-tick.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-translate.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-trash.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-undo.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-unlocked.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-upload.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-user.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-users.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-version.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-warning.svg
    R frontend/src/main/web/src/components/Icons/svgs/Icon-zanata.svg
    R frontend/src/main/web/src/components/Link.jsx
    R frontend/src/main/web/src/components/Loader/index.jsx
    R frontend/src/main/web/src/components/Loader/readme.md
    R frontend/src/main/web/src/components/LoaderText/index.jsx
    R frontend/src/main/web/src/components/LoaderText/readme.md
    R frontend/src/main/web/src/components/LogoLoader/index.css
    R frontend/src/main/web/src/components/LogoLoader/index.js
    R frontend/src/main/web/src/components/LogoLoader/logo.svg
    R frontend/src/main/web/src/components/Modal/ModalBody.jsx
    R frontend/src/main/web/src/components/Modal/ModalFooter.jsx
    R frontend/src/main/web/src/components/Modal/ModalHeader.jsx
    R frontend/src/main/web/src/components/Modal/ModalTitle.jsx
    R frontend/src/main/web/src/components/Modal/index.jsx
    R frontend/src/main/web/src/components/Modal/readme.md
    R frontend/src/main/web/src/components/Nav.jsx
    R frontend/src/main/web/src/components/NavIcon.jsx
    R frontend/src/main/web/src/components/NavItem.jsx
    R frontend/src/main/web/src/components/Notification.js
    R frontend/src/main/web/src/components/Overlay/index.jsx
    R frontend/src/main/web/src/components/Overlay/readme.md
    R frontend/src/main/web/src/components/OverlayTrigger/index.jsx
    R frontend/src/main/web/src/components/OverlayTrigger/readme.md
    R frontend/src/main/web/src/components/Page.jsx
    R frontend/src/main/web/src/components/Row.js
    R frontend/src/main/web/src/components/ScrollView.jsx
    R frontend/src/main/web/src/components/Select/index.jsx
    R frontend/src/main/web/src/components/Select/index.scss
    R frontend/src/main/web/src/components/Select/readme.md
    R frontend/src/main/web/src/components/TableCell.js
    R frontend/src/main/web/src/components/TableRow.js
    R frontend/src/main/web/src/components/TextInput.jsx
    R frontend/src/main/web/src/components/Tooltip/index.jsx
    R frontend/src/main/web/src/components/Tooltip/readme.md
    R frontend/src/main/web/src/components/View.jsx
    R frontend/src/main/web/src/components/index.js
    R frontend/src/main/web/src/constants/Messages.js
    R frontend/src/main/web/src/constants/Options.js
    R frontend/src/main/web/src/constants/styles.js
    R frontend/src/main/web/src/containers/App.js
    R frontend/src/main/web/src/containers/Explore/GroupTeaser.jsx
    R frontend/src/main/web/src/containers/Explore/LanguageTeamTeaser.jsx
    R frontend/src/main/web/src/containers/Explore/ProjectTeaser.jsx
    R frontend/src/main/web/src/containers/Explore/TeaserList.jsx
    R frontend/src/main/web/src/containers/Explore/TeaserListHeader.jsx
    R frontend/src/main/web/src/containers/Explore/UserTeaser.jsx
    R frontend/src/main/web/src/containers/Explore/index.js
    R frontend/src/main/web/src/containers/Glossary/DeleteAllEntriesModal.jsx
    R frontend/src/main/web/src/containers/Glossary/DeleteEntryModal.jsx
    R frontend/src/main/web/src/containers/Glossary/Entry.js
    R frontend/src/main/web/src/containers/Glossary/EntryModal.js
    R frontend/src/main/web/src/containers/Glossary/ExportModal.js
    R frontend/src/main/web/src/containers/Glossary/ImportModal.js
    R frontend/src/main/web/src/containers/Glossary/NewEntryModal.js
    R frontend/src/main/web/src/containers/Glossary/ViewHeader.js
    R frontend/src/main/web/src/containers/Glossary/index.js
    R frontend/src/main/web/src/containers/Root.js
    R frontend/src/main/web/src/containers/UserProfile/CalendarMonthMatrix.jsx
    R frontend/src/main/web/src/containers/UserProfile/CalendarPeriodHeading.jsx
    R frontend/src/main/web/src/containers/UserProfile/CategoryItemMatrix.jsx
    R frontend/src/main/web/src/containers/UserProfile/CategoryMatrixTable.jsx
    R frontend/src/main/web/src/containers/UserProfile/ContentStateFilter.jsx
    R frontend/src/main/web/src/containers/UserProfile/ContributionChart.jsx
    R frontend/src/main/web/src/containers/UserProfile/DayMatrix.jsx
    R frontend/src/main/web/src/containers/UserProfile/FilterableMatrixTable.jsx
    R frontend/src/main/web/src/containers/UserProfile/RecentContributions.jsx
    R frontend/src/main/web/src/containers/UserProfile/index.jsx
    R frontend/src/main/web/src/index.js
    R frontend/src/main/web/src/legacy.js
    R frontend/src/main/web/src/reducers/common.js
    R frontend/src/main/web/src/reducers/explore.js
    R frontend/src/main/web/src/reducers/glossary.js
    R frontend/src/main/web/src/reducers/index.js
    R frontend/src/main/web/src/reducers/profile.js
    R frontend/src/main/web/src/schemas.js
    R frontend/src/main/web/src/styles/animations.css
    R frontend/src/main/web/src/styles/base.css
    R frontend/src/main/web/src/styles/extras.css
    R frontend/src/main/web/src/styles/styleguide.css
    R frontend/src/main/web/src/utils/DateHelper.js
    R frontend/src/main/web/src/utils/GlossaryHelper.js
    R frontend/src/main/web/src/utils/RoutingHelpers.js
    R frontend/src/main/web/src/utils/StringUtils.js
    R frontend/src/main/web/src/utils/__tests__/GlossaryHelperTest.js
    R frontend/src/main/web/src/utils/__tests__/StringUtilsTest.js
    R frontend/src/main/web/src/utils/callWithSameArgs.js
    R frontend/src/main/web/src/utils/styleUtils.js
    R frontend/src/main/web/styleguide.config.js
    R frontend/src/main/web/styleguide.html
    R frontend/src/main/web/webpack.config.js
    R frontend/src/main/web/webpack.dev.config.js
    R frontend/src/main/web/webpack.legacy.config.js
    R frontend/src/main/web/webpack.prod.config.js
    A frontend/src/npm-shrinkwrap.json
    A frontend/src/package.json
    A frontend/src/styleguide.config.js
    A frontend/src/styleguide.html
    A frontend/src/webpack.config.js
    A frontend/src/webpack.dev.config.js
    A frontend/src/webpack.legacy.config.js
    A frontend/src/webpack.prod.config.js
    M functional-test/pom.xml
    M 
functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M 
functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M 
functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M 
functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    A zanata-editor/pom.xml
    A zanata-editor/src/.babelrc
    A zanata-editor/src/.csscomb.json
    A zanata-editor/src/.eslintrc
    A zanata-editor/src/.gitignore
    A zanata-editor/src/.jsbeautifyrc
    A zanata-editor/src/.jshintrc
    A zanata-editor/src/.storybook/README.md
    A zanata-editor/src/.storybook/config.js
    A zanata-editor/src/.storybook/storybook.css
    A zanata-editor/src/.storybook/webpack.config.js
    A zanata-editor/src/.travis.yml
    A zanata-editor/src/AUTHORS
    A zanata-editor/src/LICENSE.LESSER.txt
    A zanata-editor/src/README.md
    A zanata-editor/src/__tests__/components/ButtonTest.js
    A zanata-editor/src/__tests__/components/DashboardLinkTest.js
    A zanata-editor/src/__tests__/components/DocsDropdownTest.js
    A zanata-editor/src/__tests__/components/DropdownTest.js
    A zanata-editor/src/__tests__/components/IconButtonTest.js
    A zanata-editor/src/__tests__/components/IconButtonToggleTest.js
    A zanata-editor/src/__tests__/components/LanguageDropdownTest.js
    A zanata-editor/src/__tests__/components/NoSuggestionPanelTest.js
    A zanata-editor/src/__tests__/components/PagerTest.js
    A zanata-editor/src/__tests__/components/ProgressBarTest.js
    A zanata-editor/src/__tests__/components/ProjectVersionLinkTest.js
    A zanata-editor/src/__tests__/components/SuggestionContentsTest.js
    A zanata-editor/src/__tests__/components/SuggestionMatchPercentTest.js
    A zanata-editor/src/__tests__/components/SuggestionSourceDetailsTest.js
    A zanata-editor/src/__tests__/components/SuggestionSourcesTest.js
    A zanata-editor/src/__tests__/components/TextDiffTest.js
    A zanata-editor/src/__tests__/components/ToggleSwitchTest.js
    A zanata-editor/src/__tests__/components/TransUnitFilterTest.js
    A zanata-editor/src/__tests__/components/TranslatingIndicatorTest.js
    A zanata-editor/src/__tests__/components/UiLanguageDropdownTest.js
    A zanata-editor/src/__tests__/mock/cssMock.js
    A zanata-editor/src/__tests__/mockAngularGettext.js
    A zanata-editor/src/app/README.md
    A zanata-editor/src/app/actions/controlsHeaderActions.js
    A zanata-editor/src/app/actions/editorShortcuts.js
    A zanata-editor/src/app/actions/headerActions.js
    A zanata-editor/src/app/actions/index.js
    A zanata-editor/src/app/actions/phraseNavigation.js
    A zanata-editor/src/app/actions/phrases.js
    A zanata-editor/src/app/actions/suggestions.js
    A zanata-editor/src/app/api/index.js
    A zanata-editor/src/app/api/suggestions.js
    A zanata-editor/src/app/app.css
    A zanata-editor/src/app/components/Button/index.css
    A zanata-editor/src/app/components/Button/index.js
    A zanata-editor/src/app/components/Button/story.js
    A zanata-editor/src/app/components/DashboardLink.js
    A zanata-editor/src/app/components/DocsDropdown.js
    A zanata-editor/src/app/components/Dropdown/index.css
    A zanata-editor/src/app/components/Dropdown/index.js
    A zanata-editor/src/app/components/FilterToggle/index.css
    A zanata-editor/src/app/components/FilterToggle/index.js
    A zanata-editor/src/app/components/IconButton.js
    A zanata-editor/src/app/components/IconButtonToggle.js
    A zanata-editor/src/app/components/KeyCombinations.js
    A zanata-editor/src/app/components/LanguagesDropdown.js
    A zanata-editor/src/app/components/NoSuggestionsPanel.js
    A zanata-editor/src/app/components/Pager.js
    A zanata-editor/src/app/components/ProgressBar/index.css
    A zanata-editor/src/app/components/ProgressBar/index.js
    A zanata-editor/src/app/components/ProjectVersionLink.js
    A zanata-editor/src/app/components/SplitDropdown/index.css
    A zanata-editor/src/app/components/SplitDropdown/index.js
    A zanata-editor/src/app/components/Suggestion.js
    A zanata-editor/src/app/components/SuggestionContents.js
    A zanata-editor/src/app/components/SuggestionList.js
    A zanata-editor/src/app/components/SuggestionMatchPercent.js
    A zanata-editor/src/app/components/SuggestionSearchInput/index.css
    A zanata-editor/src/app/components/SuggestionSearchInput/index.js
    A zanata-editor/src/app/components/SuggestionSourceDetails.js
    A zanata-editor/src/app/components/SuggestionSources.js
    A zanata-editor/src/app/components/SuggestionTranslationDetails.js
    A zanata-editor/src/app/components/SuggestionTranslations.js
    A zanata-editor/src/app/components/SuggestionUpdateMessage.js
    A zanata-editor/src/app/components/TextDiff/index.css
    A zanata-editor/src/app/components/TextDiff/index.js
    A zanata-editor/src/app/components/TextDiff/story.js
    A zanata-editor/src/app/components/ToggleSwitch/index.css
    A zanata-editor/src/app/components/ToggleSwitch/index.js
    A zanata-editor/src/app/components/TransUnit/index.css
    A zanata-editor/src/app/components/TransUnit/index.js
    A zanata-editor/src/app/components/TransUnitFilter.js
    A zanata-editor/src/app/components/TransUnitLocaleHeading.js
    A zanata-editor/src/app/components/TransUnitSourceHeader.js
    A zanata-editor/src/app/components/TransUnitSourcePanel.js
    A zanata-editor/src/app/components/TransUnitStatus.js
    A zanata-editor/src/app/components/TransUnitTranslationFooter.js
    A zanata-editor/src/app/components/TransUnitTranslationHeader.js
    A zanata-editor/src/app/components/TransUnitTranslationPanel.js
    A zanata-editor/src/app/components/TranslatingIndicator.js
    A zanata-editor/src/app/components/UiLanguageDropdown.js
    A zanata-editor/src/app/components/stories.js
    A zanata-editor/src/app/config.json
    A zanata-editor/src/app/config/intl.js
    A zanata-editor/src/app/containers/ControlsHeader.js
    A zanata-editor/src/app/containers/EditorHeader/index.css
    A zanata-editor/src/app/containers/EditorHeader/index.js
    A zanata-editor/src/app/containers/KeyShortcutCheatSheet/index.css
    A zanata-editor/src/app/containers/KeyShortcutCheatSheet/index.js
    A zanata-editor/src/app/containers/KeyShortcutDispatcher.js
    A zanata-editor/src/app/containers/MainContent.js
    A zanata-editor/src/app/containers/NavHeader.js
    A zanata-editor/src/app/containers/NeedSlugMessage.js
    A zanata-editor/src/app/containers/ParamPropDispatcher.js
    A zanata-editor/src/app/containers/Root/index.css
    A zanata-editor/src/app/containers/Root/index.js
    A zanata-editor/src/app/containers/SuggestionsBody.js
    A zanata-editor/src/app/containers/SuggestionsHeader.js
    A zanata-editor/src/app/containers/SuggestionsPanel.js
    A zanata-editor/src/app/containers/ZanataLogoLoader.js
    A zanata-editor/src/app/css/README.md
    A zanata-editor/src/app/css/base/index.css
    A zanata-editor/src/app/css/base/lib/forms.css
    A zanata-editor/src/app/css/base/lib/global.css
    A zanata-editor/src/app/css/base/lib/headings.css
    A zanata-editor/src/app/css/base/lib/links.css
    A zanata-editor/src/app/css/base/lib/lists.css
    A zanata-editor/src/app/css/base/lib/media.css
    A zanata-editor/src/app/css/base/lib/misc.css
    A zanata-editor/src/app/css/base/lib/text.css
    A zanata-editor/src/app/css/heading/index.css
    A zanata-editor/src/app/css/links/index.css
    A zanata-editor/src/app/css/resizer/index.css
    A zanata-editor/src/app/css/theme/index.css
    A zanata-editor/src/app/css/theme/lib/theme-map.css
    A zanata-editor/src/app/css/theme/lib/theme.css
    A zanata-editor/src/app/css/utils-background/index.css
    A zanata-editor/src/app/css/utils-display/index.css
    A zanata-editor/src/app/css/utils-layout/index.css
    A zanata-editor/src/app/css/utils-list/index.css
    A zanata-editor/src/app/css/utils-position/index.css
    A zanata-editor/src/app/css/utils-size/index.css
    A zanata-editor/src/app/css/utils-space/index.css
    A zanata-editor/src/app/css/utils-text/index.css
    A zanata-editor/src/app/index.css
    A zanata-editor/src/app/index.html
    A zanata-editor/src/app/index.js
    A zanata-editor/src/app/middlewares/getstate-in-actions.js
    A zanata-editor/src/app/middlewares/new-context-fetch.js
    A zanata-editor/src/app/middlewares/selected-phrase-suggestion-search.js
    A zanata-editor/src/app/middlewares/state-change-dispatch.js
    A zanata-editor/src/app/reducers/context.js
    A zanata-editor/src/app/reducers/dropdown.js
    A zanata-editor/src/app/reducers/headerData.js
    A zanata-editor/src/app/reducers/index.js
    A zanata-editor/src/app/reducers/phrase.js
    A zanata-editor/src/app/reducers/suggestions.js
    A zanata-editor/src/app/reducers/ui.js
    A zanata-editor/src/app/translations/README.md
    A zanata-editor/src/app/translations/de.po
    A zanata-editor/src/app/translations/fr.po
    A zanata-editor/src/app/translations/template.pot
    A zanata-editor/src/app/utils/RoutingHelpers.js
    A zanata-editor/src/app/utils/TransStatusService.js
    A zanata-editor/src/app/utils/Util.js
    A zanata-editor/src/app/utils/doc-id.js
    A zanata-editor/src/app/utils/filter-paging-util.js
    A zanata-editor/src/app/utils/phrase.js
    A zanata-editor/src/app/utils/status.js
    A zanata-editor/src/app/utils/string-utils.js
    A zanata-editor/src/app/webpack.config.js
    A zanata-editor/src/app/webpack.dev.config.js
    A zanata-editor/src/app/webpack.prod.config.js
    A zanata-editor/src/gulpfile.js
    A zanata-editor/src/gulpfile.paths.js
    A zanata-editor/src/makefile
    A zanata-editor/src/npm-shrinkwrap.json
    A zanata-editor/src/package.json
    A zanata-model/src/main/java/org/zanata/model/AllowedApp.java
    M zanata-model/src/main/java/org/zanata/model/HAccount.java
    M zanata-overlay/config/remote-deps.groovy
    M 
zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M 
zanata-overlay/distros/wildfly/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M 
zanata-war/src/main/java/org/zanata/action/validator/DuplicateEmailValidator.java
    M zanata-war/src/main/java/org/zanata/adapter/GettextAdapter.java
    M zanata-war/src/main/java/org/zanata/cache/CacheManagerProducer.java
    M zanata-war/src/main/java/org/zanata/config/ConfigStore.java
    A zanata-war/src/main/java/org/zanata/config/OAuthTokenExpiryInSeconds.java
    A zanata-war/src/main/java/org/zanata/config/SupportOAuth.java
    M zanata-war/src/main/java/org/zanata/config/SystemPropertyConfigStore.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/dao/AllowedAppDAO.java
    M zanata-war/src/main/java/org/zanata/dao/CredentialsDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    M zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    M 
zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    M 
zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingFilter.java
    M 
zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M 
zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    M 
zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M 
zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    M 
zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    M 
zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.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
    A zanata-war/src/main/java/org/zanata/rest/oauth/OAuthUtil.java
    A zanata-war/src/main/java/org/zanata/rest/oauth/TokenService.java
    M zanata-war/src/main/java/org/zanata/rest/search/service/SearchService.java
    M zanata-war/src/main/java/org/zanata/rest/service/AccountService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/ProjectVersionService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M 
zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/seam/framework/EntityHome.java
    M 
zanata-war/src/main/java/org/zanata/seam/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    A zanata-war/src/main/java/org/zanata/security/oauth/AuthorizeAction.java
    A zanata-war/src/main/java/org/zanata/security/oauth/SecurityTokens.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/OAuthFilter.java
    M zanata-war/src/main/java/org/zanata/servlet/UrlRewriteConfig.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/java/org/zanata/util/FacesNavigationUtil.java
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/java/org/zanata/util/Introspectable.java
    A zanata-war/src/main/java/org/zanata/webhook/events/TestEvent.java
    M 
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-4.0.xml
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/zanata-infinispan.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/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    R zanata-war/src/main/webapp/app/bundle.css
    R zanata-war/src/main/webapp/app/bundle.css.map
    R zanata-war/src/main/webapp/app/bundle.js
    R zanata-war/src/main/webapp/app/bundle.js.map
    R zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/oauth/home.xhtml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M 
zanata-war/src/test/java/org/zanata/action/validator/DuplicateEmailValidatorTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A 
zanata-war/src/test/java/org/zanata/database/ConnectionWrapperTransactionTest.java
    M 
zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingFilterTest.java
    A 
zanata-war/src/test/java/org/zanata/rest/ZanataRestSecurityInterceptorTest.java
    M 
zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M 
zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/security/oauth/SecurityTokensTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplParameterizedTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    A 
zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplUnitTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/VersionGroupServiceImplTest.java
    M 
zanata-war/src/test/java/org/zanata/service/impl/VersionStateCacheImplTest.java
    M 
zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    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 remote-tracking branch 'upstream/master' into ZNTA-1154

Conflicts:
        zanata-war/src/main/resources/messages.properties


  Commit: 0de29befcd371ee25427b91919ca7f8df2b4db64
      
https://github.com/zanata/zanata-server/commit/0de29befcd371ee25427b91919ca7f8df2b4db64
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2016-07-26 (Tue, 26 Jul 2016)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/CacheAction.java
    M 
zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/admin/cachestats.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml

  Log Message:
  -----------
  Merge remote-tracking branch 'broccolinisoup/ZNTA-1154' into merging-ZNTA-1154


Compare: 
https://github.com/zanata/zanata-server/compare/fec56c8a7d4a^...0de29befcd37
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to