[zanata/zanata-server] 29c2dc: Implement bookmarkable url for version and project...

GitHub noreply at github.com
Mon May 12 03:43:14 UTC 2014 

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 29c2dc35dc2f1f70eef5706b832e85ce73270ffe
      https://github.com/zanata/zanata-server/commit/29c2dc35dc2f1f70eef5706b832e85ce73270ffe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.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/layout/project/settings-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/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
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.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/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:
  -----------
  Implement bookmarkable url for version and project page
Squashed commit of the following:

commit 30d7509f5f414324b80f02d622c685c27946713a
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 5 12:18:50 2014 +1000

    Update functional test

commit f0c91140ff73cc28b23c973cb8ea1afbcf225cab
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 2 14:37:23 2014 +1000

    bookmarkable url for project and version page

commit 08514186d65dd1dcd5ba06a772709f4c840db22c
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 2 12:51:09 2014 +1000

    WIP: version - document tab

commit 08daff86947c993042cda26a733ca8ec1d329f9a
Merge: c1b0eac 4ec8ed7
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 15:59:06 2014 +1000

    Merge branch 'integration/master' into version-bookmark

commit c1b0eac85f2a1eaffee216dbc5891631833d6387
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 15:57:56 2014 +1000

    WIP: refactoring bookmark on project and group page


  Commit: f07519c2f9ff83e223d27a1bda6c3c2a19ade7bb
      https://github.com/zanata/zanata-server/commit/f07519c2f9ff83e223d27a1bda6c3c2a19ade7bb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

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

  Log Message:
  -----------
  fix functional test


  Commit: 8312344f46768dfbc389c18433f98f64f9670131
      https://github.com/zanata/zanata-server/commit/8312344f46768dfbc389c18433f98f64f9670131
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R 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/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.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/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.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
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.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
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.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/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.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
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.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
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R 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/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M pom.xml
    M zanata-war/pom.xml
    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/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    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/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
    M zanata-war/src/main/webapp/iteration/view.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/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into version-bookmark

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
	zanata-war/src/main/webapp/iteration/view.xhtml
	zanata-war/src/main/webapp/project/project.xhtml
	zanata-war/src/main/webapp/version-group/version_group.xhtml


  Commit: f608a04c1b929a72f863356c30f6f271545119c8
      https://github.com/zanata/zanata-server/commit/f608a04c1b929a72f863356c30f6f271545119c8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    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/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Update a tag with new markup


  Commit: b1b4ed98575189d78ac8a041dffcc2be3e596e50
      https://github.com/zanata/zanata-server/commit/b1b4ed98575189d78ac8a041dffcc2be3e596e50
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.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/layout/project/settings-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/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
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.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/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 pull request #431 from zanata/version-bookmark

Implement bookmarkable url for version and project page


Compare: https://github.com/zanata/zanata-server/compare/ac971be1301b...b1b4ed985751

More information about the zanata-commits mailing list