[zanata/zanata] 805c1b: WIP: add upload and download of .txt format backed...

GitHub noreply at github.com
Tue Sep 18 06:03:49 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 805c1b9fd3846fb7458066b3443d3872865a5c7f
      https://github.com/zanata/zanata/commit/805c1b9fd3846fb7458066b3443d3872865a5c7f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-15 (Wed, 15 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  WIP: add upload and download of .txt format backed by okapi plaintext filter


  Commit: 620af8a5ac96cd66c7371769230bd2e3e917ca9b
      https://github.com/zanata/zanata/commit/620af8a5ac96cd66c7371769230bd2e3e917ca9b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-16 (Thu, 16 Aug 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters


  Commit: f66b13f1e2100e62ecbd5a2009de452168698716
      https://github.com/zanata/zanata/commit/f66b13f1e2100e62ecbd5a2009de452168698716
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  add standard REST endpoints for original and processed uploaded documents


  Commit: 38267514252144c5e4974809b354c314a605e561
      https://github.com/zanata/zanata/commit/38267514252144c5e4974809b354c314a605e561
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-17 (Fri, 17 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java

  Log Message:
  -----------
  use content-hash as id for plaintext documents


  Commit: ee4c865d71dfbdf4126b204e3a5bf32bc2b6d3ef
      https://github.com/zanata/zanata/commit/ee4c865d71dfbdf4126b204e3a5bf32bc2b6d3ef
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/adapter/DTDAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  add DTD adapter for upload and download of DTD files


  Commit: 1ea33061b3bb9de3d6e6fe03e64245ddf69e1225
      https://github.com/zanata/zanata/commit/1ea33061b3bb9de3d6e6fe03e64245ddf69e1225
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-21 (Tue, 21 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  use map for translations in download file


  Commit: 40481c5925188b62878f19450c52017b49106654
      https://github.com/zanata/zanata/commit/40481c5925188b62878f19450c52017b49106654
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    A zanata-war/src/main/java/org/zanata/exception/FileFormatAdapterException.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  add .odf adapter and improve error handling behaviour


  Commit: 69ee200725e498aea7484ebe2976f4f0298bf374
      https://github.com/zanata/zanata/commit/69ee200725e498aea7484ebe2976f4f0298bf374
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  enable additional file extensions for OpenOfficeAdapter


  Commit: 4ef763cdccb89c5ba81ca280bf7248625f274c83
      https://github.com/zanata/zanata/commit/4ef763cdccb89c5ba81ca280bf7248625f274c83
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    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/GlossaryStatsAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
    M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    A zanata-war/src/main/java/org/zanata/service/SearchService.java
    A zanata-war/src/main/java/org/zanata/service/impl/SearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/HasPageNavigation.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/CancelCallback.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditorTextArea.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationCacheCallback.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingTableModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourceContentsView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableConstants.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsEditModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TransUnitsModel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/EditTransUnitEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/EditTransUnitEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/LoadingEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/LoadingEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/OpenEditorEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageChangeEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageChangeEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageCountChangeEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageCountChangeEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/RequestValidationEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ShowSideMenuEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TableRowSelectedEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TableRowSelectedEventHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/TransUnitSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DashboardPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasLayoutSelection.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNotificationLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/LayoutSelectorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/NotificationPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SourceContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.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/NavigationMessages.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/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/rpc/AbstractAsyncCallback.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/rpc/NoOpAsyncCallback.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/SinglePageDataModelImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitNavigationService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/service/TranslatorInteractionService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ValidationService.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ImageLabel.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingPanel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/OptionsPanelView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/OptionsPanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    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/TransUnitCountGraph.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    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/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/DashboardView.ui.xml
    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
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    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/LayoutSelectorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/LayoutSelectorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsPanelView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitEditView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EventServiceConnectedHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/HasTransUnitId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitId.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitProvidesKey.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnitUpdateRequest.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/FindByTransUnitIdPredicate.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/util/StringNotEmptyPredicate.java
    R zanata-war/src/main/resources/images/crystal_project/_24x24/apps/kfind.png
    R zanata-war/src/main/resources/images/crystal_project/_24x24/devices/Keyboard.png
    A zanata-war/src/main/resources/images/fontello/LICENSE.txt
    A zanata-war/src/main/resources/images/fontello/README.txt
    A zanata-war/src/main/resources/images/fontello/config.json
    A zanata-war/src/main/resources/images/fontello/css/fontello-codes.css
    A zanata-war/src/main/resources/images/fontello/css/fontello-ie7-codes.css
    A zanata-war/src/main/resources/images/fontello/css/fontello-ie7.css
    A zanata-war/src/main/resources/images/fontello/css/fontello.css
    A zanata-war/src/main/resources/images/fontello/demo.html
    A zanata-war/src/main/resources/images/fontello/font/fontello.eot
    A zanata-war/src/main/resources/images/fontello/font/fontello.svg
    A zanata-war/src/main/resources/images/fontello/font/fontello.ttf
    A zanata-war/src/main/resources/images/fontello/font/fontello.woff
    A zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/x.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/ban.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/chevron-down.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/chevron-right.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/cross.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/edit.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/eye-open.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/file.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/house.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/lock.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/search.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/signin.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/signout.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/tick.png
    R zanata-war/src/main/resources/images/zanata-icon/16x16/user.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html
    A zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror-compressed.js
    M zanata-war/src/main/resources/org/zanata/webtrans/public/codemirror.css
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    A zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/META-INF/MANIFEST.MF
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/WEB-INF/web.xml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    R zanata-war/src/main/webapp/stylesheet/base.css
    A zanata-war/src/main/webapp/stylesheet/menu.css
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TransUnitsModelUnitTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/NotificationPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/LICENSE.txt
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/README.txt
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/config.json
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-codes.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-ie7-codes.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello-ie7.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/css/fontello.css
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/demo.html
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.eot
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.svg
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.ttf
    A zanata-war/src/test/java/org/zanata/webtrans/public/images/fontello/font/fontello.woff
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ReplaceTextHandlerTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
     simple import conflict, easily resolved


  Commit: 68ad748f09f8f2f10d38137ec54b2185a3bd47e7
      https://github.com/zanata/zanata/commit/68ad748f09f8f2f10d38137ec54b2185a3bd47e7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-28 (Tue, 28 Aug 2012)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java

  Log Message:
  -----------
  Reapply okapi version update.

Revert "revert okapi version update due to okapi repository issues"

This reverts commit 37042c1dfc15cb0cee294fc561835fa301f759dc.


  Commit: 445c9541e89cd86c229c7086cbd6285bf7e7730f
      https://github.com/zanata/zanata/commit/445c9541e89cd86c229c7086cbd6285bf7e7730f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

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

  Log Message:
  -----------
  add getter for supported file extensions for upload


  Commit: b1f4f1fd2d1301b064b87e60ba5756af62b5b3fd
      https://github.com/zanata/zanata/commit/b1f4f1fd2d1301b064b87e60ba5756af62b5b3fd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  use temp file during source document upload


  Commit: aa0b781a18ab0840414c81f53ae646cfbe8fd524
      https://github.com/zanata/zanata/commit/aa0b781a18ab0840414c81f53ae646cfbe8fd524
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-29 (Wed, 29 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  use temp file for all translation file uploads


  Commit: 9a01811461f90947b3a663c6746df756ee0e5aa3
      https://github.com/zanata/zanata/commit/9a01811461f90947b3a663c6746df756ee0e5aa3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  convert okapi inline codes to and from generic tags


  Commit: 367bf663a8b8b2eacdb1cfefc3e7acfa282fd613
      https://github.com/zanata/zanata/commit/367bf663a8b8b2eacdb1cfefc3e7acfa282fd613
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-08-30 (Thu, 30 Aug 2012)

  Changed paths:
    M pom.xml
    R zanata-war/eclipse/launch/debug-jboss-zanata (1).launch
    M zanata-war/etc/gui-preview/template.xhtml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    R zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
    M zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
    A zanata-war/src/main/java/org/zanata/service/GlossaryFileService.java
    A zanata-war/src/main/java/org/zanata/service/impl/GlossaryFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/Application.gwt.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/GetTransUnitActionContext.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SideMenuPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitEditPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingListDataProvider.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/UndoLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    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/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    R zanata-war/src/main/resources/images/banner_bg.png
    A zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/WebTransStyles.css
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/admin/glossary.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/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    A zanata-war/src/main/webapp/glossary/view.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/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.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/profile/view.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.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
    M zanata-war/src/main/webapp/stylesheet/zanata.css
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/NavigationControllerTest.java

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters


  Commit: f5c4b9e1a14bfa6068ff75fbc87ae1928dd987a8
      https://github.com/zanata/zanata/commit/f5c4b9e1a14bfa6068ff75fbc87ae1928dd987a8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    A zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  add source documents page


  Commit: 8035432f2c4f691aea0aaf15aed729f3657b590b
      https://github.com/zanata/zanata/commit/8035432f2c4f691aea0aaf15aed729f3657b590b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-03 (Mon, 03 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ZPathService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageSizeChangeEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/PageSizeChangeEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationController.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitNavigationService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/NavOptionRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/NavOption.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/UserConfigHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitNavigationServiceTest.java

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters


  Commit: 74d21f6698a1beb2f714a181e5a56618fdca6ca4
      https://github.com/zanata/zanata/commit/74d21f6698a1beb2f714a181e5a56618fdca6ca4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml

  Log Message:
  -----------
  Merge branch 'master' into okapi-filters

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
		kept updated files outbound rule and new source_files outbound rule


  Commit: 7e56f5471bbf6f69614fa4378d0e99e690568746
      https://github.com/zanata/zanata/commit/7e56f5471bbf6f69614fa4378d0e99e690568746
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/pages.xml

  Log Message:
  -----------
  change documents breadcrumbs to show locale+docs as a single page


  Commit: cc2999ea77169404f435d261cb27482da7abd6cf
      https://github.com/zanata/zanata/commit/cc2999ea77169404f435d261cb27482da7abd6cf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  refactor exceptions for file upload and download


  Commit: eb29127be9daeb841e341ea32dad9da424540460
      https://github.com/zanata/zanata/commit/eb29127be9daeb841e341ea32dad9da424540460
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.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/source_files.xhtml

  Log Message:
  -----------
  add pot file download to source documents page


  Commit: c21d924e5f700c6bf99ddc2e4302f98880bb128b
      https://github.com/zanata/zanata/commit/c21d924e5f700c6bf99ddc2e4302f98880bb128b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/files.xhtml

  Log Message:
  -----------
  remove source document upload link from translation documents page


  Commit: f97d37a3e0c194cd71b56912d933c7a9c9eba8f9
      https://github.com/zanata/zanata/commit/f97d37a3e0c194cd71b56912d933c7a9c9eba8f9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-04 (Tue, 04 Sep 2012)

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

  Log Message:
  -----------
  fix incorrectly rejecting .pot during web UI upload


  Commit: caf2b9a3dad191473f303d2962404ded99a2d90a
      https://github.com/zanata/zanata/commit/caf2b9a3dad191473f303d2962404ded99a2d90a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java

  Log Message:
  -----------
  update okapi to version 0.18


  Commit: 0ce39999c1eb6377ed6aec6ccd61b874c43b33a9
      https://github.com/zanata/zanata/commit/0ce39999c1eb6377ed6aec6ccd61b874c43b33a9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-13 (Thu, 13 Sep 2012)

  Changed paths:
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/rest/files/DocumentFileUploadForm.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  add source document upload REST method


  Commit: 84be005054411acc96c8af444b6a0500a5971dfd
      https://github.com/zanata/zanata/commit/84be005054411acc96c8af444b6a0500a5971dfd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  add translation file upload REST endpoint


  Commit: 19dd3d565edcc54156ddd45cba2957e6eb24af25
      https://github.com/zanata/zanata/commit/19dd3d565edcc54156ddd45cba2957e6eb24af25
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  improve error messages for failed rest file upload


  Commit: 8e50bba24ceb4b538efedc657bf3d94b6027c563
      https://github.com/zanata/zanata/commit/8e50bba24ceb4b538efedc657bf3d94b6027c563
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java

  Log Message:
  -----------
  prevent use of gettext extensions for non-po translation file upload


  Commit: 36804b58363ed44ec2e7e4d6ac8b8ee3377e5d89
      https://github.com/zanata/zanata/commit/36804b58363ed44ec2e7e4d6ac8b8ee3377e5d89
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/adapter/DTDAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/GenericOkapiFilterAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/PlainTextAdapter.java
    A zanata-war/src/main/java/org/zanata/exception/FileFormatAdapterException.java
    A zanata-war/src/main/java/org/zanata/rest/files/DocumentFileUploadForm.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    A zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge branch 'okapi-filters' into integration/master

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
		only import conflicts

	zanata-war/src/main/webapp/WEB-INF/pages.xml
		very minor difference

	zanata-war/src/main/webapp/iteration/files.xhtml
		panel removed at end in okapi-filters where a new panel was added in integration/master


  Commit: 4168bbfd245a0d59809e421d18b5f9b509b60db2
      https://github.com/zanata/zanata/commit/4168bbfd245a0d59809e421d18b5f9b509b60db2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-09-17 (Mon, 17 Sep 2012)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

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


Compare: https://github.com/zanata/zanata/compare/fa9da768d161...4168bbfd245a


More information about the zanata-commits mailing list