[zanata/zanata] 0b2b5b: Merge branch 'rhbz757621' (early part)
noreply at github.com
noreply at github.com
Tue Dec 20 05:35:21 UTC 2011
Branch: refs/heads/rhbz757621
Home: https://github.com/zanata/zanata
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
Compare: https://github.com/zanata/zanata/compare/575c14e...e80374d
More information about the zanata-commits
mailing list