[zanata/zanata] b8745c: Implement document uploading through the GUI.
GitHub
noreply at github.com
Fri May 4 07:47:57 UTC 2012
Branch: refs/heads/search-replace
Home: https://github.com/zanata/zanata
Commit: b8745c8071bdc7ed5a3692f4022a65306f5681a3
https://github.com/zanata/zanata/commit/b8745c8071bdc7ed5a3692f4022a65306f5681a3
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-01 (Tue, 01 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
R server/zanata-war/src/main/java/org/zanata/action/TranslationFileUploadHelper.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/iteration/files.xhtml
Log Message:
-----------
Implement document uploading through the GUI.
Initially only supports PO files. Other formats should come later.
Minor style changes when uploading files.
Commit: 85f1583ddad22aa7ba4cff4fe7dc09d75a3a3d28
https://github.com/zanata/zanata/commit/85f1583ddad22aa7ba4cff4fe7dc09d75a3a3d28
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-02 (Wed, 02 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.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/SourceDocResourceService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
A server/zanata-war/src/main/java/org/zanata/service/DocumentService.java
A server/zanata-war/src/main/java/org/zanata/service/SlugEntityService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A server/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
Log Message:
-----------
REST service refactoring.
Move document writing business logic to a service to be used by both GUI and REST services.
Create Document and Slug services to allow for business logic reuse.
Commit: 2e0811cfedb7a196f72f372229570fccdde60381
https://github.com/zanata/zanata/commit/2e0811cfedb7a196f72f372229570fccdde60381
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/pom.xml
A server/zanata-war/src/test/java/org/zanata/seam/AutowireComponent.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
Add SeamAutowire test helper.
SeamAutowire is a helper class that simulates a Seam environment and component injection.
Commit: b35d3002af70d7bfd6a2c2bea004072f172976e9
https://github.com/zanata/zanata/commit/b35d3002af70d7bfd6a2c2bea004072f172976e9
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilterFactory.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilter.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilterFactory.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
M server/zanata-model/src/main/java/org/zanata/model/AccountKeyBase.java
M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationProject.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/HPerson.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
M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M server/zanata-model/src/main/java/org/zanata/model/StatusCount.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.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/EntityStatusType.java
M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
M server/zanata-model/src/main/java/org/zanata/model/validator/SlugValidator.java
M server/zanata-model/src/main/java/org/zanata/model/validator/UrlValidator.java
A server/zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
A server/zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
Log Message:
-----------
apply lombok to zanata-model
Commit: 9f8b1e0fc02ad426da3955b86e204872b365e8b0
https://github.com/zanata/zanata/commit/9f8b1e0fc02ad426da3955b86e204872b365e8b0
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
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/server/rpc/TranslatorStatusUpdateHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateAction.java
A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateResult.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorUpdateStatusResult.java
Log Message:
-----------
Rename result for TranslatorStatusUpdateAction
Commit: 1b4b2785dddf875a84d2927ed376080fe52e8b5e
https://github.com/zanata/zanata/commit/1b4b2785dddf875a84d2927ed376080fe52e8b5e
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-model/pom.xml
Log Message:
-----------
remove lombok dependency from zanata-model pom
Commit: cc082eebea49a2fb2a23185a86beb31f9b2f7615
https://github.com/zanata/zanata/commit/cc082eebea49a2fb2a23185a86beb31f9b2f7615
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
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/server/rpc/TranslatorStatusUpdateHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateAction.java
A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateResult.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorUpdateStatusResult.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into integration/master
Commit: a6ba7c0b290df846802f388337fd941ff48df4e6
https://github.com/zanata/zanata/commit/a6ba7c0b290df846802f388337fd941ff48df4e6
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
M server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
First Rest test converted to use SeamAutowire.
Commit: ee9a13467a10641f4240c35ac8853b95e4268a74
https://github.com/zanata/zanata/commit/ee9a13467a10641f4240c35ac8853b95e4268a74
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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
Log Message:
-----------
Migrate all other Rest tests to SeamAutowire.
Commit: 4d98d770f34fc9b138b929dd54cbdf3e99196009
https://github.com/zanata/zanata/commit/4d98d770f34fc9b138b929dd54cbdf3e99196009
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
R server/zanata-war/src/main/java/org/zanata/action/TranslationFileUploadHelper.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.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/SourceDocResourceService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
A server/zanata-war/src/main/java/org/zanata/service/DocumentService.java
A server/zanata-war/src/main/java/org/zanata/service/SlugEntityService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A server/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/iteration/files.xhtml
M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TranslationResourceRestTest.java
A server/zanata-war/src/test/java/org/zanata/seam/AutowireComponent.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
Merge branch 'pot-upload' into integration/master
Conflicts:
server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
Commit: c4521f56c3a7df4bab1500677bddef0c8485c724
https://github.com/zanata/zanata/commit/c4521f56c3a7df4bab1500677bddef0c8485c724
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
R server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
R server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
Log Message:
-----------
minor clean up and refactor
Commit: 8d9c06e48099773945237b86638ad14f86396afd
https://github.com/zanata/zanata/commit/8d9c06e48099773945237b86638ad14f86396afd
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
R server/zanata-war/src/main/java/org/zanata/action/TranslationFileUploadHelper.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.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/SourceDocResourceService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
A server/zanata-war/src/main/java/org/zanata/service/DocumentService.java
A server/zanata-war/src/main/java/org/zanata/service/SlugEntityService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A server/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/iteration/files.xhtml
M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TranslationResourceRestTest.java
A server/zanata-war/src/test/java/org/zanata/seam/AutowireComponent.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into integration/master
Commit: 976ae8297c03cbdb06c2860f5e2e7eed77bcf2c2
https://github.com/zanata/zanata/commit/976ae8297c03cbdb06c2860f5e2e7eed77bcf2c2
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/exception/ZanataServiceException.java
M server/zanata-war/src/main/java/org/zanata/util/Base64UrlSafe.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/AuthenticationError.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/AuthorizationError.java
Log Message:
-----------
Fix exception chaining
Commit: 29fe00291146fcd3b1f9d8c696c46d2a97d8a3cc
https://github.com/zanata/zanata/commit/29fe00291146fcd3b1f9d8c696c46d2a97d8a3cc
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
R server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
R server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
R server/zanata-war/src/main/java/org/zanata/action/TranslationFileUploadHelper.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.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/SourceDocResourceService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
A server/zanata-war/src/main/java/org/zanata/service/DocumentService.java
A server/zanata-war/src/main/java/org/zanata/service/SlugEntityService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A server/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/iteration/files.xhtml
M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TranslationResourceRestTest.java
A server/zanata-war/src/test/java/org/zanata/seam/AutowireComponent.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
Merge branch 'master' of github.com:zanata/zanata into integration/master
Commit: 0adc55d16313d587258daf3ea25de26183c53c74
https://github.com/zanata/zanata/commit/0adc55d16313d587258daf3ea25de26183c53c74
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TargetContentsPresenter.java
Log Message:
-----------
fix NullPointerException in TargetContentsPresenter
Commit: a26273c5f7a31546620af5018dced5085184a467
https://github.com/zanata/zanata/commit/a26273c5f7a31546620af5018dced5085184a467
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-03 (Thu, 03 May 2012)
Changed paths:
M server/zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
Log Message:
-----------
show stack traces for GWT umbrella exceptions
Commit: 6fc8253bb48db3828320b1bbdfafe4c34c52af85
https://github.com/zanata/zanata/commit/6fc8253bb48db3828320b1bbdfafe4c34c52af85
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-05-04 (Fri, 04 May 2012)
Changed paths:
M server/zanata-model/pom.xml
M server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilterFactory.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilter.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilterFactory.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
M server/zanata-model/src/main/java/org/zanata/hibernate/search/TimeCachedFilter.java
M server/zanata-model/src/main/java/org/zanata/model/AccountKeyBase.java
M server/zanata-model/src/main/java/org/zanata/model/HAccount.java
M server/zanata-model/src/main/java/org/zanata/model/HAccountRole.java
M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
M server/zanata-model/src/main/java/org/zanata/model/HDocument.java
M server/zanata-model/src/main/java/org/zanata/model/HDocumentHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
M server/zanata-model/src/main/java/org/zanata/model/HIterationProject.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/HPerson.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
M server/zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
M server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
M server/zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
M server/zanata-model/src/main/java/org/zanata/model/StatusCount.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPoTargetHeader.java
M server/zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
M server/zanata-model/src/main/java/org/zanata/model/po/PoHeaderBase.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/EntityStatusType.java
M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
M server/zanata-model/src/main/java/org/zanata/model/validator/SlugValidator.java
M server/zanata-model/src/main/java/org/zanata/model/validator/UrlValidator.java
R server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
R server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.java
A server/zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
A server/zanata-model/src/test/java/org/zanata/model/StatusCountTest.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
R server/zanata-war/src/main/java/org/zanata/action/TranslationFileUploadHelper.java
M server/zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
M server/zanata-war/src/main/java/org/zanata/exception/ZanataServiceException.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.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/SourceDocResourceService.java
M server/zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
A server/zanata-war/src/main/java/org/zanata/service/DocumentService.java
A server/zanata-war/src/main/java/org/zanata/service/SlugEntityService.java
M server/zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
A server/zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
A server/zanata-war/src/main/java/org/zanata/service/impl/SlugEntityServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M server/zanata-war/src/main/java/org/zanata/util/Base64UrlSafe.java
M server/zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.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/TargetContentsPresenter.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TranslatorStatusUpdateHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/AuthenticationError.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/AuthorizationError.java
M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateAction.java
A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorStatusUpdateResult.java
R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TranslatorUpdateStatusResult.java
M server/zanata-war/src/main/resources/messages.properties
M server/zanata-war/src/main/webapp/iteration/files.xhtml
M server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.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/TranslationResourceRestTest.java
A server/zanata-war/src/test/java/org/zanata/seam/AutowireComponent.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
A server/zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java
Log Message:
-----------
Merge branch 'master' into search-replace
Conflicts:
server/zanata-war/src/main/java/org/zanata/service/TranslationService.java
only import conflicts
server/zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
only import conflicts
server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
commented out some parts that test obsolete behaviour
Compare: https://github.com/zanata/zanata/compare/02c11ed...6fc8253
More information about the zanata-commits
mailing list