[zanata/zanata-server] 7c09cd: Merge branch 'integration/master' into rhbz1077439

GitHub noreply at github.com
Wed Apr 30 04:34:02 UTC 2014 

  Branch: refs/heads/copy-trans-ui
  Home:   https://github.com/zanata/zanata-server
  Commit: 7c09cda3c4d0007155e49844fd0b77b501ea2a29
      https://github.com/zanata/zanata-server/commit/7c09cda3c4d0007155e49844fd0b77b501ea2a29
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-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/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/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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


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

  Changed paths:
    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/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  Have copyTrans options in version page


  Commit: 1c03d88bbdc46e8c14082f9fabc1deb82d2228f2
      https://github.com/zanata/zanata-server/commit/1c03d88bbdc46e8c14082f9fabc1deb82d2228f2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.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/util/ComparatorUtil.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    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/documents-tab.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/settings-tab.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    A zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java

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


  Commit: 24f2cec9ad045f7768f9964f913c0b544b8621bf
      https://github.com/zanata/zanata-server/commit/24f2cec9ad045f7768f9964f913c0b544b8621bf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M functional-test/pom.xml
    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/SignInPage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    R functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.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/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    R zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardUserStats.java
    R zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.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/QueryProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/UserSettingsAction.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/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    A zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.4.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/activity.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintained-project.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.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/documents-tab.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/settings-tab.xhtml
    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/dashboard/home.xhtml
    R zanata-war/src/main/webapp/profile/add_identity.xhtml
    R zanata-war/src/main/webapp/profile/edit.xhtml
    R zanata-war/src/main/webapp/profile/identities.xhtml
    R zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    A zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java

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


  Commit: 2b316891b2ecb0903555233ea9b0f311b18ccb06
      https://github.com/zanata/zanata-server/commit/2b316891b2ecb0903555233ea9b0f311b18ccb06
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  WIP: new copy trans ui in version page


  Commit: 8e548a8c270ee9350f2f80f93de7949db77f1aa9
      https://github.com/zanata/zanata-server/commit/8e548a8c270ee9350f2f80f93de7949db77f1aa9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-04-30 (Wed, 30 Apr 2014)

  Changed paths:
    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/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  implement modal window for copytrans option in version page


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    R functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    R functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/setup.properties
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.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/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/limits/LeakyBucket.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    A zanata-war/src/main/java/org/zanata/limits/RestCallLimiter.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    A zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A 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/ZanataResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/Configuration.java
    A zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    A zanata-war/src/main/java/org/zanata/util/Introspectable.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    A zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    A zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    A zanata-war/src/test/java/org/zanata/limits/RestCallLimiterTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    A zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Merge branch 'integration/master' into copy-trans-ui


Compare: https://github.com/zanata/zanata-server/compare/7c09cda3c4d0^...bddb5a844a6c

More information about the zanata-commits mailing list