[zanata/zanata-server] 9956fe: add plural form for me-ME

Wed Apr 22 04:37:15 UTC 2015

  Branch: refs/heads/jersey-boys
  Home:   https://github.com/zanata/zanata-server
  Commit: 9956fe13ee2e75bfedd6b509ada096e2d4c51966
      https://github.com/zanata/zanata-server/commit/9956fe13ee2e75bfedd6b509ada096e2d4c51966
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-11-28 (Fri, 28 Nov 2014)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  add plural form for me-ME

  Commit: e22728b9dbfcc8f53b240580fc7095bb72372f4c
      https://github.com/zanata/zanata-server/commit/e22728b9dbfcc8f53b240580fc7095bb72372f4c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
    A zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
    A zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/Event.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java

  Log Message:
  -----------
  Emulate CDI events with Seam Events

  Commit: d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
      https://github.com/zanata/zanata-server/commit/d8c8f8e5bc5c77a2d85a6bdcee4da22a0f5364a8
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Change explode profile.

Some problems with the touching of the dodeploy file and made sure the profile can be activated via a property.

  Commit: e239f214029fbbcda7bd03ac49e29763c0999133
      https://github.com/zanata/zanata-server/commit/e239f214029fbbcda7bd03ac49e29763c0999133
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

  Log Message:
  -----------
  Replace the use of seam's jsf messages wrapper.

Create Zanata's own wrapper, which may be replaced later with a CDI extension if needed.

  Commit: 8cad539f4700d4cbdcd87170d9331effa5c8f683
      https://github.com/zanata/zanata-server/commit/8cad539f4700d4cbdcd87170d9331effa5c8f683
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.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/ValidateEmailAction.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/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java

  Log Message:
  -----------
  Replace all uses of Seam's FacesMessages.

Use Zanata's own FacesMessages class instead.

  Commit: d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
      https://github.com/zanata/zanata-server/commit/d6864ea6b9eb4c7d7b0a66c12aefa3be3b795d9b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  Fix messages not appearing when ending conversations.

Implement a 'cache' of messages that gets transfered to the FacesContext using a jsf phase listener. Preety much what Seam does.

  Commit: 01e5b601b95b2e525efc735f24f9098610ce61bd
      https://github.com/zanata/zanata-server/commit/01e5b601b95b2e525efc735f24f9098610ce61bd
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java

  Log Message:
  -----------
  Fix some functional tests.

