[zanata/zanata-server] 47bc12: Redesign account merge page: https://bugzilla.redh...

GitHub noreply at github.com
Mon Jun 23 04:10:26 UTC 2014 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 47bc12a889d0f48865bb4d7574298e0c87f5d74f
      https://github.com/zanata/zanata-server/commit/47bc12a889d0f48865bb4d7574298e0c87f5d74f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Redesign account merge page: https://bugzilla.redhat.com/show_bug.cgi?id=1110048


  Commit: bf3ca0382565c757f02a7b7420605974a43d7d95
      https://github.com/zanata/zanata-server/commit/bf3ca0382565c757f02a7b7420605974a43d7d95
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  Redesign account merge page to match login page


  Commit: d04498df3ae48d99917ee119a4fd891f3b9452a2
      https://github.com/zanata/zanata-server/commit/d04498df3ae48d99917ee119a4fd891f3b9452a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Remove unused messages string


  Commit: 8f688ea6f12d415639dd1b4e107644b1f2d47a9f
      https://github.com/zanata/zanata-server/commit/8f688ea6f12d415639dd1b4e107644b1f2d47a9f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Re-phrase merge account messages


  Commit: 26379c8a04191e25b64c8f88e07f57d2985ed0f8
      https://github.com/zanata/zanata-server/commit/26379c8a04191e25b64c8f88e07f57d2985ed0f8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.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/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    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
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

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

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml


  Commit: af464162125d1d10a60615c778bec244a630ae8b
      https://github.com/zanata/zanata-server/commit/af464162125d1d10a60615c778bec244a630ae8b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml

  Log Message:
  -----------
  Merge pull request #499 from zanata/rhbz1110048

Redesign account merge page


Compare: https://github.com/zanata/zanata-server/compare/810d8950ff13...af464162125d

More information about the zanata-commits mailing list