[zanata/zanata-server] 68eb55: Merge branch 'integration/master' into rhbz1224912...

[GitHub]

  Branch: refs/heads/rhbz1224912-exclude-user-filter
  Home:   https://github.com/zanata/zanata-server
  Commit: 68eb55194e2d50eb35d05b89a73a544bd9cd1e9e
      https://github.com/zanata/zanata-server/commit/68eb55194e2d50eb35d05b89a73a544bd9cd1e9e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-06-23 (Tue, 23 Jun 2015)

  Changed paths:
    M docs/release-notes.md
    A etc/scripts/extractAppserver.groovy
    A frontend/README.md
    M frontend/pom.xml
    A frontend/src/main/web/user-profile-page/npm-shrinkwrap.json
    M frontend/src/main/web/user-profile-page/package.json
    M frontend/src/main/web/user-profile-page/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
    A zanata-war/src/etc/dependencyVersions.groovy
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/JsonDateSerializer.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/Suggestion.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/SuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/TextFlowSuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/suggestion/TransMemoryUnitSuggestionDetail.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/SuggestionsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/SuggestionsResource.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/LevenshteinTokenUtil.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/resources/messages.properties
    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_cs.properties
    M zanata-war/src/main/resources/messages_de.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_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.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_ko.properties
    M zanata-war/src/main/resources/messages_nl.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/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/app/config.json
    M zanata-war/src/main/webapp/app/css/app.css
    M zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    M zanata-war/src/main/webapp/app/index.html
    M zanata-war/src/main/webapp/app/js/app.js
    M zanata-war/src/main/webapp/app/js/libs.js
    M zanata-war/src/main/webapp/app/js/templates.js
    M zanata-war/src/main/webapp/app/maps/app.js.map
    M zanata-war/src/main/webapp/app/maps/libs.js.map
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/script/commonmark-preview.js
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/test/java/org/zanata/search/LevenshteinTokenUtilTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/ui/ActivityEntryTest.java
    M zanata-war/src/test/java/org/zanata/util/HtmlUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1224912-exclude-user-filter