[zanata/zanata] c16906: Merge branch 'master' into rhbz756235
noreply at github.com
noreply at github.com
Thu Dec 15 03:37:51 UTC 2011
Branch: refs/heads/rhbz756235
Home: https://github.com/zanata/zanata
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: 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: 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
Compare: https://github.com/zanata/zanata/compare/af2b5a0...5c9bab1
More information about the zanata-commits
mailing list