[zanata/zanata-server] 1b4d02: Merge remote branch 'origin/master' into satisfy-r...
GitHub
noreply at github.com
Mon Aug 11 06:43:31 UTC 2014
Branch: refs/heads/satisfy-requireUpperBoundDeps
Home: https://github.com/zanata/zanata-server
Commit: 1b4d0276b7e02d73292a1a16cbeea30c0da53179
https://github.com/zanata/zanata-server/commit/1b4d0276b7e02d73292a1a16cbeea30c0da53179
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2014-08-11 (Mon, 11 Aug 2014)
Changed paths:
M functional-test/pom.xml
M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
M functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
A functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
M functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M zanata-war/pom.xml
M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
M zanata-war/src/main/java/org/zanata/action/LoginAction.java
M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/DelegatingDispatchAsync.java
M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DialogBoxCloseButton.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
M zanata-war/src/main/webapp/admin/server_configuration.xhtml
A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/README.md
A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.min.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/README.md
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.xdr-transport.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-process.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-validate.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.iframe-transport.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/vendor/jquery.ui.widget.js
A zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
A zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
M zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
M zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
Log Message:
-----------
Merge remote branch 'origin/master' into satisfy-requireUpperBoundDeps
Conflicts:
pom.xml
zanata-war/pom.xml
More information about the zanata-commits
mailing list