[zanata/zanata] dfc0d3: Merge branch 'integration/master' of github.com:za...

GitHub noreply at github.com
Tue Apr 2 06:02:35 UTC 2013 

  Branch: refs/heads/rhbz923461
  Home:   https://github.com/zanata/zanata
  Commit: dfc0d39bcc5f7b2ee6cfb4b276d08d0f6a3ec168
      https://github.com/zanata/zanata/commit/dfc0d39bcc5f7b2ee6cfb4b276d08d0f6a3ec168
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: 17efb7fa41f047c62ecf1f3e093ca70b2e3b4832
      https://github.com/zanata/zanata/commit/17efb7fa41f047c62ecf1f3e093ca70b2e3b4832
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/ValidationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocValidationResultEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HasStatsFilter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/DocumentListPager.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/StaticWidgetCell.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/RemainingHoursColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StaticWidgetColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StatisticColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TooltipColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TranslatedColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/UntranslatedColumn.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigationResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunDocValidationAction.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/RunDocValidationResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
    M zanata-war/src/main/resources/META-INF/ehcache.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: bbd84631c5783a6d2204823ae398654073cc668f
      https://github.com/zanata/zanata/commit/bbd84631c5783a6d2204823ae398654073cc668f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java

  Log Message:
  -----------
  Hide last validation run info


  Commit: bcf842365b68342c7de4b4d06b0820699e67aadc
      https://github.com/zanata/zanata/commit/bcf842365b68342c7de4b4d06b0820699e67aadc
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-04-01 (Mon, 01 Apr 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentStatsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStats.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentStatsResult.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  Work in progress: async call for stats in document list


Compare: https://github.com/zanata/zanata/compare/50147c6a4c48...bcf842365b68

More information about the zanata-commits mailing list