[zanata/zanata-server] a2cec7: show uploaded documents when multi-file-upload dia...

Mon Jun 23 00:28:10 UTC 2014

  Branch: refs/heads/multi-file-upload
  Home:   https://github.com/zanata/zanata-server
  Commit: a2cec76491d9b3623cd09157c7d80532bff80683
      https://github.com/zanata/zanata-server/commit/a2cec76491d9b3623cd09157c7d80532bff80683
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js

  Log Message:
  -----------
  show uploaded documents when multi-file-upload dialog is closed


  Commit: aad070027301c34ea19f87fd21ccfb841590d68f
      https://github.com/zanata/zanata-server/commit/aad070027301c34ea19f87fd21ccfb841590d68f
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml

  Log Message:
  -----------
  improve inline file upload error style


  Commit: 361cc8c962dcddff13dcd2174a10ac55d2ed19ad
      https://github.com/zanata/zanata-server/commit/361cc8c962dcddff13dcd2174a10ac55d2ed19ad
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js

  Log Message:
  -----------
  show intelligible error when uploading multiple files after session timeout


  Commit: 308bfc35bd905ad6820c01b0d75580405c70bf9e
      https://github.com/zanata/zanata-server/commit/308bfc35bd905ad6820c01b0d75580405c70bf9e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java

  Log Message:
  -----------
  WIP: getting json libraries working properly


  Commit: a1e784e47b3beb4ee34bb56a5e5cdd08fd64afe4
      https://github.com/zanata/zanata-server/commit/a1e784e47b3beb4ee34bb56a5e5cdd08fd64afe4
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    R functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    R functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    R functional-test/src/main/java/org/zanata/page/dashboard/DashboardSettingsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectAboutTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectGeneralTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/BasicWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.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
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.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/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.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/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HProject.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/ModelEntityBase.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.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/ProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.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/action/validator/DuplicateEmailValidator.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.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/limits/LeakyBucket.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    A zanata-war/src/main/java/org/zanata/limits/RestCallLimiter.java
    M zanata-war/src/main/java/org/zanata/log4j/ZanataSMTPAppender.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    A zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    M zanata-war/src/main/java/org/zanata/rest/HibernateValidationInterceptor.java
    A zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestVersionInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/Configuration.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    A zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/seam/FixedSafeActions.java
    M zanata-war/src/main/java/org/zanata/seam/interceptor/MonitoringWrapper.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/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    A zanata-war/src/main/java/org/zanata/search/ContentCriterion.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/security/FedoraOpenIdPhaseListener.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.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/SpNegoIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/security/ZanataJpaIdentityStore.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
    R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.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/VersionManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/FileUploadServlet.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/LocaleAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/autocomplete/MaintainerAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/java/org/zanata/util/HqlCriterion.java
    A zanata-war/src/main/java/org/zanata/util/Introspectable.java
    M zanata-war/src/main/java/org/zanata/util/QueryBuilder.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/BookmarkedTextFlowEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/EditorPageSizeChangeEvent.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageEvent.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/events/FindMessageHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/EditorTokens.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.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/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.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/TransFilterPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java

  Log Message:
  -----------
  Merge branch 'master' into multi-file-upload

Conflicts:
	zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

    A servlet mapping is added at the same position on each branch.
    Merge keeps both mappings.


  Commit: f306a8c056d184b4a933fe1a52ccbaab327ea600
      https://github.com/zanata/zanata-server/commit/f306a8c056d184b4a933fe1a52ccbaab327ea600
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml

  Log Message:
  -----------
  Use multi-file upload component on settings tab.


Compare: https://github.com/zanata/zanata-server/compare/d68fae984302...f306a8c056d1