[zanata/zanata-server] 9c0dec: Merge branch 'integration/master' into rhbz1245433...

[GitHub]

  Branch: refs/heads/rhbz1245433-glossary
  Home:   https://github.com/zanata/zanata-server
  Commit: 9c0dec75fe2fe9a5f241f87ab3cb2d974a0c2fd7
      https://github.com/zanata/zanata-server/commit/9c0dec75fe2fe9a5f241f87ab3cb2d974a0c2fd7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-09-29 (Tue, 29 Sep 2015)

  Changed paths:
    M frontend/src/main/web/lib/stores/UserMatrixStore.js
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/account/InactiveAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryEditPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.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/utility/ContactAdminFormPage.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/RoleAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/ui/UIInputContainer.java
    A zanata-war/src/main/java/org/zanata/ui/ValueExpressionAnalyzer.java
    A zanata-war/src/main/java/org/zanata/ui/ZanataUIInputContainer.java
    M zanata-war/src/main/java/org/zanata/ui/faces/FacesMessages.java
    M zanata-war/src/main/resources/messages.properties
    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/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal_anonymous.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    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/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/delete_confirmation_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/display.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/field.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/glossary/upload_glossary_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M 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/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/languages-list.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab-general.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/project/validation-settings-block.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search/users-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.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/request_join_modal.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/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-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/merge_trans_modal.xhtml
    M 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
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_modal.xhtml
    M 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/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.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_nobanner.xhtml
    M zanata-war/src/main/webapp/account/google_password_reset_request.xhtml
    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/home.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/home.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/profile/create_user.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    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
    A zanata-war/src/main/webapp/resources/zanata/decorate.xhtml
    A zanata-war/src/main/webapp/resources/zanata/field.xhtml
    M zanata-war/src/main/webapp/resources/zanata/global-messages.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/project-label.xhtml
    M zanata-war/src/main/webapp/resources/zanata/select-all-checkbox.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    R zanata-war/src/main/webapp/resources/zanata/text-search.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-copy-action-loader.xhtml
    M zanata-war/src/main/webapp/resources/zanata/version-label.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/tm/create.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into rhbz1245433-glossary