[zanata/zanata] 7fe1bf: Merge branch 'master' of github.com:zanata/zanata

noreply at github.com noreply at github.com
Fri Jan 6 05:42:00 UTC 2012


  Branch: refs/heads/rhbz749439
  Home:   https://github.com/zanata/zanata

  Commit: 7fe1bfcd9b2567d4eae2182d7289d100a7db64b4
      https://github.com/zanata/zanata/commit/7fe1bfcd9b2567d4eae2182d7289d100a7db64b4
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EditTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/NoSuchWorkspaceException.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.java

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


  Commit: ae29a61cb999f2b4611534958f6f9f485ffde1db
      https://github.com/zanata/zanata/commit/ae29a61cb999f2b4611534958f6f9f485ffde1db
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

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

  Log Message:
  -----------
  ensure final reindex batch is properly flushed


  Commit: 60006fc7e7069e9e813983e6d5127de72fa57d0a
      https://github.com/zanata/zanata/commit/60006fc7e7069e9e813983e6d5127de72fa57d0a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

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

  Log Message:
  -----------
  Merge branch 'rhbz747836' into 1.4


  Commit: c53316f49858a4198036e11434ca663edfda8f1c
      https://github.com/zanata/zanata/commit/c53316f49858a4198036e11434ca663edfda8f1c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/COPYING
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/README.txt
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_diff.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_match.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_patch.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_uncompressed.js

  Log Message:
  -----------
  Add google-diff-match-patch 20111117


  Commit: 53869df6bd3595fd986e8d2483c0fe7647c296d8
      https://github.com/zanata/zanata/commit/53869df6bd3595fd986e8d2483c0fe7647c296d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransMemoryView.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirror.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html

  Log Message:
  -----------
  Add DiffMatchPatchLabel; use in Translation Memory view


  Commit: 53bbdf11bd40ba1cea9b97477f6013f174fdcfdd
      https://github.com/zanata/zanata/commit/53bbdf11bd40ba1cea9b97477f6013f174fdcfdd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Log Message:
  -----------
  Merge commit '49dc7986cb82c7127fe60bd2164389d5ad9e4e91'


  Commit: 32be8ba6e71f2f63c658d253c2ad9176bc6e7ab0
      https://github.com/zanata/zanata/commit/32be8ba6e71f2f63c658d253c2ad9176bc6e7ab0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

  Log Message:
  -----------
  Merge branch '1.4'


  Commit: 456b012a94efe0f3bbdf8e7e7e0e3850e1e2d84a
      https://github.com/zanata/zanata/commit/456b012a94efe0f3bbdf8e7e7e0e3850e1e2d84a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java

  Log Message:
  -----------
  update doclist rpc to allow filters


  Commit: abc53432c29b3deb5957cb5bda9c17c5b30b8814
      https://github.com/zanata/zanata/commit/abc53432c29b3deb5957cb5bda9c17c5b30b8814
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ValidationEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserOptionsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/validate.png

  Log Message:
  -----------
  Integrate 'Run validate' button to validate against selected TransUnit, implement HTML and XML tag validation


  Commit: 6c4edac60c0e43284503f95ca259e5a78651f4e8
      https://github.com/zanata/zanata/commit/6c4edac60c0e43284503f95ca259e5a78651f4e8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/comment/SimpleComment.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ExtensionSet.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/LocaleList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ResourceMetaList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz756235


  Commit: cb89cf6aac5796cf50e26b498e1bb96b12056861
      https://github.com/zanata/zanata/commit/cb89cf6aac5796cf50e26b498e1bb96b12056861
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java

  Log Message:
  -----------
  add title and document parameters to query string


  Commit: 00f1382d2942aba08320b0abc8c96fbba2418ca0
      https://github.com/zanata/zanata/commit/00f1382d2942aba08320b0abc8c96fbba2418ca0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java

  Log Message:
  -----------
  Merge branch 'rhbz758587'

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java


  Commit: 79474bda331c9b91482c54a53a0bd2b4d9afa1bc
      https://github.com/zanata/zanata/commit/79474bda331c9b91482c54a53a0bd2b4d9afa1bc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java

  Log Message:
  -----------
  use document path and name for bookmarking instead of numeric id


  Commit: ba9ed10123ae5fce23885df02a488aab9e1d57c6
      https://github.com/zanata/zanata/commit/ba9ed10123ae5fce23885df02a488aab9e1d57c6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/gwt-unitCache/gwt-unitCache-0000013411AE1624
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Moved 'Participant' into bottom panel with tab


  Commit: 4bf069930b4895cea55d9ac09162d2bbbab0570f
      https://github.com/zanata/zanata/commit/4bf069930b4895cea55d9ac09162d2bbbab0570f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

  Log Message:
  -----------
  Fix bug: Editor table stops working after 'Source and Target' search returns no results: https://bugzilla.redhat.com/show_bug.cgi?id=759994


  Commit: 7b7c987e4ddb781f4e3a288fb4020f961583b1fe
      https://github.com/zanata/zanata/commit/7b7c987e4ddb781f4e3a288fb4020f961583b1fe
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java

  Log Message:
  -----------
  Merge branch '1.4'


  Commit: f072bb3814fcb3f1680d98b0e2028c8a32dd84f8
      https://github.com/zanata/zanata/commit/f072bb3814fcb3f1680d98b0e2028c8a32dd84f8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  rhbz760390 Add support for GWT's UTF-8 Properties files; handle entries where value is the empty string


  Commit: 9c18769cb02957df2cd1203cd3a78eb561af0d38
      https://github.com/zanata/zanata/commit/9c18769cb02957df2cd1203cd3a78eb561af0d38
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  Merge branch 'rhbz760390' into 1.4


  Commit: 1fe8483a38aa89c7a64febcb282225931c614314
      https://github.com/zanata/zanata/commit/1fe8483a38aa89c7a64febcb282225931c614314
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-05 (Mon, 05 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  add defaults to history token, needs debugging


  Commit: 2934c391666c3b2f738d6c18f4995e7190bbe767
      https://github.com/zanata/zanata/commit/2934c391666c3b2f738d6c18f4995e7190bbe767
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Tweak tab UI


  Commit: 015785dd408c2f9b1caa32a9fbd6cb28bfb48084
      https://github.com/zanata/zanata/commit/015785dd408c2f9b1caa32a9fbd6cb28bfb48084
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    R server/zanata-war/src/main/gwt-unitCache/gwt-unitCache-0000013411AE1624

  Log Message:
  -----------
  Delete GWT cache files


  Commit: b6545478963562a336cae22f062c426a5a118a6a
      https://github.com/zanata/zanata/commit/b6545478963562a336cae22f062c426a5a118a6a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M .gitignore
  M CHANGELOG.md
  M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  A server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-war/eclipse/launch/Integration_Tests.launch
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/action/AdminActionBean.java
  M server/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
  M server/zanata-war/src/main/java/org/zanata/action/PersonHome.java
  A server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  A server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailList.java
  A server/zanata-war/src/main/java/org/zanata/action/validator/EmailListValidator.java
  A server/zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
  A server/zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
  A server/zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
  A server/zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
  M server/zanata-war/src/main/java/org/zanata/search/LevenshteinUtil.java
  M server/zanata-war/src/main/java/org/zanata/service/LocaleService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/FolderNode.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/FolderNode.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/Node.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationCacheCallback.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingTableModel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/NavTransUnitEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UserConfigChangeHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectStatusCountHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCount.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCountResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
  M server/zanata-war/src/main/resources/META-INF/components.xml
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/messages.properties
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/configure.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
  M server/zanata-war/src/main/resources/security.drl
  R server/zanata-war/src/main/webapp-jboss/WEB-INF/components.xml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/search_panel.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  A server/zanata-war/src/main/webapp/edit_home_content_code.xhtml
  A server/zanata-war/src/main/webapp/help/contact_admin.xhtml
  A server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/help/view.xhtml
  M server/zanata-war/src/main/webapp/home.xhtml
  M server/zanata-war/src/main/webapp/img/logo.png
  A server/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  A server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  A server/zanata-war/src/main/webapp/project/homepage_edit.xhtml
  M server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  A server/zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOTest.java
  A server/zanata-war/src/test/java/org/zanata/search/LevenshteinUtilTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
  R server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetProjectStatusCountCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch '1.4' into rhbz742872

Conflicts:
	client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
	server/zanata-war/pom.xml


  Commit: 77b644f769e1233da5f8893699f181de9d8de1d8
      https://github.com/zanata/zanata/commit/77b644f769e1233da5f8893699f181de9d8de1d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-06 (Tue, 06 Dec 2011)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java

  Log Message:
  -----------
  Add dryRun option for Maven goals 'push' and 'pull'


  Commit: 08b24461b032094dabb5413826214ca96f80c617
      https://github.com/zanata/zanata/commit/08b24461b032094dabb5413826214ca96f80c617
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-07 (Wed, 07 Dec 2011)

  Changed paths:
    M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java

  Log Message:
  -----------
  Fix compilation problem introduced in commit 3e23a73c (Ant tasks)


  Commit: 937e2f0c7ace55db75ed047118ec5231523a5f9a
      https://github.com/zanata/zanata/commit/937e2f0c7ace55db75ed047118ec5231523a5f9a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/.gitignore

  Log Message:
  -----------
  add gitignore on GWT cached files


  Commit: 3dc5049c81eb66496ffab420c9677fe4c3204a86
      https://github.com/zanata/zanata/commit/3dc5049c81eb66496ffab420c9677fe4c3204a86
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  add default document path


  Commit: 4e73570da679178c62b514e1c6477c2418aed181
      https://github.com/zanata/zanata/commit/4e73570da679178c62b514e1c6477c2418aed181
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  use default value for history token view


  Commit: eaf97fc959f5421313c8e84c6a03e864baab353f
      https://github.com/zanata/zanata/commit/eaf97fc959f5421313c8e84c6a03e864baab353f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  use default value for history token filter text


  Commit: 4bf027e44a382bfd84fd620ae26ecd3462772edc
      https://github.com/zanata/zanata/commit/4bf027e44a382bfd84fd620ae26ecd3462772edc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  use default value for history token filter type


  Commit: adea24cb8769a7093c08589eba40bb2d6a74b5e3
      https://github.com/zanata/zanata/commit/adea24cb8769a7093c08589eba40bb2d6a74b5e3
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  clean up history token code and tweak behaviour

	don't show editor unless there is a valid document to load


  Commit: 5c9fdfe5bc1995e012cf8b1025a95f364b6528a2
      https://github.com/zanata/zanata/commit/5c9fdfe5bc1995e012cf8b1025a95f364b6528a2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  Revert "add defaults to history token, needs debugging"
it was too buggy, did it more carefully in another branch that will be merged after this revert.

This reverts commit 1fe8483a38aa89c7a64febcb282225931c614314.


  Commit: 24434e29b750279a3fb34157bd37b430c327bbb8
      https://github.com/zanata/zanata/commit/24434e29b750279a3fb34157bd37b430c327bbb8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  Merge branch 'refactor' into rhbz757621


  Commit: 53aea2808d28c2c9c0216ebaf1a563f582d90c10
      https://github.com/zanata/zanata/commit/53aea2808d28c2c9c0216ebaf1a563f582d90c10
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java

  Log Message:
  -----------
  Merge branch 'rhbz757621'


  Commit: f61d6dfd3504478201ed899c6c343cf8afdc2833
      https://github.com/zanata/zanata/commit/f61d6dfd3504478201ed899c6c343cf8afdc2833
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  update changelog


  Commit: a89011f3cc041b89053a822924f052e20d879f8c
      https://github.com/zanata/zanata/commit/a89011f3cc041b89053a822924f052e20d879f8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsiblePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsiblePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Moved Translation Unit Details into each row


  Commit: 3f63c41b0d38fb7dfbf43087c9253ec8aed5ee09
      https://github.com/zanata/zanata/commit/3f63c41b0d38fb7dfbf43087c9253ec8aed5ee09
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-08 (Thu, 08 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java

  Log Message:
  -----------
  add tests for HistoryToken class


  Commit: b8a1540d0d884364a826e6616f417fc1ce17f11d
      https://github.com/zanata/zanata/commit/b8a1540d0d884364a826e6616f417fc1ce17f11d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-09 (Fri, 09 Dec 2011)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java

  Log Message:
  -----------
  clarify descriptive comment in sample GWT test case


  Commit: 0ad8a18951091268c7964fd19da628094d749a82
      https://github.com/zanata/zanata/commit/0ad8a18951091268c7964fd19da628094d749a82
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M server/zanata-war/etc/scripts/zanata-deploy.sh

  Log Message:
  -----------
  Change zanata-deploy script.

The deploy script now deploys all server artifacts in a single step, and then checks for the availability of all servers.


  Commit: 68db78eb7bce6f8824c9f55e441036c7305e6981
      https://github.com/zanata/zanata/commit/68db78eb7bce6f8824c9f55e441036c7305e6981
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java

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


  Commit: 99feea6eda611daaf042ebb6e976dbaa1a4a7766
      https://github.com/zanata/zanata/commit/99feea6eda611daaf042ebb6e976dbaa1a4a7766
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release zanata-1.4.4


  Commit: f725507ec8b19a54ac3ff606efb0526286f9dd38
      https://github.com/zanata/zanata/commit/f725507ec8b19a54ac3ff606efb0526286f9dd38
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration


  Commit: f8842393df45c7650b8ba54e055c37fd16f0ba2e
      https://github.com/zanata/zanata/commit/f8842393df45c7650b8ba54e055c37fd16f0ba2e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  remove unused methods from DocumentListPresenter


  Commit: e72882b7778329fd021580e3b57f8eaed3f9c6d6
      https://github.com/zanata/zanata/commit/e72882b7778329fd021580e3b57f8eaed3f9c6d6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-11 (Sun, 11 Dec 2011)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog


  Commit: f0a27bed37607eec67137aa4d9d4b851d1f72cf0
      https://github.com/zanata/zanata/commit/f0a27bed37607eec67137aa4d9d4b851d1f72cf0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java

  Log Message:
  -----------
  add testable history interface


  Commit: e5838297917e39750ed3aac42738541b2fa75554
      https://github.com/zanata/zanata/commit/e5838297917e39750ed3aac42738541b2fa75554
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java

  Log Message:
  -----------
  add testable window location interface


  Commit: 3adde38add49ad621620532d816a401abf6e641b
      https://github.com/zanata/zanata/commit/3adde38add49ad621620532d816a401abf6e641b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java

  Log Message:
  -----------
  use testable history and window location interfaces in document list presenter


  Commit: 597ea94ac5aad299ddf72185568ea2f97b9b6af8
      https://github.com/zanata/zanata/commit/597ea94ac5aad299ddf72185568ea2f97b9b6af8
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Remove hard validation of Character Encoding.

Character encoding is no longer returning an error when not UTF-8. Instead, it now returns a warning when not in UTF-8, ASCII.


  Commit: d41f96353cda54f6603bf15b5da3914382caf594
      https://github.com/zanata/zanata/commit/d41f96353cda54f6603bf15b5da3914382caf594
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java

  Log Message:
  -----------
  More work on module support


  Commit: 575c14ea64fc46243ffb0150d678c1aea56f7e11
      https://github.com/zanata/zanata/commit/575c14ea64fc46243ffb0150d678c1aea56f7e11
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  approximately mock around document list presenter bind method

	no tests in this suite are working yet, and the mocking code needs
	significant revision, however the bind method does complete successfully
	which is a solid beginning.

	the next phase is to look at improving the mock objects so that different
	known states can be set up for testing expected behaviour.


  Commit: 0b2b5b308cd133470b92a51e5800834b8fef27f1
      https://github.com/zanata/zanata/commit/0b2b5b308cd133470b92a51e5800834b8fef27f1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java

  Log Message:
  -----------
  Merge branch 'rhbz757621' (early part)


  Commit: e6a31c422a0a6f9bc201ae0847a416b385ae4a24
      https://github.com/zanata/zanata/commit/e6a31c422a0a6f9bc201ae0847a416b385ae4a24
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ValidationEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ValidationEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Impliment validation error message underneath editor


  Commit: af2b5a027037d9c54adad6c7d5900754f15754af
      https://github.com/zanata/zanata/commit/af2b5a027037d9c54adad6c7d5900754f15754af
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEvent.java

  Log Message:
  -----------
  Fix problem with validation error message


  Commit: c16906005ad0c1f4c5d5587d3595e1c7f2dde133
      https://github.com/zanata/zanata/commit/c16906005ad0c1f4c5d5587d3595e1c7f2dde133
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-12 (Mon, 12 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M server/zanata-war/etc/scripts/zanata-deploy.sh
  M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz756235

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java


  Commit: d92b15fa0d868bc3a42311a2f03e13298adf898e
      https://github.com/zanata/zanata/commit/d92b15fa0d868bc3a42311a2f03e13298adf898e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java

  Log Message:
  -----------
  Work in progress: implement transunid details and validation section only visible when selected


  Commit: 3acf7165f3c0074478e9b7947bd23ef87dd926a7
      https://github.com/zanata/zanata/commit/3acf7165f3c0074478e9b7947bd23ef87dd926a7
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

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

  Log Message:
  -----------
  Add more valid character encoding options for PO files.

(rhbz748727)
Add case-insensitive validation for character encodings: utf8, CHARACTER.


  Commit: 1426487522f0a035b052fcd2ebcd48d9e133defa
      https://github.com/zanata/zanata/commit/1426487522f0a035b052fcd2ebcd48d9e133defa
  Author: Carlos Munoz <camunoz at camunoz.csb>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java

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


  Commit: fc087b0a4c2c1961fc8efaf85863c185c943086e
      https://github.com/zanata/zanata/commit/fc087b0a4c2c1961fc8efaf85863c185c943086e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java

  Log Message:
  -----------
  Implement 1 sec interval validation check


  Commit: 2aaf98af6d7340bbac9b49d91fae86c00cc2c2a8
      https://github.com/zanata/zanata/commit/2aaf98af6d7340bbac9b49d91fae86c00cc2c2a8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-13 (Tue, 13 Dec 2011)

  Changed paths:
    M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java

  Log Message:
  -----------
  Implement support for pushing modules


  Commit: ff903b8516120178d2bc9b91639cfd0b4726cb2f
      https://github.com/zanata/zanata/commit/ff903b8516120178d2bc9b91639cfd0b4726cb2f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java

  Log Message:
  -----------
  Finish support for pulling modules


  Commit: da9940c442f21669f95976b5c99c4eb29e68b05d
      https://github.com/zanata/zanata/commit/da9940c442f21669f95976b5c99c4eb29e68b05d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-common-api/pom.xml
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'rhbz742872' into 1.4


  Commit: 2f79eca4938ee1a9f033d41442094b760b3ac4f1
      https://github.com/zanata/zanata/commit/2f79eca4938ee1a9f033d41442094b760b3ac4f1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationDetailsPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorConfigConstants.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserOptionsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationDetailsView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Work in progress: Moved 'Options' menu to right side panel


  Commit: 5c9bab12d16081a82ea1c62a4f651f59a5f790c4
      https://github.com/zanata/zanata/commit/5c9bab12d16081a82ea1c62a4f651f59a5f790c4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/leftArrow.png

  Log Message:
  -----------
  Remove unused image


  Commit: d3759d7f3581da8061ebd72ac83fdf6976921fdf
      https://github.com/zanata/zanata/commit/d3759d7f3581da8061ebd72ac83fdf6976921fdf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

  Log Message:
  -----------
  Moved shortcut config option to right side panel


  Commit: 9931f26e01fa97a094e0847f72413974f93765a2
      https://github.com/zanata/zanata/commit/9931f26e01fa97a094e0847f72413974f93765a2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-14 (Wed, 14 Dec 2011)

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

  Log Message:
  -----------
  Merge branch 'master' into rhbz756235


  Commit: cafb78a7fdd9ead7bdd511ea9c239ea0e3d7e2df
      https://github.com/zanata/zanata/commit/cafb78a7fdd9ead7bdd511ea9c239ea0e3d7e2df
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java

  Log Message:
  -----------
  Fix 'Option' button display


  Commit: af317b27af680237c0b71ac5416e1e08fd247671
      https://github.com/zanata/zanata/commit/af317b27af680237c0b71ac5416e1e08fd247671
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java

  Log Message:
  -----------
  Remove unused image


  Commit: ee2727ae7cb4d61f012ba8f41c18f5e7903d6683
      https://github.com/zanata/zanata/commit/ee2727ae7cb4d61f012ba8f41c18f5e7903d6683
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsiblePanel.java

  Log Message:
  -----------
  Remove unused UI widget


  Commit: 3eb5512a0543a827bcf5fa566ad3c4ae56c085c3
      https://github.com/zanata/zanata/commit/3eb5512a0543a827bcf5fa566ad3c4ae56c085c3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsiblePanel.ui.xml

  Log Message:
  -----------
  Remove unused ui widget


  Commit: 0fcf1c115fa3626fc909a4f19d2e5a78d841aa41
      https://github.com/zanata/zanata/commit/0fcf1c115fa3626fc909a4f19d2e5a78d841aa41
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml

  Log Message:
  -----------
  Replace UserListItem widget with Label, moved EditorConfigConstants to resources


  Commit: 2f643aaaaedd5f977156cdd986a75744a15a5611
      https://github.com/zanata/zanata/commit/2f643aaaaedd5f977156cdd986a75744a15a5611
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M client/zanata-maven-plugin/pom.xml

  Log Message:
  -----------
  fix unit tests


  Commit: 3646cc5dc5cf0183ae00a531d559ebdf2125c4be
      https://github.com/zanata/zanata/commit/3646cc5dc5cf0183ae00a531d559ebdf2125c4be
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java

  Log Message:
  -----------
  merge branch 1.4 into master

	conflicted: PropWriter, PropReaderTests


  Commit: 9edeec2c158f8d8dc12246e420af5aff5c735907
      https://github.com/zanata/zanata/commit/9edeec2c158f8d8dc12246e420af5aff5c735907
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Log Message:
  -----------
  Merge commit 'f725507ec8b19a54ac3ff606efb0526286f9dd38'


  Commit: d84aa9b175249a1ede2b94a5c01e80804af310b8
      https://github.com/zanata/zanata/commit/d84aa9b175249a1ede2b94a5c01e80804af310b8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-15 (Thu, 15 Dec 2011)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Merge commit 'e72882b7778329fd021580e3b57f8eaed3f9c6d6'

Conflicts:
	CHANGELOG.md


  Commit: 9873fa533e7ae5168e1f2451c78f560fb40cc43d
      https://github.com/zanata/zanata/commit/9873fa533e7ae5168e1f2451c78f560fb40cc43d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

  Log Message:
  -----------
  Fix non-clickable editor buttons


  Commit: a72c8b540e64e64fdb74468673bd308b42e9a2e6
      https://github.com/zanata/zanata/commit/a72c8b540e64e64fdb74468673bd308b42e9a2e6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans.properties
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans_mismatch.properties
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans_nested.properties
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/ZanataClient.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListLocalCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptions.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/AbstractGlossaryPushReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryCSVReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPoReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryCSVReaderTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryPoReaderTest.java
  A client/zanata-client-commands/src/test/resources/glossary/fuel_hi.po
  A client/zanata-client-commands/src/test/resources/glossary/translate1.csv
  A client/zanata-client-commands/src/test/resources/glossary/translate2.csv
  A client/zanata-maven-plugin/demo-glossary/compendium/fr.po
  A client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
  A client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/csv/pom.xml
  A client/zanata-maven-plugin/demo-glossary/csv/translate1.csv
  A client/zanata-maven-plugin/demo-glossary/csv/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/delete/pom.xml
  A client/zanata-maven-plugin/demo-glossary/delete/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/fuel/fuel_hi.po
  A client/zanata-maven-plugin/demo-glossary/fuel/pom.xml
  A client/zanata-maven-plugin/demo-glossary/fuel/zanata.xml
  M client/zanata-maven-plugin/demo-props/pom.xml
  M client/zanata-maven-plugin/demo-publican/pom.xml
  M client/zanata-maven-plugin/demo-xliff/pom.xml
  M client/zanata-maven-plugin/demo-xml/pom.xml
  M client/zanata-maven-plugin/pom.xml
  A client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
  M client/zanata-maven-plugin/sample-scripts/pom.xml
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java
  M common/pom.xml
  A common/zanata-adapter-po/pom.xml
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
  A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
  A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/common/LocaleId.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/comment/SimpleComment.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ExtensionSet.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/LocaleList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ResourceMetaList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  M pom.xml
  M server/pom.xml
  A server/zanata-dist/etc/assembly.xml
  A server/zanata-dist/etc/sql/config_setup.sql
  A server/zanata-dist/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/GlossaryFilterFactory.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  A server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
  A server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  A server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
  M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
  A server/zanata-model/src/main/resources/.gitignore
  A server/zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
  A server/zanata-model/src/test/resources/.gitignore
  A server/zanata-war/eclipse/launch-external/mvn integration-test -Dmaven.failsafe.debug.launch	
  A server/zanata-war/eclipse/launch-external/mvn verify.launch	
  M server/zanata-war/eclipse/launch/Integration_Tests.launch
  A server/zanata-war/eclipse/launch/debug-jboss-zanata.launch
  A server/zanata-war/eclipse/launch/debug-surefire-zanata (mvn -Dmaven.surefire.debug).launch	
  A server/zanata-war/eclipse/launch/debug-zanata-integration-test.launch
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  A server/zanata-war/etc/scripts/is_server_up.sh
  A server/zanata-war/etc/scripts/zanata-deploy.sh
  M server/zanata-war/pom.xml
  A server/zanata-war/src/etc/autotest.properties
  A server/zanata-war/src/etc/fedora.properties
  A server/zanata-war/src/etc/h2.properties
  A server/zanata-war/src/etc/internalauth.properties
  A server/zanata-war/src/etc/jaas.properties
  A server/zanata-war/src/etc/kerberos.properties
  A server/zanata-war/src/etc/mysql.properties
  A server/zanata-war/src/etc/seamtests.properties
  A server/zanata-war/src/etc/zanata-ds.xml
  A server/zanata-war/src/main/.gitignore
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/ZanataInit.java
  M server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
  A server/zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  A server/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  A server/zanata-war/src/main/java/org/zanata/exception/ZanataInitializationException.java
  A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
  A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
  A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
  A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
  A server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  A server/zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
  A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
  A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
  M server/zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
  A server/zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
  A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransGinjector.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNavTransUnitHandlers.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UndoRedoPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/RpcMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/UndoRedoView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/UndoRedoView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EditTransUnitHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/NoSuchWorkspaceException.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/resources-dev/components.properties
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/TransMemoryMessages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/editor/table/TableEditorMessages.properties
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/mimetypes/templates.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/bar_background.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_middle_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_top_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/mimetypes/templates.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/error.gif
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/favicon.ico
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/footer_background.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading.gif
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/logo.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/menu_active_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgerror.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msginfo.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgwarn.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/panel-header-bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/photos.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/cross.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/help.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/home.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/photos.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/tick.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/user.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/world.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/wrench.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/zoom.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/validate.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  A server/zanata-war/src/main/resources/pluralforms.properties
  M server/zanata-war/src/main/resources/security.drl
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/account/register.xhtml
  A server/zanata-war/src/main/webapp/admin/glossary.xhtml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/profile/edit.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/rest/index.xrd
  M server/zanata-war/src/main/webapp/stylesheet/tabs.css
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  A server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  A server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
  A server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectServiceRawSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/server/rpc/ActivateWorkspaceActionSeamTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.properties
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  A server/zanata-war/src/test/jboss-embedded-bootstrap/deploy/zanata-test-ds.xml
  M server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/AccountData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/LocalesData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge master


  Commit: 47fbc1d181848431064cb4f12427619faf1745d9
      https://github.com/zanata/zanata/commit/47fbc1d181848431064cb4f12427619faf1745d9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirror.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/COPYING
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/README.txt
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_diff.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_match.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_patch.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_uncompressed.js

  Log Message:
  -----------
  Merge branch 'rhbz756264'

Conflicts:
	server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
	server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
	server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css


  Commit: d4e942d8d1d6420f561d003c6e181e6744894e87
      https://github.com/zanata/zanata/commit/d4e942d8d1d6420f561d003c6e181e6744894e87
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java

  Log Message:
  -----------
  Implement NewlineLeadTrailValidation: https://bugzilla.redhat.com/show_bug.cgi?id=768802


  Commit: 9b12ba801d89ea8c1b5267d5ed860ff623c1d295
      https://github.com/zanata/zanata/commit/9b12ba801d89ea8c1b5267d5ed860ff623c1d295
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch '1.4'

Conflicts:
	client/zanata-adapter-properties/pom.xml
                Resloved easily, 2 dependencies added in one branch, 1 in another - kept all.

	client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
		logger getter clashed due to class name change, added import lines showed as conflicted but were not

	client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
		used 1.4 version

	client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
		used 1.4 version

	common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
		Used renaming from 1.4 branch, had to disable some glossary tests, will fix in future commit

	server/zanata-war/pom.xml
		Some duplicated dependencies, did not seem to be causing problems in 1.5 so kept all


  Commit: 4580bd887d2874113e22bc290c967115e03928a1
      https://github.com/zanata/zanata/commit/4580bd887d2874113e22bc290c967115e03928a1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'merging'


  Commit: f4d73c634bc15f147db68cc4bd0078dbf8780400
      https://github.com/zanata/zanata/commit/f4d73c634bc15f147db68cc4bd0078dbf8780400
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java

  Log Message:
  -----------
  fix typo


  Commit: 1a421d8b647e9f063e84ee8107877c354bb1d55a
      https://github.com/zanata/zanata/commit/1a421d8b647e9f063e84ee8107877c354bb1d55a
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java

  Log Message:
  -----------
  re-enable working glossary serialization test


  Commit: e80374d1f968264d418f9b60230cf06a0bd59a65
      https://github.com/zanata/zanata/commit/e80374d1f968264d418f9b60230cf06a0bd59a65
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-19 (Mon, 19 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/etc/scripts/zanata-deploy.sh
  M server/zanata-war/pom.xml
  A server/zanata-war/src/main/.gitignore
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirror.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsePanel.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsePanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffMatchPatchLabel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/editor/table/TableEditorMessages.properties
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/collapse_closed.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/collapse_open.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/leftArrow.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/validate.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/COPYING
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/README.txt
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_diff.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_match.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_patch.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_uncompressed.js
  M server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz757621


  Commit: e502d3c7be5c1e1047e4498ccb0bc2ac989ee9c1
      https://github.com/zanata/zanata/commit/e502d3c7be5c1e1047e4498ccb0bc2ac989ee9c1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  Implement variable validation: https://bugzilla.redhat.com/show_bug.cgi?id=769471


  Commit: c923ff36cc98127cf5a0fb7b120797e8b665bc71
      https://github.com/zanata/zanata/commit/c923ff36cc98127cf5a0fb7b120797e8b665bc71
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java

  Log Message:
  -----------
  Skip validation if target string is empty


  Commit: bd385af4d80ac947121f70ddaa726906404047ad
      https://github.com/zanata/zanata/commit/bd385af4d80ac947121f70ddaa726906404047ad
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png

  Log Message:
  -----------
  Redesign nav button


  Commit: 074c4da4a79aa745556eebca5ba6cfe524b55038
      https://github.com/zanata/zanata/commit/074c4da4a79aa745556eebca5ba6cfe524b55038
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

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


  Commit: 32cc5658dffb8d61f2ee4d8971003689d1df4594
      https://github.com/zanata/zanata/commit/32cc5658dffb8d61f2ee4d8971003689d1df4594
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java

  Log Message:
  -----------
  remove stats graph widget from model (DocumentNode) object


  Commit: fa9ec50e439bd76963fa95878b0315be803810e1
      https://github.com/zanata/zanata/commit/fa9ec50e439bd76963fa95878b0315be803810e1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java

  Log Message:
  -----------
  clean up imports


  Commit: 999a75de62617142840bbe033e7a3667e2e7dc03
      https://github.com/zanata/zanata/commit/999a75de62617142840bbe033e7a3667e2e7dc03
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png

  Log Message:
  -----------
  Resize nav button


  Commit: 503bce89330c045a3f4a6ca87f4aef9bc096992c
      https://github.com/zanata/zanata/commit/503bce89330c045a3f4a6ca87f4aef9bc096992c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Change tab header color, resize app view


  Commit: 8334ca8a4e48b73515d7572630217468b20f1f81
      https://github.com/zanata/zanata/commit/8334ca8a4e48b73515d7572630217468b20f1f81
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

  Log Message:
  -----------
  Resize toggle buttom, clean up unused image


  Commit: f768a0d1d109fba0329b04645c28666de5366872
      https://github.com/zanata/zanata/commit/f768a0d1d109fba0329b04645c28666de5366872
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/downArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/rightArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/upArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_approved.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_fuzzy.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_untranslated.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_approved.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_fuzzy.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_untranslated.png

  Log Message:
  -----------
  Remove unused icon


  Commit: 1e697ce6ddfb0036e449f90e5d6c36bb8aea1901
      https://github.com/zanata/zanata/commit/1e697ce6ddfb0036e449f90e5d6c36bb8aea1901
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-20 (Tue, 20 Dec 2011)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  add working unit tests for DocumentListPresenter


  Commit: 5d49b63b6c9620962d98e40c81d09868f082b8a9
      https://github.com/zanata/zanata/commit/5d49b63b6c9620962d98e40c81d09868f082b8a9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-21 (Wed, 21 Dec 2011)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  add tests for doclist pre-filter and correct loading of documents


  Commit: f1fdb8a15fe1e456c2b4d5dfae3c72206b6f465d
      https://github.com/zanata/zanata/commit/f1fdb8a15fe1e456c2b4d5dfae3c72206b6f465d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-12-21 (Wed, 21 Dec 2011)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  test simple doclist filter


  Commit: bfd538e19299ff397b74c799ea945bc5253e8539
      https://github.com/zanata/zanata/commit/bfd538e19299ff397b74c799ea945bc5253e8539
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  Changed paths:
    M client/zanata-adapter-properties/pom.xml
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/downArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/rightArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/upArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_untranslated.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_untranslated.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz769471


  Commit: 942b44ce93e958e02afe03bd0e4b31cd95b91a1b
      https://github.com/zanata/zanata/commit/942b44ce93e958e02afe03bd0e4b31cd95b91a1b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  Implement variables validation checks


  Commit: 841faf144f6b594543d2b6bd72b1814b70f9bd93
      https://github.com/zanata/zanata/commit/841faf144f6b594543d2b6bd72b1814b70f9bd93
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml

  Log Message:
  -----------
  Remove outline css on push button


  Commit: d1393708b5f653d8a8a4b3e3c8b7d8fb4939ef72
      https://github.com/zanata/zanata/commit/d1393708b5f653d8a8a4b3e3c8b7d8fb4939ef72
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-02 (Mon, 02 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page_old.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page_old.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page_old.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page_old.png

  Log Message:
  -----------
  Redesign pager buttons


  Commit: 867dc8426032ba12a0b4ca508bf0209cfe30d5a8
      https://github.com/zanata/zanata/commit/867dc8426032ba12a0b4ca508bf0209cfe30d5a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-03 (Tue, 03 Jan 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  A server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml

  Log Message:
  -----------
  Work in progress


  Commit: 3f242d4a6afd8b9b2680c8e8f1ed80110f472fbc
      https://github.com/zanata/zanata/commit/3f242d4a6afd8b9b2680c8e8f1ed80110f472fbc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-03 (Tue, 03 Jan 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  update document list presenter tests


  Commit: c6322e67b766db82e7d94a9df9b55df6c2a659c8
      https://github.com/zanata/zanata/commit/c6322e67b766db82e7d94a9df9b55df6c2a659c8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-03 (Tue, 03 Jan 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  more comprehensive unit testing of DocumentListPresenter


  Commit: 718729424965473519a863a0f2d95713eb02ba66
      https://github.com/zanata/zanata/commit/718729424965473519a863a0f2d95713eb02ba66
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  A server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Identity.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Permission.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Role.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceContext.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java

  Log Message:
  -----------
  Implemented accecc restriction on editor


  Commit: eb45d0eb70e90f7ab2c2f068d89a63469dcfa4d6
      https://github.com/zanata/zanata/commit/eb45d0eb70e90f7ab2c2f068d89a63469dcfa4d6
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  refactor document list presenter tests for readability


  Commit: 2d21a732eeb6c2e953914b4e8cb32e3b5a268181
      https://github.com/zanata/zanata/commit/2d21a732eeb6c2e953914b4e8cb32e3b5a268181
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/downArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/rightArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/upArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page_old.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page_old.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page_old.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_untranslated.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page_old.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_untranslated.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz757621


  Commit: 94396481efa146cf10de5339dbed6f31fae30959
      https://github.com/zanata/zanata/commit/94396481efa146cf10de5339dbed6f31fae30959
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java

  Log Message:
  -----------
  Moved SQL related query into DAO class


  Commit: 959239c87be9214bca0114c627b202a4ae4784d6
      https://github.com/zanata/zanata/commit/959239c87be9214bca0114c627b202a4ae4784d6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  Merge branch 'master' into rhbz755759


  Commit: bde178fc1cb2d7200810ce2e081dbc709000f54b
      https://github.com/zanata/zanata/commit/bde178fc1cb2d7200810ce2e081dbc709000f54b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-01-04 (Wed, 04 Jan 2012)

  Changed paths:
    M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Fix integration test


  Commit: c92668f6aa7a27e697b55124d56189c40d97a70c
      https://github.com/zanata/zanata/commit/c92668f6aa7a27e697b55124d56189c40d97a70c
  Author: Carlos <camunoz at redhat.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.java
  M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

  Log Message:
  -----------
  Solve 500 errors being returned by server when creating users.

(rhbz746857)
Reinstate XmlRootElement on Account object.
Correct NullPointerException when accessing non-existing language memberships in the HAccount class.


  Commit: bd88d149abc40fd4059ace32b7343ee484918f12
      https://github.com/zanata/zanata/commit/bd88d149abc40fd4059ace32b7343ee484918f12
  Author: Carlos <camunoz at redhat.com>
  Date:   2012-01-05 (Thu, 05 Jan 2012)

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

  Log Message:
  -----------
  Add default Content-Type header value for PO files.

(rhbz749739)
Add a default UTF-8 charset Content-Type header to generated PO resources.


Compare: https://github.com/zanata/zanata/compare/ffc0931...bd88d14




More information about the zanata-commits mailing list