[zanata/zanata-server] ff9cb5: Avoid NullPointerException when projectIter can't ...

GitHub noreply at github.com
Thu Nov 6 03:33:35 UTC 2014


  Branch: refs/heads/gwt260
  Home:   https://github.com/zanata/zanata-server
  Commit: ff9cb51bf69193eba4607216be0e5e8069f5aac2
      https://github.com/zanata/zanata-server/commit/ff9cb51bf69193eba4607216be0e5e8069f5aac2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-28 (Tue, 28 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java

  Log Message:
  -----------
  Avoid NullPointerException when projectIter can't be found


  Commit: d8e92e1aaeb9dfd18835ec4bc4b87ee21b12496a
      https://github.com/zanata/zanata-server/commit/d8e92e1aaeb9dfd18835ec4bc4b87ee21b12496a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    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/EditProfilePage.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/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.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/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.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/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.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/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Replace page getDriver.findElement behaviour with search and wait

In yearning for stability, we want to always endure the elements are
there before we attempt to interact with them. There are two levels of
this:
- The element exists and its attributes can be read
- The element is displayed and enabled, ready for interaction.

As much as possible, this change replaces the unchecked interactions
with search and wait, and removes the existing inline waitFor.untils
that were introduced in specific problem areas.


  Commit: 6fed4b2460954c3b0484b5605e32bf4d3e70cce8
      https://github.com/zanata/zanata-server/commit/6fed4b2460954c3b0484b5605e32bf4d3e70cce8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-30 (Thu, 30 Oct 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Add class name to test start/end logging


  Commit: 8df5ac739b28ec2d20dd59ad1b292155ed6508c7
      https://github.com/zanata/zanata-server/commit/8df5ac739b28ec2d20dd59ad1b292155ed6508c7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java

  Log Message:
  -----------
  Merge pull request #620 from zanata/fix-npe-copy-version

