[zanata/zanata-server] bb04d2: Merge remote-tracking branch 'origin/master' into ...

GitHub noreply at github.com
Thu Apr 10 05:41:04 UTC 2014 

  Branch: refs/heads/experimental
  Home:   https://github.com/zanata/zanata-server
  Commit: bb04d2b44681c8f79d2792391637b52afbea8bc0
      https://github.com/zanata/zanata-server/commit/bb04d2b44681c8f79d2792391637b52afbea8bc0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    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/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    R functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectSourceDocumentsPage.java
    R functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    A functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    A functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    A functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    A functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    A functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionGeneralTab.java
    A functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    A functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.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/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/project/EditMaintainersTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/EditValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectVersionTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-model/src/test/java/org/zanata/model/HTextFlowTest.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    R zanata-war/src/main/java/org/zanata/action/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    R zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectCopyTransOptionsAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    A zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    R zanata-war/src/main/java/org/zanata/action/ProjectIterationLocaleAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
    R zanata-war/src/main/java/org/zanata/action/ProjectRoleRestrictionAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    R zanata-war/src/main/java/org/zanata/action/ValidationOptionsAction.java
    R zanata-war/src/main/java/org/zanata/action/VersionDetailsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    A zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    R zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M 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/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    A zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    R zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    A zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    A zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    A zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    A zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    A zanata-war/src/main/java/org/zanata/ui/autocomplete/MaintainerAutocomplete.java
    A zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    R zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetLocaleListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/IdForLocale.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/ValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfXSIExtensionValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/XmlEntityValidation.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.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
    M zanata-war/src/main/resources/security.drl
    R zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_legend.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintainedProject.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/loading.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/validation_options.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/validation_options_legend.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/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.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/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/login.xhtml
    R zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    R zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    R zanata-war/src/main/webapp/iteration/edit.xhtml
    R zanata-war/src/main/webapp/iteration/files.xhtml
    R zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    R zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    R zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    R zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/project/homepage_edit.xhtml
    R zanata-war/src/main/webapp/project/index.html
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/zanata/activity-entry.xhtml
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    A zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml
    A 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
    A zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/resources/zanata/statistic.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataTest.groovy
    M zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
    M zanata-war/src/test/java/org/zanata/service/impl/LocaleServiceImplTest.java

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

Conflicts:
	functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
	functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
	functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
	zanata-war/src/main/java/org/zanata/action/ActivityAction.java
	zanata-war/src/main/java/org/zanata/action/DashboardAction.java
	zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintained-project.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintainedProject.xhtml
	zanata-war/src/main/webapp/dashboard/home.xhtml
	zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml


  Commit: 119877d8b17efe790057405701fa46f401a9ace4
      https://github.com/zanata/zanata-server/commit/119877d8b17efe790057405701fa46f401a9ace4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-10 (Thu, 10 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.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/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    A zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml

  Log Message:
  -----------
  Experimental


Compare: https://github.com/zanata/zanata-server/compare/bb04d2b44681^...119877d8b17e

More information about the zanata-commits mailing list