[zanata/zanata-server] 7580ee: rhbz1066756 - First changes for new dashboard.

GitHub noreply at github.com
Tue Apr 29 00:11:31 UTC 2014 

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 7580ee31ad706fe72e3ba8645a04b0e76929486a
      https://github.com/zanata/zanata-server/commit/7580ee31ad706fe72e3ba8645a04b0e76929486a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-24 (Mon, 24 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/dashboard/activity.old.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.old.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  rhbz1066756 - First changes for new dashboard.

Most sections are still static.


  Commit: a78e90d343bebb5a4fe82c0b915426e95bebbce5
      https://github.com/zanata/zanata-server/commit/a78e90d343bebb5a4fe82c0b915426e95bebbce5
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  rhbz1066756 - Add fully functional activity panel.


  Commit: 59fe34d1bac76b3f8f4b80d70f6c2a3ab67fb9a2
      https://github.com/zanata/zanata-server/commit/59fe34d1bac76b3f8f4b80d70f6c2a3ab67fb9a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardUserStats.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  user statistic in dashboard


  Commit: 3faf72a3570810b4ccef2bc3a763ad5a2cb590b1
      https://github.com/zanata/zanata-server/commit/3faf72a3570810b4ccef2bc3a763ad5a2cb590b1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Add User settings panel to the Dashboard.

