[zanata/zanata-server] 55a56a: Merge remote branch 'origin/master' into gwt260

GitHub noreply at github.com
Tue Sep 2 05:27:33 UTC 2014 

  Branch: refs/heads/gwt260
  Home:   https://github.com/zanata/zanata-server
  Commit: 55a56aad4b5052e965cf55681c76bca45fbd7a04
      https://github.com/zanata/zanata-server/commit/55a56aad4b5052e965cf55681c76bca45fbd7a04
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    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/main/java/org/zanata/page/webtrans/EditorPage.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.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 functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html
    A functional-test/src/test/resources/test-tmx.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    A zanata-model/src/main/java/org/zanata/util/JPACopier.java
    R zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
    A zanata-model/src/test/java/org/zanata/util/JPACopierTest.java
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/mysql.properties
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    A zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.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/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/email/EmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    A zanata-war/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.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/i18n/Messages.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/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    A zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.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/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextAreaWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.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/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.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/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.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/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsDisplay.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/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/activation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_validation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/password_reset.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/username_changed.vm
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    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/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.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

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

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java

More information about the zanata-commits mailing list