Avoid NullPointerException when projectIter can't be found


  Commit: 9e7ac9a546143193a1f72010f37b0c08314e6f5a
      https://github.com/zanata/zanata-server/commit/9e7ac9a546143193a1f72010f37b0c08314e6f5a
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-03 (Mon, 03 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java

  Log Message:
  -----------
  Merge pull request #623 from zanata/add-class-name-test-output

Add class name to test start/end logging


  Commit: 34625dea0a5114ee6caa9797aeda5341363ddf06
      https://github.com/zanata/zanata-server/commit/34625dea0a5114ee6caa9797aeda5341363ddf06
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml

  Log Message:
  -----------
  fix empty language issue: https://bugzilla.redhat.com/show_bug.cgi?id=1069951


  Commit: 036ba2ee573dfd0c28332453d7dfa57a325d79db
      https://github.com/zanata/zanata-server/commit/036ba2ee573dfd0c28332453d7dfa57a325d79db
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    A zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JSONType.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    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/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    A zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Implement webhooks: https://bugzilla.redhat.com/show_bug.cgi?id=1122776

Squashed commit of the following:

commit bb4fc91c1650da1b3be9bd56aa75c1ff425082fb
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 3 14:44:37 2014 +1000

    Fix unit test

commit 21340690309ee09f3923124271fc3e99e4da7fa2
Merge: acfd4b9 89389da
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 3 14:36:25 2014 +1000

    Merge branch 'integration/master' into rhbz1122776

commit acfd4b98c185ea6eb6d2acc8a4bdbcd1ef570596
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Nov 3 11:07:44 2014 +1000

    Implement asynchronous event for document statistic update

commit bfd4d8b1337df5ab0c53ac2954f7aa26d8f60f20
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 31 14:02:17 2014 +1000

    Revert org.zanata.model* to org.zanata.ui.model.* due to arquillian test

commit 4c549566988d59ed7d3a634077198a8ea9550695
Merge: 94138d5 d15e2d7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 31 11:27:07 2014 +1000

    Merge branch 'rhbz1122776' of github.com:zanata/zanata-server into rhbz1122776

commit 94138d59290d8b81098d1ce8e32b49a8dccee848
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 31 11:25:34 2014 +1000

    Refactor org.zanata.ui.model.statistic to org.zanata.model.statistic, change webhook event to translated+approved and approved

commit 3e4b87c4fb0173c1fc057a1d926fb61d3d94af54
Merge: 0c97c6b c8facd7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 31 11:06:46 2014 +1000

    Merge branch 'integration/master' into rhbz1122776

    Conflicts:
    	zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java

commit 0c97c6bcf9b639c4edaa28e3dcb45fadb728e85f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 31 11:05:24 2014 +1000

    Fix loading on webook, add message when removing webhook

commit d15e2d7704eaf716d73a0a2eb859a99ef5ab73fb
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Oct 31 09:42:30 2014 +1000

    Functional test for project webhooks

commit a13bc8faa98799508702323d6a33b6237f31dd8a
Merge: 0a13a33 240a396
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 28 10:35:44 2014 +1000

    Merge branch 'integration/master' into rhbz1122776

    Conflicts:
    	zanata-war/src/main/resources/db/db.changelog.xml

commit 0a13a3392ff22b3bf42118abc7412c20f3450874
Merge: 0822d48 11a9b5e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 24 09:37:51 2014 +1000

    Merge branch 'integration/master' into rhbz1122776

commit 0822d48e8615effff5045efd71bea341c4b2e65c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 22 13:29:24 2014 +1000

    Implement webhooks: https://bugzilla.redhat.com/show_bug.cgi?id=1122776


  Commit: 12c86f0107d323325a4da012e507da6a8ffa57b8
      https://github.com/zanata/zanata-server/commit/12c86f0107d323325a4da012e507da6a8ffa57b8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    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/EditProfilePage.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/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.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/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.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/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.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/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #624 from zanata/wait-for-all-webelements

Replace page getDriver.findElement behaviour with search and wait


  Commit: 7d27100265044f44f6e8881f0f56d8b3789f85d1
      https://github.com/zanata/zanata-server/commit/7d27100265044f44f6e8881f0f56d8b3789f85d1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java

  Log Message:
  -----------
  Fix server configuration page imports in functional test


  Commit: bca212b9b4719403130e3704e7b5769e7a3c3c2f
      https://github.com/zanata/zanata-server/commit/bca212b9b4719403130e3704e7b5769e7a3c3c2f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-04 (Tue, 04 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java

  Log Message:
  -----------
  Merge pull request #626 from zanata/fix-serverconfigurationpage-compile

Fix server configuration page imports in functional test


  Commit: 27fe054ff7d2efd1c736999f0d75915c0ea5f20c
      https://github.com/zanata/zanata-server/commit/27fe054ff7d2efd1c736999f0d75915c0ea5f20c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

  Log Message:
  -----------
  Fix login button to inline, fix page title


  Commit: 8a9af5e19cf462959d5ed6031b8b4057497c5b4a
      https://github.com/zanata/zanata-server/commit/8a9af5e19cf462959d5ed6031b8b4057497c5b4a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java

  Log Message:
  -----------
  Fix login button to inline, fix page title


  Commit: 8db5803933fe2ce35ffef00bbce00633f1acbe6a
      https://github.com/zanata/zanata-server/commit/8db5803933fe2ce35ffef00bbce00633f1acbe6a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml

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


  Commit: 4c04d9557b1470a4105cd5bf78e4bb058201d95c
      https://github.com/zanata/zanata-server/commit/4c04d9557b1470a4105cd5bf78e4bb058201d95c
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java

  Log Message:
  -----------
  Fix test. Skip the expect notify part (rhbz1160651).


  Commit: 18fe12b3ece7c4d9da2869b74fe6bfd163a93545
      https://github.com/zanata/zanata-server/commit/18fe12b3ece7c4d9da2869b74fe6bfd163a93545
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-05 (Wed, 05 Nov 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java

  Log Message:
  -----------
  Merge pull request #629 from zanata/fix-server-config-test

Fix test. Skip the expect notify part (rhbz1160651).


  Commit: d08d44789ba8b9ae1d8f610ec507d9052e7490fc
      https://github.com/zanata/zanata-server/commit/d08d44789ba8b9ae1d8f610ec507d9052e7490fc
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java

  Log Message:
  -----------
  Fix the title check in a dashboard test


  Commit: 37d83f90b09725c403b1332beb67f79fda492f29
      https://github.com/zanata/zanata-server/commit/37d83f90b09725c403b1332beb67f79fda492f29
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml

  Log Message:
  -----------
  Travis: prefetch dependencies without logging; disable openjdk6

Also add .travis-settings.xml (for OSSRH snapshots)


  Commit: 0a51a3896b036e3ccb60cd1766f87429397591b5
      https://github.com/zanata/zanata-server/commit/0a51a3896b036e3ccb60cd1766f87429397591b5
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml

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


  Commit: 142b95ce1506f95f57df3b0bfcddedb9d3a8a555
      https://github.com/zanata/zanata-server/commit/142b95ce1506f95f57df3b0bfcddedb9d3a8a555
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java

  Log Message:
  -----------
  Merge pull request #631 from zanata/fix-dashboard-createproj-test

Fix the title check in a dashboard test


  Commit: 0e095d22d321f556422e5034fbb2db56baddc71d
      https://github.com/zanata/zanata-server/commit/0e095d22d321f556422e5034fbb2db56baddc71d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  Fix message in new template.xhtml


  Commit: a4178fd8ef1deeb26c1e842b6bf7a55d747d18d8
      https://github.com/zanata/zanata-server/commit/a4178fd8ef1deeb26c1e842b6bf7a55d747d18d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-11-06 (Thu, 06 Nov 2014)

  Changed paths:
    A .travis-settings.xml
    M .travis.yml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    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/EditProfilePage.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/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.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/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.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/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/glossary/GlossaryPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GoogleAccountPage.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.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/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectTranslationTab.java
    A functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectWebHooksTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionTranslationTab.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HelpPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    A functional-test/src/test/java/org/zanata/feature/project/EditWebHooksTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    A zanata-model/src/main/java/org/zanata/model/WebHook.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/WebHookDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentMilestoneEvent.java
    A zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    A zanata-war/src/main/java/org/zanata/events/JSONType.java
    M zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/WebHooksPublisher.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/util/StatisticsUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.6.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    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/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    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/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/loader.xhtml
    A zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationUpdatedManagerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

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


Compare: https://github.com/zanata/zanata-server/compare/ec7a65180dd9...a4178fd8ef1d


More information about the zanata-commits mailing list