Email change working in this revision.


  Commit: b75777feaeac564b8b6ec1ebae7b3015862fdfdd
      https://github.com/zanata/zanata-server/commit/b75777feaeac564b8b6ec1ebae7b3015862fdfdd
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-25 (Tue, 25 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardUserStats.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

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


  Commit: 570f7ce326b064bc08612daecfc61b50789f02d2
      https://github.com/zanata/zanata-server/commit/570f7ce326b064bc08612daecfc61b50789f02d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-03-26 (Wed, 26 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Display reviewed stats only for reviewer


  Commit: edaab42cea4b418ec4b5f3ed850ae9819a68199f
      https://github.com/zanata/zanata-server/commit/edaab42cea4b418ec4b5f3ed850ae9819a68199f
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Enable password change from dashboard.


  Commit: c99d6dd1112d32d6daa902f6821317ce5db7c193
      https://github.com/zanata/zanata-server/commit/c99d6dd1112d32d6daa902f6821317ce5db7c193
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-03-28 (Fri, 28 Mar 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz1066756' of github.com:zanata/zanata into rhbz1066756


  Commit: 0b6d58385da528cb9297f00950c17a6b60dc0dca
      https://github.com/zanata/zanata-server/commit/0b6d58385da528cb9297f00950c17a6b60dc0dca
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    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/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Finish user settings tab functionality.


  Commit: 516b93d4e7ca6b1493f444bb39535e6f4ff597b3
      https://github.com/zanata/zanata-server/commit/516b93d4e7ca6b1493f444bb39535e6f4ff597b3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-02 (Wed, 02 Apr 2014)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  rhbz1066756 - Add activity tab url on dashboard screen.


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js

  Log Message:
  -----------
  rhbz1066756 - Language team's settings tab migrated to JSF.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    A zanata-war/src/main/java/org/zanata/action/helper/PagedDataHandler.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintainedProject.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
    R zanata-war/src/main/webapp/dashboard/activity.old.xhtml
    R zanata-war/src/main/webapp/dashboard/activity.xhtml
    R zanata-war/src/main/webapp/dashboard/home.old.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    R zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    R zanata-war/src/main/webapp/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Hide dashboard layout files.

Also hide projects tab when no projects are maintained by the logged in user.


  Commit: ae3d184f7011fa03291250dfc4bc42fbf3df4bb7
      https://github.com/zanata/zanata-server/commit/ae3d184f7011fa03291250dfc4bc42fbf3df4bb7
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/helper/PagedDataHandler.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  rhbz1066756 - Disable paging buttons when not needed.

Add urls for project / version on maintained project's table.


  Commit: 850b1e15ffdeb6541962e0260390917e1e2c96bb
      https://github.com/zanata/zanata-server/commit/850b1e15ffdeb6541962e0260390917e1e2c96bb
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-07 (Mon, 07 Apr 2014)

  Changed paths:
    M .gitattributes
    M branch-release.sh
    M pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ConfigurableNgramAnalyzer.java
    M zanata-model/src/main/java/org/zanata/model/HTermComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/FillInTranslationGap.groovy
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.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/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/adapter/HTMLAdapterDefaultConfiguration.yml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/test/java/org/zanata/rest/compat/StatisticsCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/compat/VersionCompatibilityITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetLocaleListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

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


  Commit: a7c5687350a14540e76f82c6f52d4d64c683f2ca
      https://github.com/zanata/zanata-server/commit/a7c5687350a14540e76f82c6f52d4d64c683f2ca
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  rhbz1066756 - Refactor Dashboard function tests.


  Commit: c063658370d6f9a23cf740ccb987eef9e977716e
      https://github.com/zanata/zanata-server/commit/c063658370d6f9a23cf740ccb987eef9e977716e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-08 (Tue, 08 Apr 2014)

  Changed paths:
    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/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/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Refactor dashboard page for functional tests.


  Commit: 2d7cb37c34308c562f14eb7bf0479474c936b6a4
      https://github.com/zanata/zanata-server/commit/2d7cb37c34308c562f14eb7bf0479474c936b6a4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml

  Log Message:
  -----------
  rhbz1066756 - Dashboard: Reintroduce last translated indicator for project list.


  Commit: 5f8ff486725c41f1a28432a2795ae927d27c1d28
      https://github.com/zanata/zanata-server/commit/5f8ff486725c41f1a28432a2795ae927d27c1d28
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Add i18n to the new dashboard pages.


  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: 5e554d7c72eb15d980deb004a58391c094533fe9
      https://github.com/zanata/zanata-server/commit/5e554d7c72eb15d980deb004a58391c094533fe9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-11 (Fri, 11 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:
  -----------
  rhbz1066756 - Integrate new dashboard with project page components.


  Commit: db564f4d3cf6f7eef61ae63538be663f72492503
      https://github.com/zanata/zanata-server/commit/db564f4d3cf6f7eef61ae63538be663f72492503
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M 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/dashboard/settings.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/zanata/list-filter.xhtml

  Log Message:
  -----------
  rhbz1066756 - Refactor the table filter classes.

The new classes allow for paging using the database, as well as in-memory paging.
Also changed a few components on the dashboard page.
Fix checkstyle violations.


  Commit: 5a05dfab86c7d8c540700e6909a0f6969aeaf7ab
      https://github.com/zanata/zanata-server/commit/5a05dfab86c7d8c540700e6909a0f6969aeaf7ab
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  rhbz1066756 - Review fixes.


  Commit: 6eb18714b27d862228a4f4d580dc707d1f03d5d6
      https://github.com/zanata/zanata-server/commit/6eb18714b27d862228a4f4d580dc707d1f03d5d6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-11 (Fri, 11 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    R zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    R zanata-war/src/main/java/org/zanata/action/helper/PagedDataHandler.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    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

  Log Message:
  -----------
  rhbz1066756 - Review fixes and other changes.

i18n of messages.
Remove unneeded pages and classes.
Change the top menu so that 'Settings' is no longer available. It should be now replaced by the dashboard.


  Commit: 7e74ba091c0c01dfaf146d7613aa8ac5a3571147
      https://github.com/zanata/zanata-server/commit/7e74ba091c0c01dfaf146d7613aa8ac5a3571147
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.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/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  rhbz1066756 - Code base cleanup.

Remove a few unnecessary classes.
Repurpose other classes to avoid duplication.
All this in order to get code coverage up.


  Commit: b928416c114503a9e33a6ef0a094580de4dc9575
      https://github.com/zanata/zanata-server/commit/b928416c114503a9e33a6ef0a094580de4dc9575
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

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

Conflicts:
	zanata-war/src/main/resources/messages.properties


  Commit: ae20fb417d5f42faf8ebb40c40ae6b2a74477998
      https://github.com/zanata/zanata-server/commit/ae20fb417d5f42faf8ebb40c40ae6b2a74477998
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 Apr 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.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/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/ProjectVersionsPage.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/util/WebElementUtil.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/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.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
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M pom.xml
    M zanata-war/pom.xml
    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/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    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 rhbz1066756

Conflicts:
	functional-test/src/main/java/org/zanata/page/BasePage.java
	functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
	functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
	functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
	functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
	functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
	functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
	functional-test/src/main/java/org/zanata/util/WebElementUtil.java
	functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
	functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
	functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
	functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
	functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
	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/java/org/zanata/action/ProjectHome.java
	zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
	zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
	zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
	zanata-war/src/main/java/org/zanata/util/DateUtil.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/project/versions-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/documents-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
	zanata-war/src/main/webapp/dashboard/home.xhtml
	zanata-war/src/main/webapp/resources/script/components-script.js
	zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
	zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml


  Commit: 4941cc8e8f6a8399b58ae410b963ef935aca9cd3
      https://github.com/zanata/zanata-server/commit/4941cc8e8f6a8399b58ae410b963ef935aca9cd3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 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/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/DashboardSettingsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M 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/ui/AbstractListFilter.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
   rhbz1066756 - Fix functional tests after merging with latest master.


  Commit: 7b87d66f6b9ba9acee70fbcf4ee40feba658a1b9
      https://github.com/zanata/zanata-server/commit/7b87d66f6b9ba9acee70fbcf4ee40feba658a1b9
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-14 (Mon, 14 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/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/DashboardSettingsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M 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/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
  rhbz1066756 - Fix functional tests after merging with latest master.


  Commit: 376114b00bf76f829520faa833522fc028b50c82
      https://github.com/zanata/zanata-server/commit/376114b00bf76f829520faa833522fc028b50c82
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    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/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
   rhbz1066756 - QA review changes


  Commit: 8cf49f33cea91e0d71e858e9a1ff50955cd13f5a
      https://github.com/zanata/zanata-server/commit/8cf49f33cea91e0d71e858e9a1ff50955cd13f5a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Log Message:
  -----------
  Merge branch 'rhbz1066756' of github.com:zanata/zanata into rhbz1066756

Conflicts:
	zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java


  Commit: 322e65f30c56d8c62a1812e94b6fe810c704829b
      https://github.com/zanata/zanata-server/commit/322e65f30c56d8c62a1812e94b6fe810c704829b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.4.xml
    M zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  rhbz1066756 - Add indexes to text flow target table to make some stats load way faster.


  Commit: cf27085a6577c0901d0e4e8f124eafb59b5c5bdd
      https://github.com/zanata/zanata-server/commit/cf27085a6577c0901d0e4e8f124eafb59b5c5bdd
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-04-15 (Tue, 15 Apr 2014)

  Changed paths:
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.4.xml

  Log Message:
  -----------
  rhbz1066756 - Correct styling error


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml

  Log Message:
  -----------
  rhbz1066756 - Correct QA flagged issues.


  Commit: 07dd6eef24086246c50f65195084a37062fefc52
      https://github.com/zanata/zanata-server/commit/07dd6eef24086246c50f65195084a37062fefc52
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-04-22 (Tue, 22 Apr 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java

  Log Message:
  -----------
  rhbz1066756 - Fix test coverage.


  Commit: d7079fd18cac2e3fa732fc243b305ef33852848f
      https://github.com/zanata/zanata-server/commit/d7079fd18cac2e3fa732fc243b305ef33852848f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Fix error in h:outputText tag

Tag was not formatted correctly, text was not displayed.


  Commit: ae6c0c40f1946633faa4177b56daa691ecdfa9b7
      https://github.com/zanata/zanata-server/commit/ae6c0c40f1946633faa4177b56daa691ecdfa9b7
  Author: Carlos A. Munoz <camunoz 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/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/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.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/documents-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/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
	zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
	zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java


  Commit: 4b5892d03bd4c7ddb646ebb8e87728275e7d48d6
      https://github.com/zanata/zanata-server/commit/4b5892d03bd4c7ddb646ebb8e87728275e7d48d6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-04-28 (Mon, 28 Apr 2014)

  Changed paths:
    A zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java

  Log Message:
  -----------
  Add autocomplete test.


  Commit: 427f1283b1d8f5ace0578657bb55689303874ad0
      https://github.com/zanata/zanata-server/commit/427f1283b1d8f5ace0578657bb55689303874ad0
  Author: Damian Jansen <djansen 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 pull request #408 from zanata/rhbz1066756

Rhbz1066756 - Merge user settings pages into dashboard


Compare: https://github.com/zanata/zanata-server/compare/c7ca62a57d9b...427f1283b1d8

More information about the zanata-commits mailing list