[zanata/zanata-server] b2a8d8: Merge branch 'dashboard' into tmx-dashboard

GitHub noreply at github.com
Fri Aug 2 05:55:18 UTC 2013 

  Branch: refs/heads/tmx-dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
      https://github.com/zanata/zanata-server/commit/b2a8d8e5abdf2f95c8634e337517da0a8e6d064c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-01 (Thu, 01 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.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/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    A functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/security/Login.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    A zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-model/src/main/java/org/zanata/model/HDocument.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/IsEntityWithType.java
    A zanata-model/src/main/java/org/zanata/model/type/EntityType.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A 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/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/events/DocumentUploadedEvent.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/UserRedirectBean.java
    A zanata-war/src/main/java/org/zanata/service/ActivityService.java
    A zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.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
    R zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/gwt/standard/standard.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/piwik.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/right_menu.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/search_panel.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    A zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/login_input.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    A zanata-war/src/main/webapp/dashboard/activity.xhtml
    A zanata-war/src/main/webapp/dashboard/home.xhtml
    A zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/add_identity.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/profile/merge_account.xhtml
    M zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/copy_trans_options.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/edit.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/homepage_edit.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/create_version_group.xhtml
    M zanata-war/src/main/webapp/version-group/edit.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/dao/DocumentDAOTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ActivityServiceImplTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'dashboard' into tmx-dashboard

Conflicts:
	zanata-model/src/main/java/org/zanata/model/HDocument.java
	zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
	zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
	zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
	zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

More information about the zanata-commits mailing list