The new messages phase listener was acting at the wrong time and causing Seam to re-create some page scoped beans.

  Commit: 72fce56b7041e8cec9aa61d1633950b020d1328b
      https://github.com/zanata/zanata-server/commit/72fce56b7041e8cec9aa61d1633950b020d1328b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2015-01-21 (Wed, 21 Jan 2015)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java

  Log Message:
  -----------
  Add unit tests to satisfy coverage requirements.

  Commit: 5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
      https://github.com/zanata/zanata-server/commit/5e5208b3ab0d8fe7bdd2eeaf2760474fc15a0160
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-03 (Tue, 03 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java

  Log Message:
  -----------
  Update code formatting to match checkstyle rules

  Commit: bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
      https://github.com/zanata/zanata-server/commit/bfcfd5438fd9b6926e168017fb674fd66cc9f5dd
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-04 (Wed, 04 Feb 2015)

  Changed paths:
    M functional-test/pom.xml
    R functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/java/org/zanata/util/TestLogger.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-overlay/build.gradle
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    R zanata-war/src/main/java/org/zanata/action/SupportedLanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/CoverageIgnore.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserScriptCallbackHook.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTextBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_af.properties
    A zanata-war/src/main/resources/messages_am.properties
    A zanata-war/src/main/resources/messages_ar.properties
    A zanata-war/src/main/resources/messages_as.properties
    A zanata-war/src/main/resources/messages_ast.properties
    A zanata-war/src/main/resources/messages_az.properties
    A zanata-war/src/main/resources/messages_bg.properties
    A zanata-war/src/main/resources/messages_bn_BD.properties
    A zanata-war/src/main/resources/messages_bn_IN.properties
    M zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_brx.properties
    A zanata-war/src/main/resources/messages_bs.properties
    A zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_cy.properties
    A zanata-war/src/main/resources/messages_da.properties
    A zanata-war/src/main/resources/messages_de.properties
    A zanata-war/src/main/resources/messages_de_CH.properties
    A zanata-war/src/main/resources/messages_de_DE.properties
    A zanata-war/src/main/resources/messages_el.properties
    A zanata-war/src/main/resources/messages_en_GB.properties
    A zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es.properties
    A zanata-war/src/main/resources/messages_es_ES.properties
    A zanata-war/src/main/resources/messages_es_MX.properties
    A zanata-war/src/main/resources/messages_et.properties
    A zanata-war/src/main/resources/messages_eu.properties
    A zanata-war/src/main/resources/messages_fa.properties
    A zanata-war/src/main/resources/messages_fi.properties
    M zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_ga.properties
    A zanata-war/src/main/resources/messages_gl.properties
    A zanata-war/src/main/resources/messages_gu.properties
    A zanata-war/src/main/resources/messages_he.properties
    A zanata-war/src/main/resources/messages_hi.properties
    A zanata-war/src/main/resources/messages_hr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_id.properties
    A zanata-war/src/main/resources/messages_is.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_ka.properties
    A zanata-war/src/main/resources/messages_kn.properties
    A zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_ky.properties
    A zanata-war/src/main/resources/messages_la.properties
    A zanata-war/src/main/resources/messages_lt.properties
    A zanata-war/src/main/resources/messages_lv.properties
    A zanata-war/src/main/resources/messages_mai.properties
    A zanata-war/src/main/resources/messages_ml.properties
    A zanata-war/src/main/resources/messages_mn.properties
    A zanata-war/src/main/resources/messages_mr.properties
    A zanata-war/src/main/resources/messages_ms.properties
    A zanata-war/src/main/resources/messages_nb.properties
    A zanata-war/src/main/resources/messages_nds.properties
    A zanata-war/src/main/resources/messages_nl.properties
    A zanata-war/src/main/resources/messages_nn.properties
    A zanata-war/src/main/resources/messages_or.properties
    A zanata-war/src/main/resources/messages_pa.properties
    A zanata-war/src/main/resources/messages_pl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_pt_PT.properties
    A zanata-war/src/main/resources/messages_ro.properties
    A zanata-war/src/main/resources/messages_ru.properties
    A zanata-war/src/main/resources/messages_si.properties
    A zanata-war/src/main/resources/messages_sk.properties
    A zanata-war/src/main/resources/messages_sl.properties
    A zanata-war/src/main/resources/messages_sq.properties
    A zanata-war/src/main/resources/messages_sr_Cyrl.properties
    A zanata-war/src/main/resources/messages_sr_Latn.properties
    A zanata-war/src/main/resources/messages_sv.properties
    A zanata-war/src/main/resources/messages_ta.properties
    A zanata-war/src/main/resources/messages_ta_IN.properties
    A zanata-war/src/main/resources/messages_te.properties
    A zanata-war/src/main/resources/messages_th.properties
    A zanata-war/src/main/resources/messages_tl.properties
    A zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_vi.properties
    A zanata-war/src/main/resources/messages_xh.properties
    A 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/resources/org/zanata/webtrans/public/Application.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/search.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/css/libs.css
    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/app/translations/de.json
    M zanata-war/src/main/webapp/app/translations/fr.json
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    A zanata-war/src/test/java/org/zanata/action/validator/EmailListValidatorTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/ContentStateToStyleUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/DateUtilTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/util/TextFormatUtilTest.java
    M zanata-war/src/test/resources/arquillian.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
	zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
	zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java

  Commit: 69eb5776d9ca18e1391f7905be5e345d693d8d85
      https://github.com/zanata/zanata-server/commit/69eb5776d9ca18e1391f7905be5e345d693d8d85
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/utility/NamedPredicate.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-test-war/pom.xml
    M zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    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/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    R zanata-war/src/main/java/org/zanata/events/LanguageDisabled.java
    R zanata-war/src/main/java/org/zanata/events/LanguageEnabled.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.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/java/org/zanata/webtrans/client/ui/FileUploadDialog.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/file/TranslationDocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java

  Log Message:
  -----------
  Merge branch 'master' into cdi-prep

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
	zanata-war/src/main/java/org/zanata/action/LanguageAction.java
	zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
	zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
	zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java

  Commit: 7f4463714eee3e0fe3957461f3e6b977863b99ad
      https://github.com/zanata/zanata-server/commit/7f4463714eee3e0fe3957461f3e6b977863b99ad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix dependency problem

  Commit: f258e488784fb1114e8a323803336b0109fa0520
      https://github.com/zanata/zanata-server/commit/f258e488784fb1114e8a323803336b0109fa0520
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-26 (Thu, 26 Feb 2015)

  Changed paths:
    M .gitignore
    M build.sh
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/EmailValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/log4j.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AjaxCounterBean.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/resources/script/test/finished.js

  Log Message:
  -----------
  Merge branch 'reduce-boms' into cdi-prep

Conflicts:
	pom.xml

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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    R functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/RegisterWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/EmailQuery.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    R zanata-war/src/main/webapp/help/edit_help_content.xhtml
    R zanata-war/src/main/webapp/help/view.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java

  Commit: 612ee5db075df5a7f90fd0ae39497c17bd86a509
      https://github.com/zanata/zanata-server/commit/612ee5db075df5a7f90fd0ae39497c17bd86a509
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java

  Log Message:
  -----------
  Fix FacesMessages display component specific message

  Commit: 89ce917d98d414fcc239cae5d9b3bb053d6dae95
      https://github.com/zanata/zanata-server/commit/89ce917d98d414fcc239cae5d9b3bb053d6dae95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-02 (Mon, 02 Mar 2015)

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

  Log Message:
  -----------
  Fix saving server config event

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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    A zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Merge branch 'master' into cdi-prep

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

  Changed paths:
    A docs/configuration/authentication.md
    A docs/configuration/document-storage-directory.md
    A docs/configuration/email.md
    A docs/configuration/infinispan.md
    A docs/configuration/jms-messaging.md
    A docs/images/create-project-completed.png
    A docs/images/create-project.png
    A docs/images/create-version-master.png
    A docs/images/create-version.png
    A docs/images/project-about-settings.png
    A docs/images/project-general-settings.png
    A docs/images/project-languages-add.png
    A docs/images/project-languages-remove.png
    A docs/images/project-languages-settings.png
    A docs/images/project-permissions-settings.png
    A docs/images/project-settings-button.png
    A docs/images/project-translation-settings.png
    A docs/images/user-dashboard-create-version.png
    A docs/index.md
    A docs/release-notes.md
    A docs/user-guide/Opening-a-Translation-Project.md
    A docs/user-guide/client-configuration.md
    A docs/user-guide/contributing-translations.md
    A docs/user-guide/joining-a-language-team.md
    A docs/user-guide/keyboard-shortcuts.md
    A docs/user-guide/project-types.md
    A docs/user-guide/projects/create-project.md
    A docs/user-guide/projects/create-version.md
    A docs/user-guide/projects/project-settings.md
    A docs/user-guide/projects/upload-strings.md
    A docs/user-guide/translators-new-account.md
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    A functional-test/src/main/java/org/zanata/util/LanguageList.java
    R functional-test/src/test/java/org/zanata/feature/administration/HelpPageTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A mkdocs.yml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/HasLanguageSettings.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/rest/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationLocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/service/ProjectLocalesService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractTextSearch.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButton.java
    A zanata-war/src/main/java/org/zanata/ui/ajax/commandbutton/CommandButtonRenderer.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInput.java
    A zanata-war/src/main/java/org/zanata/ui/input/TextInputRenderer.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab-languages.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/zanata.taglib.xml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/settings-tab-languages.js
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-button.xhtml
    A zanata-war/src/main/webapp/resources/zanata/ajax-command-link.xhtml
    A zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    A zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/test/java/org/zanata/config/DatabaseBackedConfigTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/action/VersionHome.java

  Commit: 490b014d7f8b2022e062ffacde2c0e9dca61d7a1
      https://github.com/zanata/zanata-server/commit/490b014d7f8b2022e062ffacde2c0e9dca61d7a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-03-27 (Fri, 27 Mar 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  Log as DEBUG when permission is denied (not WARN)

  Commit: 8ccbfa173e78e44d0ebc3d066c0ddbc7d1c6e894
      https://github.com/zanata/zanata-server/commit/8ccbfa173e78e44d0ebc3d066c0ddbc7d1c6e894
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-03-30 (Mon, 30 Mar 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java

  Log Message:
  -----------
  Implement anonymous pull:

https://bugzilla.redhat.com/show_bug.cgi?id=1172618

Squashed commit of the following:

commit 7dcf92eb065ce759b5f2de6101dbc33d15e6a4af
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 15:29:00 2015 +1000

    Fix 'download-tmx missing quote'

commit 9297d202c5b0a11690d85c7161a769936274ad6c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 16:20:33 2015 +1000

    Remove single quote on API Key in error message

commit 4127de26b31d0f8d3dd8411d0ad6fbac477c7acd
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 15:17:29 2015 +1000

    Add release notes

commit e390c8654ee7d4aea1b17707a776e337c6d3dead
Merge: bd0d3e8 fe9939d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 15:16:33 2015 +1000

    Merge branch 'release' into rhbz1172618

commit bd0d3e8805bd71cb9451ef25b7c00ad787509399
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 13:17:07 2015 +1000

    Add authentication check for TMX REST

commit e7ec0cf7ffb9756afcf2723adeec2cdfb162280c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 07:16:37 2015 +1000

    Fix RawRestTest

commit ff97eab5457eae77c24f6bf02cfc1460fe0d4451
Merge: 65b6188 fd1eab8
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 24 06:53:20 2015 +1000

    Merge branch 'release' into rhbz1172618

commit 65b6188a3a4b0fff91c2fdc549e46b3b5e8c6e2d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 23 13:04:36 2015 +1000

    Refactor rate limiter key, fix functional test

commit 8a7343bd2b986b965d999f292e785842ac24b8d9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 23 11:43:26 2015 +1000

    Add ZANATA_PROXY_HEADER for proxy-header scan

commit 30a3ae764e5052083572b4b468ada920f378a6df
Author: Alex Eng <aeng at redhat.com>
Date:   Sun Mar 22 01:04:40 2015 +1000

    Refactor test and RestLimitingSynchronousDispatcher from PR review

commit a49a516d5c7dca819aeb121b232602a4d2e92f20
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 20 15:56:16 2015 +1000

    Fix checkstyle

commit ec6bea8eb871cff05025bd0e13491e1d4c25dfac
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 20 15:55:02 2015 +1000

    Add unit test and integration test for anonymous REST request

commit 3bf93abbf800fe76f511c0ac2b649087bba49bcf
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 19 09:18:22 2015 +1000

    Allow anonymous REST request for READ: https://bugzilla.redhat.com/show_bug.cgi?id=1172618

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

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimiterToken.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java

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

Conflicts:
	docs/release-notes.md
	zanata-war/src/test/java/org/zanata/RestTest.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
	zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java

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

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  Restore constraints on glossary tables for H2

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

  Changed paths:
    R CHANGELOG.md
    M docs/configuration/authentication.md
    M docs/configuration/infinispan.md
    A docs/configuration/installation.md
    A docs/images/project-view-versions.png
    A docs/images/version-merge-trans-cancel.png
    A docs/images/version-merge-trans-dialog.png
    A docs/images/version-merge-trans-progress.png
    A docs/images/version-more-action-menu.png
    A docs/images/version-view-languages.png
    M docs/index.md
    M docs/release-notes.md
    A docs/user-guide/client-command-hook.md
    M docs/user-guide/client-configuration.md
    A docs/user-guide/merge-translations.md
    M docs/user-guide/project-types.md
    A docs/user-guide/projects/project-view.md
    A docs/user-guide/user-profile.md
    A docs/user-guide/versions/version-view.md
    M etc/scripts/cargowait.sh
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/util/LanguageList.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M mkdocs.yml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTransAction.java
    A zanata-war/src/main/java/org/zanata/action/MergeTranslationsManager.java
    A zanata-war/src/main/java/org/zanata/action/ProfileHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/adapter/OkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    M zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/MergeTranslationsTaskHandle.java
    A zanata-war/src/main/java/org/zanata/cache/CacheContainerProducer.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheLoader.java
    R zanata-war/src/main/java/org/zanata/cache/EhcacheWrapper.java
    A zanata-war/src/main/java/org/zanata/cache/InfinispanCacheWrapper.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/exception/InvalidDateParamException.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/i18n/MessagesFactory.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/ChangePositionalResIdToContentHash.java
    M zanata-war/src/main/java/org/zanata/notification/LanguageTeamPermissionChangeJmsMessagePayloadHandler.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    A zanata-war/src/main/java/org/zanata/rest/dto/TranslationMatrix.java
    A zanata-war/src/main/java/org/zanata/rest/service/DateRange.java
    A zanata-war/src/main/java/org/zanata/rest/service/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    A zanata-war/src/main/java/org/zanata/service/MergeTranslationsService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/MergeTranslationsWork.java
    R zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    A zanata-war/src/main/java/org/zanata/ui/CopyAction.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/MessageGenerator.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp-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/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/merge_trans_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/main/webapp/profile/home.xhtml
    A zanata-war/src/main/webapp/profile/js/bundle.min.js
    M zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    A zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/ArquillianTest.java
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/cache/InfinispanTestCacheContainer.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/java/org/zanata/model/HTextFlowBuilder.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectIterationRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/TranslationsRawCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/rest/service/DateRangeTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.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
    A zanata-war/src/test/java/org/zanata/service/impl/MergeTranslationsServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.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/client/rpc/DummyActivateWorkspaceCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    A zanata-war/src/test/resources/org/zanata/test/model/MergeTranslationsData.dbunit.xml

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into cdi-prep

Conflicts:
	zanata-war/src/main/java/org/zanata/notification/NotificationManager.java

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

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

  Log Message:
  -----------
  Remove log message that was unintentionally committed

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

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

  Log Message:
  -----------
  Merge pull request #757 from zanata/remove-excess-logging

Remove log message that was unintentionally committed

  Commit: 25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
      https://github.com/zanata/zanata-server/commit/25bf1e2dcb5bdc827ad23c89ed04368f7c3a024c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Check errors when a test page is created/returned

We can assume, in cases other than testing the error page, that
the error page should not be seen when transitioning between
other pages.  Add a check in the constructor for all core pages
of Zanata.

  Commit: 846756e5dccd8530faaef9524baeaf049ebb48e3
      https://github.com/zanata/zanata-server/commit/846756e5dccd8530faaef9524baeaf049ebb48e3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Remove excess waits for test page

  Commit: 89ed042e00f8e96fd8d7577d5181ab67675c9a87
      https://github.com/zanata/zanata-server/commit/89ed042e00f8e96fd8d7577d5181ab67675c9a87
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

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

  Commit: bc8a9fa502cbdf70a62b830e0a298311a518f8ca
      https://github.com/zanata/zanata-server/commit/bc8a9fa502cbdf70a62b830e0a298311a518f8ca
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-03-31 (Tue, 31 Mar 2015)

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

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

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

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5

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

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml

  Log Message:
  -----------
  Merge pull request #755 from zanata/restore-glossary-constraints

Restore constraints on glossary tables for H2

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

  Changed paths:
    M docs/configuration/installation.md

  Log Message:
  -----------
  Mention MySQL 5.5 specifically

  Commit: e74f9e52e369fb6055e65e0bebd2508272898709
      https://github.com/zanata/zanata-server/commit/e74f9e52e369fb6055e65e0bebd2508272898709
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  rhbz1165939 Do not display empty actions panel on groups page

  Commit: 1daed2500e28de531e83ffe12cbf5ae23cc18c93
      https://github.com/zanata/zanata-server/commit/1daed2500e28de531e83ffe12cbf5ae23cc18c93
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Merge pull request #760 from zanata/rhbz1165939

rhbz1165939 Do not display empty actions panel on groups page

  Commit: 4b1baa596433b6fa70361b3409645e24621a4a43
      https://github.com/zanata/zanata-server/commit/4b1baa596433b6fa70361b3409645e24621a4a43
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M 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/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.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/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.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/ValidateEmailAction.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
    A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
    A zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    M zanata-war/src/main/java/org/zanata/notification/NotificationManager.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/Event.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
    A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java

  Log Message:
  -----------
  Merge pull request #653 from zanata/cdi-prep

Prepare for CDI move

- Convert our Seam events to be closer to CDI events.
- Reimplement FacesMessages to be independent of Seam.

  Commit: 4fa9e013f9c8442233e5977852510898cae12d8e
      https://github.com/zanata/zanata-server/commit/4fa9e013f9c8442233e5977852510898cae12d8e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Rename Obsolete to Archived in UI and tests

  Commit: e03311131c4bff95df2462d4cc9c45d2d02a59de
      https://github.com/zanata/zanata-server/commit/e03311131c4bff95df2462d4cc9c45d2d02a59de
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-01 (Wed, 01 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #758 from zanata/fix-some-texts

Rename Obsolete to Archived in UI and tests

  Commit: f7988dee4db5826e93cb4b6af09a4af8dd0777b6
      https://github.com/zanata/zanata-server/commit/f7988dee4db5826e93cb4b6af09a4af8dd0777b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Upgrade RichFaces to 4.5.4.Final

  Commit: 0c26461fc1f790e1d1e683c4df291059121c105a
      https://github.com/zanata/zanata-server/commit/0c26461fc1f790e1d1e683c4df291059121c105a
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

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

  Commit: cf1a1f016caaf7d62070c4d6d82e218d8190361d
      https://github.com/zanata/zanata-server/commit/cf1a1f016caaf7d62070c4d6d82e218d8190361d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

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

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

  Commit: 129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
      https://github.com/zanata/zanata-server/commit/129ca6ebabb224ce9edfac4b5b69e54ca5cecab3
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java

  Log Message:
  -----------
  Merge pull request #671 from zanata/remove-excess-wait

Remove excess waits for test page

  Commit: 88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
      https://github.com/zanata/zanata-server/commit/88faf70a20dbe4dd47bcdf3f8d794c02cc6de1f1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/pluralforms.properties

  Log Message:
  -----------
  Merge pull request #641 from zanata/me-plural

add plural form for me-ME

  Commit: c709d394b183c1aff92511185eec3df412789e8c
      https://github.com/zanata/zanata-server/commit/c709d394b183c1aff92511185eec3df412789e8c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Merge pull request #676 from zanata/check-test-for-error-page

Check errors when a test page is created/returned

  Commit: 762490d783ee8ffa8599abf03b39f44a36f93a3a
      https://github.com/zanata/zanata-server/commit/762490d783ee8ffa8599abf03b39f44a36f93a3a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-test-war/pom.xml
	zanata-war/pom.xml

  Commit: 2080dfcfff684f52385c2eb9f27c7d34f7affc15
      https://github.com/zanata/zanata-server/commit/2080dfcfff684f52385c2eb9f27c7d34f7affc15
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-02 (Thu, 02 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Remove unwanted RichFaces dependencies

  Commit: 8ef4f08abe8d036c142ef1410f39286262efbdf0
      https://github.com/zanata/zanata-server/commit/8ef4f08abe8d036c142ef1410f39286262efbdf0
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M docs/release-notes.md

  Log Message:
  -----------
  Add release note for rhbz1165939

  Commit: c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
      https://github.com/zanata/zanata-server/commit/c0b7f4c0db97926ee8196dd4d6874b8d32d2093c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #764 from zanata/fix-rf-deps

Remove unwanted RichFaces dependencies

  Commit: 307b8908e53676bb5b164bd8c1d88f0acc56a631
      https://github.com/zanata/zanata-server/commit/307b8908e53676bb5b164bd8c1d88f0acc56a631
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

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

Conflicts:
	pom.xml

  Commit: 176cf021a4d7c13da0b05f0092236ef866cb2535
      https://github.com/zanata/zanata-server/commit/176cf021a4d7c13da0b05f0092236ef866cb2535
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml
    M zanata.xml

  Log Message:
  -----------
  Update zanata-maven-plugin to 3.6.0; update version to release

  Commit: f857aaadaca09efd379ff741d23277cd584236d3
      https://github.com/zanata/zanata-server/commit/f857aaadaca09efd379ff741d23277cd584236d3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-07 (Tue, 07 Apr 2015)

  Changed paths:
    M pom.xml

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

  Commit: 7f67211741f3f13c2d8ffdb10d79b41e31d4499c
      https://github.com/zanata/zanata-server/commit/7f67211741f3f13c2d8ffdb10d79b41e31d4499c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 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_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

  Log Message:
  -----------
  Fetch latest translations from translate.zanata.org (release)

  Commit: 80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
      https://github.com/zanata/zanata-server/commit/80d40591b9204a6e8e446eb1758f4c92e6e3ba4e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 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_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

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

  Commit: d96793c2bad174bf6812ca4777c107bec138964b
      https://github.com/zanata/zanata-server/commit/d96793c2bad174bf6812ca4777c107bec138964b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Replace single quotes (swallowed by MessageFormat) with double quotes

  Commit: 59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
      https://github.com/zanata/zanata-server/commit/59c5be5f67a63dac7b3dcd18dce47c6d8c1b1d8d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

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

  Log Message:
  -----------
  Remove .url. keys to avoid confusing l10n-maven-plugin:validate

  Commit: 512f620de51ba01058f19207e46f1a0288be5897
      https://github.com/zanata/zanata-server/commit/512f620de51ba01058f19207e46f1a0288be5897
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-08 (Wed, 08 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Set merge=union for release-notes.md in .gitattributes

  Commit: c40c2ddbb773456f98817cc0a4e332e51583e5b5
      https://github.com/zanata/zanata-server/commit/c40c2ddbb773456f98817cc0a4e332e51583e5b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Add Undertow modules from WildFly 9 for WildFly tests

  Commit: 435fa361dc103fe1f4436141fd9ee4f32fdee12e
      https://github.com/zanata/zanata-server/commit/435fa361dc103fe1f4436141fd9ee4f32fdee12e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Handle missing/empty proxy header

  Commit: 82d7892cff874b54cb0fc2365bbdca76921bd4ff
      https://github.com/zanata/zanata-server/commit/82d7892cff874b54cb0fc2365bbdca76921bd4ff
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-09 (Thu, 09 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Add person search tests

  Commit: 4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
      https://github.com/zanata/zanata-server/commit/4cb4b3766a4aa8a4a5b4e507d3158595c542b33d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-10 (Fri, 10 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

  Log Message:
  -----------
  Merge pull request #771 from zanata/handle-missing-proxy-header

Handle missing/empty proxy header

  Commit: 4e098e3236de8c691bb4ace2eade7094c5c84a46
      https://github.com/zanata/zanata-server/commit/4e098e3236de8c691bb4ace2eade7094c5c84a46
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml

  Log Message:
  -----------
  Merge pull request #756 from zanata/mariadb-fix

rhbz1048293 Fix liquibase changeset to be compatible with mysql/mariadb version > 5.5

  Commit: 5e9decdc0f7ec424618175060203f24f19acdf95
      https://github.com/zanata/zanata-server/commit/5e9decdc0f7ec424618175060203f24f19acdf95
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-13 (Mon, 13 Apr 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/util/HttpUtil.java

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

  Commit: 86d1ae0665888e5f83dbc91f4e27b7cca7af5288
      https://github.com/zanata/zanata-server/commit/86d1ae0665888e5f83dbc91f4e27b7cca7af5288
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

  Log Message:
  -----------
  Merge pull request #769 from zanata/merge-release-notes

Set merge=union for release-notes.md in .gitattributes

  Commit: c63409a760de7f59cd1e7489f4067357bab09fad
      https://github.com/zanata/zanata-server/commit/c63409a760de7f59cd1e7489f4067357bab09fad
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-15 (Wed, 15 Apr 2015)

  Changed paths:
    A docs/.gitattributes

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

  Commit: 8e11a04e0e42e00520bcb501d68211d7f86667ce
      https://github.com/zanata/zanata-server/commit/8e11a04e0e42e00520bcb501d68211d7f86667ce
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #768 from zanata/add-undertow-module

Add Undertow modules for WildFly tests

  Commit: 06db1090b75be199498b29a6eea075851d4d9c73
      https://github.com/zanata/zanata-server/commit/06db1090b75be199498b29a6eea075851d4d9c73
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

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

  Commit: e3ffc75a09875eb20b697ae315b742ae2d072e30
      https://github.com/zanata/zanata-server/commit/e3ffc75a09875eb20b697ae315b742ae2d072e30
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "Add Undertow modules from WildFly 9 for WildFly tests"

This reverts commit c40c2ddbb773456f98817cc0a4e332e51583e5b5.

  Commit: d102ee2e4250400ad30412b4ec19e44593283b77
      https://github.com/zanata/zanata-server/commit/d102ee2e4250400ad30412b4ec19e44593283b77
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

  Changed paths:
    M pom.xml

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

  Commit: 0c3dad8bb3d9b44d86eaa928c6bb111b70692839
      https://github.com/zanata/zanata-server/commit/0c3dad8bb3d9b44d86eaa928c6bb111b70692839
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Skip checking of critical errors (too slow due to implicit wait)

  Commit: 9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
      https://github.com/zanata/zanata-server/commit/9c3d0e65ab3f69d91e991ebcbfc4edae72fba380
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-17 (Fri, 17 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java

  Log Message:
  -----------
  Merge pull request #777 from zanata/skip-check-crit

Skip checking of critical errors (too slow due to implicit wait)

  Commit: 7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
      https://github.com/zanata/zanata-server/commit/7fa70afcaadf4f4da28e8e60f8894f9b7eacd53d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #767 from zanata/clean-for-l10n-validate

Clean for l10n validate

  Commit: bae3c77b6fa4f12e5233ff3190e76a2865c5be36
      https://github.com/zanata/zanata-server/commit/bae3c77b6fa4f12e5233ff3190e76a2865c5be36
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml

  Log Message:
  -----------
  Move zanata-assets as JAR and as dependency from zanata-server
https://bugzilla.redhat.com/show_bug.cgi?id=1207423

Squashed commit of the following:

commit 400b523966d085c6f346e95e56144225e6b37e8f
Merge: 6a59b8a 9c3d0e6
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 20 10:18:40 2015 +1000

    Merge branch 'integration/master' into zanata-assets-jar

commit 6a59b8a892d82d287a3b81a733f279f212252eb2
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Apr 17 07:08:34 2015 +1000

    Change overriding of  to system properties

commit 9e90103ad33c4e09d6c3f015ec76885429f430c2
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 16 16:52:15 2015 +1000

    Update release notes, add bean for assets['resource']

commit 253579d009fbf37a340cb72bf74a2aef68278d51
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 14 13:05:10 2015 +1000

    Add jars/assets as prefix for zanata-assets resource

commit 5070aa69dc2cd99121f11a673a25eb33027e68fb
Merge: f28152e 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 12:39:50 2015 +1000

    Merge branch 'integration/master' into zanata-assets-jar

    Conflicts:
    	zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java

commit f28152e856930f7dd69eb1ee76a62e4042c017a4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 08:45:05 2015 +1000

    Refactor assets url to be configurable in standalone.xml

commit 9194662feb68e33626b0ed4d65a542b81faedfbe
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 30 15:00:59 2015 +1000

    Add release notes and comments for zanata-assets-jar changes

commit 5a3f613ef1ad3250f2525dfe6279e5c957d83173
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 30 13:23:31 2015 +1000

    Remove webAssets config, add urlrewrite for .seam extension of resource file

commit f1e12dd8f35f246a7c1bc9f65ec7f4391bb1662d
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Mar 27 15:51:39 2015 +1000

    Migrate to zanata-assets.jar reference

  Commit: 63708bdf5095584ea4add217386013fcfb5b4a4a
      https://github.com/zanata/zanata-server/commit/63708bdf5095584ea4add217386013fcfb5b4a4a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-20 (Mon, 20 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Wait for page loaders to be finished before proceeding

Requires the class 'is-active' to be present in the web element,
as the loader is always present and visible.

  Commit: a50f201e005f0f87592619f10ce24a22fffaa0f4
      https://github.com/zanata/zanata-server/commit/a50f201e005f0f87592619f10ce24a22fffaa0f4
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Merge pull request #779 from zanata/wait-for-loaders

Wait for page loaders to be finished before proceeding

  Commit: 0158851c7cada52fbad2bdcc15ff49d230c14387
      https://github.com/zanata/zanata-server/commit/0158851c7cada52fbad2bdcc15ff49d230c14387
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M zanata-war/src/main/webapp/profile/home.xhtml

  Log Message:
  -----------
  Merge pull request #766 from zanata/person-search-test

Add person search tests

  Commit: 8b3cc44a71879fe89252ffdaff680842da5506af
      https://github.com/zanata/zanata-server/commit/8b3cc44a71879fe89252ffdaff680842da5506af
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java

  Log Message:
  -----------
  Wait for page loaders to be finished before proceeding

Requires the class 'is-active' to be present in the web element,
as the loader is always present and visible.

Conflicts:
	functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Commit: 2be83b0dbf47af1a5673e8f6c37236412c12412c
      https://github.com/zanata/zanata-server/commit/2be83b0dbf47af1a5673e8f6c37236412c12412c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

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

Conflicts:
	functional-test/src/main/java/org/zanata/page/AbstractPage.java

  Commit: 3448525629c793028c96e9f1243f477b8be04f1f
      https://github.com/zanata/zanata-server/commit/3448525629c793028c96e9f1243f477b8be04f1f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

  Changed paths:
    M docs/release-notes.md

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

Add release note for rhbz1165939

  Commit: a0152f0726f0fca4d41482f30db67339a36c9564
      https://github.com/zanata/zanata-server/commit/a0152f0726f0fca4d41482f30db67339a36c9564
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java

  Log Message:
  -----------
  Fix 'restore default' for editor

https://bugzilla.redhat.com/show_bug.cgi?id=895881

Squashed commit of the following:

commit 7d1f1669cda9248612cf26b3de67cccf0656f2fd
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:04:17 2015 +1000

    Restore default for reference locale

commit 826a53eb60af5825ffe147c97b68111f1068c120
Merge: 2e32f1e 3448525
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 19:37:16 2015 +1000

    Merge branch 'integration/master' into rhbz895881

commit 2e32f1e687c08116f783e33c4149d428d6b6da72
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 14 16:18:27 2015 +1000

    Fix 'restore default' for editor
    https://bugzilla.redhat.com/show_bug.cgi?id=895881

  Commit: 973a93a447e080e3af93ff731d60775c4580f31d
      https://github.com/zanata/zanata-server/commit/973a93a447e080e3af93ff731d60775c4580f31d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    A docs/.gitattributes
    M docs/configuration/installation.md
    M docs/release-notes.md
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    A functional-test/src/main/java/org/zanata/page/account/ProfilePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/SetProjectVisibilityTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    A functional-test/src/test/java/org/zanata/feature/search/PersonSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/WebAssetsConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivateAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.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/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryHome.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/ValidateEmailAction.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/config/JndiBackedConfig.java
    A zanata-war/src/main/java/org/zanata/events/ConfigurationChanged.java
    M zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JoinedLanguageTeam.java
    M zanata-war/src/main/java/org/zanata/events/LanguageTeamPermissionChangedEvent.java
    A zanata-war/src/main/java/org/zanata/events/LeftLanguageTeam.java
    A zanata-war/src/main/java/org/zanata/events/LoginCompleted.java
    A zanata-war/src/main/java/org/zanata/events/Logout.java
    A zanata-war/src/main/java/org/zanata/events/ProjectIterationUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ProjectUpdate.java
    A zanata-war/src/main/java/org/zanata/events/ServerStarted.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetStateEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdateContextEvent.java
    M zanata-war/src/main/java/org/zanata/events/TextFlowTargetUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A 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/notification/NotificationManager.java
    R zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/InvalidApiKeyUtil.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.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/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    A zanata-war/src/main/java/org/zanata/ui/faces/FacesMessagesPhaseListener.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/Event.java
    A zanata-war/src/main/java/org/zanata/util/HttpUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ChangeReferenceLangPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_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/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/pluralforms.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/profile/home.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/raw/AnonymousUserRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    A zanata-war/src/test/java/org/zanata/ui/FilterUtilTest.java
    A zanata-war/src/test/java/org/zanata/util/EventPayloadTest.java
    A zanata-war/src/test/java/org/zanata/util/HttpUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into jersey-boys

Conflicts:
	zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
	zanata-war/src/test/java/org/zanata/RestTest.java

Compare: https://github.com/zanata/zanata-server/compare/5c0d9d7b65bd...973a93a447e0