[zanata/zanata-server] 8c2c43: Fix home page not refresh when content changes: ht...

GitHub noreply at github.com
Thu Aug 8 06:18:55 UTC 2013 

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 8c2c43538e090f1d8801ee7fa3e6e8c681469a8c
      https://github.com/zanata/zanata-server/commit/8c2c43538e090f1d8801ee7fa3e6e8c681469a8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java

  Log Message:
  -----------
  Fix home page not refresh when content changes: https://bugzilla.redhat.com/show_bug.cgi?id=988162


  Commit: 24f229bd4a41324a23b7364523ed5eb34a50cb79
      https://github.com/zanata/zanata-server/commit/24f229bd4a41324a23b7364523ed5eb34a50cb79
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

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

  Log Message:
  -----------
  Remove unnecessary spaces in line


  Commit: c06aa0ab4125a60868c6bd89fdaa69cfc888d09d
      https://github.com/zanata/zanata-server/commit/c06aa0ab4125a60868c6bd89fdaa69cfc888d09d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.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/config/JndiBackedConfig.java

  Log Message:
  -----------
  Add an event listener that clears out a single configuration property when it's changed.


  Commit: be23c0b00fbdaf0f6333abed5becbdc5376e774a
      https://github.com/zanata/zanata-server/commit/be23c0b00fbdaf0f6333abed5becbdc5376e774a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.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/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/DocumentWithId.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.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-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    A zanata-model/src/main/java/org/zanata/model/HasEntityStatus.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlow.java
    A zanata-model/src/main/java/org/zanata/model/ITextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/SimpleNamedDocument.java
    R zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    R zanata-model/src/main/java/org/zanata/model/SimpleTargetContents.java
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    R zanata-model/src/main/java/org/zanata/model/SourceContents.java
    R zanata-model/src/main/java/org/zanata/model/TargetContents.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TransMemoryUnitVariant.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    A zanata-model/src/main/java/org/zanata/util/TMXConstants.java
    A zanata-model/src/main/java/org/zanata/util/TMXParseException.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.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/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    A zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    R zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryUnitDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    A zanata-war/src/main/java/org/zanata/exception/EntityMissingException.java
    A zanata-war/src/main/java/org/zanata/rest/TMXParseExceptionMapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    A zanata-war/src/main/java/org/zanata/rest/service/TransMemoryTMXExportStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationsTMXExportStrategy.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslatedTextFlowFilter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.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/UserAccountServiceImpl.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeRuleRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/SearchResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    R zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOptions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeRule.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/AbstractValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationFactory.java
    A zanata-war/src/main/java/org/zanata/xml/StreamSerializer.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    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/changepassword.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/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.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/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.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/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.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/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    R zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowStreamingDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    A zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransMemoryTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTranslationsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlow.java
    A zanata-war/src/test/java/org/zanata/rest/service/SimpleTextFlowTarget.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    R zanata-war/src/test/java/org/zanata/service/impl/TranslatedTextFlowFilterTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/java/org/zanata/xml/StreamSerializerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/dubious-tm-with-underscores.tmx
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-contents.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx
    A zanata-war/src/test/resources/tmx/valid-tmx-with-metadata.tmx

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

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


  Commit: bc14ea9d82608762ca0e614413ffe2fd82febeaa
      https://github.com/zanata/zanata-server/commit/bc14ea9d82608762ca0e614413ffe2fd82febeaa
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-07 (Wed, 07 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.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/config/JndiBackedConfig.java

  Log Message:
  -----------
  Merge pull request #100 from zanata/rhbz988162

Fix home page not refresh when content changes: https://bugzilla.redhat.com/show_bug.cgi?id=988162


Compare: https://github.com/zanata/zanata-server/compare/5552f8f720fd...bc14ea9d8260

More information about the zanata-commits mailing list