[zanata/zanata-server] 760eb9: fix display of copy trans modal, remove activity p...
GitHub
noreply at github.com
Thu May 1 09:57:58 UTC 2014
Branch: refs/heads/copy-trans-ui
Home: https://github.com/zanata/zanata-server
Commit: 760eb9db0b9b136398a4cdb85517e71a4c82fd04
https://github.com/zanata/zanata-server/commit/760eb9db0b9b136398a4cdb85517e71a4c82fd04
Author: Alex Eng <aeng at redhat.com>
Date: 2014-05-01 (Thu, 01 May 2014)
Changed paths:
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/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/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
M zanata-war/src/main/java/org/zanata/action/VersionHome.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.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
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/SecurityServiceImpl.java
A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.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/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-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/iteration/view.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/resources/script/components-script.js
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml
Log Message:
-----------
fix display of copy trans modal, remove activity panel if there's no activity
Squashed commit of the following:
commit e325d9018b5495fca85bdcee60d58b2d333cac93
Merge: 9fdeab4 4ec8ed7
Author: Alex Eng <aeng at redhat.com>
Date: Thu May 1 19:54:46 2014 +1000
Merge branch 'integration/master' into copy-trans-ui
commit 9fdeab42b643dfa7a0afb287a821cdaa05300ae5
Author: Alex Eng <aeng at redhat.com>
Date: Thu May 1 19:53:39 2014 +1000
fix display of copy trans modal, remove activity panel if there's no activity
commit bddb5a844a6c41ece782a2817838c98f914b91fa
Merge: 8e548a8 4072799
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 30 14:32:12 2014 +1000
Merge branch 'integration/master' into copy-trans-ui
commit 8e548a8c270ee9350f2f80f93de7949db77f1aa9
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 30 14:31:33 2014 +1000
implement modal window for copytrans option in version page
commit 2b316891b2ecb0903555233ea9b0f311b18ccb06
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 29 15:45:06 2014 +1000
WIP: new copy trans ui in version page
commit 24f2cec9ad045f7768f9964f913c0b544b8621bf
Merge: 1c03d88 427f128
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 29 10:41:13 2014 +1000
Merge branch 'integration/master' into rhbz1077439
commit 1c03d88bbdc46e8c14082f9fabc1deb82d2228f2
Merge: e33a56c c7ca62a
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 29 10:04:08 2014 +1000
Merge branch 'integration/master' into rhbz1077439
commit e33a56c12654d86332fb3cc4fb5b47b6f499d97b
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 29 10:03:22 2014 +1000
Have copyTrans options in version page
commit 7c09cda3c4d0007155e49844fd0b77b501ea2a29
Merge: 7584ef4 0323f24
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 28 10:43:35 2014 +1000
Merge branch 'integration/master' into rhbz1077439
commit 7584ef4e13d82b7806c6f02317c0966be4084f52
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Wed Apr 23 17:49:52 2014 +1000
Move and simplify tests from CopyTransServiceImplTest to TranslationFinderTest
Remove CopyTransServiceImplTest combinations which are tested by
TranslationFinderTest
commit 475fde4bf79f52ebea726e4808f2fe8a8952a009
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Wed Apr 23 17:46:13 2014 +1000
Remove need to pass in a persistent HTextFlow
commit 64f2b569f4de1f88ebd9b2175c24a847fdb14b4f
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 22 14:50:35 2014 +1000
Reduce number of executions to keep test time manageable
commit 52347cffff8b55db25b1ea97ae2fc75bf3c60882
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 22 14:49:10 2014 +1000
Fix broken unit test
commit 3a1d349de389ecbf72cc3aebc62f3a95a8215f85
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 15 17:53:34 2014 +1000
Move searchBestMatchTargetTest to TranslationFinderTest
commit 164c674c47ce52051fd3e26d9e47802c8bd0ce43
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 17 09:16:00 2014 +1000
Implement lucene sort using lastChanged
commit 890c48d8c412a2cf858fdab0c95ce5d7014e19d2
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 16 14:54:41 2014 +1000
revert naming of the test method.
commit 6db712fae02c16328f4caf4774c55034e77c73de
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 16 12:15:22 2014 +1000
Fix unit test with new documentDAO param
commit 1f5f5adc50db5d4f476c42d60b5e599fda10080c
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 16 11:26:29 2014 +1000
Remove lastChanged override in target
commit f7b408c97441b0d05901fbeb82dd2d41974b68ed
Merge: 997dd5b 1db4c3e
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 15:54:38 2014 +1000
Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439
commit 997dd5b599c782413e003f38d99b7aaeb9a8595c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 15:54:22 2014 +1000
Use text flow id index for excluding option in tm search
commit 1db4c3ef9835fac3bc2fbf9af3319f2a6375ab40
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 15 15:11:44 2014 +1000
Remove redundant test
Requirement is covered by TranslationMemoryServiceImplTest.searchBestMatchTargetTest.
commit 05197b47957c08241eca1a3c3f81eaced093a3b3
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 15 14:40:56 2014 +1000
Annotate ZanataJpaTest with @Test again (to fix REST tests)
commit 3f6d381f308e2ad23a7f907519b8a778574317ce
Merge: 3b90ea2 c7a9df7
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 14:29:21 2014 +1000
Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439
commit c7a9df7459a2f6861ee88523d4017d6bb8790bf9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 15 14:22:12 2014 +1000
Update CopyTransServiceUnitTest
commit 3b90ea2e5fe0e836bf7fd5764e50b3571b3bf8d1
Merge: d4bd248 c02a26b
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 14:06:11 2014 +1000
Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439
commit d4bd2482e3a123aeb87696e34c7bee6b5d14b187
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 14:05:56 2014 +1000
Add tf_id as index
commit c02a26bceb4a2c60003d3390ff30a741b14ad1af
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Tue Apr 15 13:49:36 2014 +1000
Change TranslationMemoryServiceImplTest to load the DB once only
commit 034c81de5d177cb7f7161dacc9fa5770304b79ec
Merge: 26290c0 bb3d19c
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 10:23:02 2014 +1000
Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439
Conflicts:
zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
commit 26290c0b222d37cf4a03058477d29733ae66aad3
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 15 10:15:19 2014 +1000
improve filtering of tm list
commit bb3d19cb0382d16b2607665f405eeb74a16a9356
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Mon Apr 14 17:31:18 2014 +1000
Extract CopyTransWorkFactory; add basic unit test for CopyTransService
commit c3c1344e3ccba413409af5b06af0693b5a38742a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Mon Apr 14 15:09:50 2014 +1000
Extract CopyTransWork from CopyTransServiceImpl, along with tests
commit 559ddd1b2e889c436b4f0e2777d8a6e4a7013123
Merge: 86fec53 0a1b1d4
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 14 13:45:19 2014 +1000
Merge branch 'integration/master' into rhbz1077439
commit 86fec5396e5dfefdc02bd5c9181d5dea8eb50f8b
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 14 13:44:19 2014 +1000
Merge copyTrans to use lucene index for search
commit 85b6076b8a3b827f4f507bd04d273004d588ecb9
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Thu Apr 3 11:16:50 2014 +1000
Create TranslationFinder interface
commit 5f656f2c9231649fcb7b0935d7f526b6a9caca1f
Author: Alex Eng <aeng at redhat.com>
Date: Fri Apr 11 15:53:35 2014 +1000
WIP: generating unit test for tm service
commit 9459a43583df97fd194f37a80786772b1c50117b
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 10 15:44:50 2014 +1000
WIP: refactor copy trans
commit 27a49fe2e35fb004943325264db113dd27cf0e93
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 9 15:55:07 2014 +1000
WIP: test for TM search
commit c3ded2b8398c8735872230394c480a1be50deb19
Merge: 628badd 907ce45
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 9 15:06:58 2014 +1000
Merge branch 'integration/master' into rhbz1077439
Conflicts:
zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
commit 628badd7f3f711b1b3e9f7c1909acf2019db068c
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 9 15:02:25 2014 +1000
WIP: integration test for TM service
commit f461e6ea492bdeb08e8e134d17da300f8e26cfce
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 8 15:59:33 2014 +1000
Move test to TM merge handler test to ServiceImpl
commit 80d9f18198fad419f9788adecfa4fa0e4c0284b2
Author: Alex Eng <aeng at redhat.com>
Date: Mon Apr 7 15:38:51 2014 +1000
Fix unit test to use lucene index
commit 81afeb074023673c49e9cb3d590db3cab4842c7e
Merge: 2d61836 ea1069b
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Fri Apr 4 13:00:01 2014 +1000
Merge remote branch 'origin/rhbz1077439' into rhbz1077439
Conflicts:
zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
commit 2d6183641e739b00e3d25c54d0d35f4d5cd95d3e
Author: Sean Flanigan <sflaniga at redhat.com>
Date: Fri Apr 4 10:52:56 2014 +1000
Ensure Lucene indexing in CopyTransServiceImplTest
commit ea1069b752b3873d121ea5a4872052ce8995e517
Author: Alex Eng <aeng at redhat.com>
Date: Fri Apr 4 08:30:54 2014 +1000
WIP: copytrans
commit 790c9426102d730a47103fec8c9c3ac9aa224c0c
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 3 16:19:47 2014 +1000
WIP: copytrans
commit ea1b06681070e3fc964ccb6cc12b0d6b9bab0403
Merge: 6230240 1f3f7bf
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 3 14:01:03 2014 +1000
Merge branch 'integration/master' into rhbz1077439
Conflicts:
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
commit 623024015a89def4df0117170be9205d67239832
Author: Alex Eng <aeng at redhat.com>
Date: Thu Apr 3 14:00:33 2014 +1000
WIP: include project, document and resId condition in TM query
commit 27194111bb9564df41db570a8d69395ec8313618
Author: Alex Eng <aeng at redhat.com>
Date: Wed Apr 2 15:55:31 2014 +1000
WIP: refactoring copytrans and get translation memory service
commit 3cc1e79c58a56967332b94e2340aa5d54bc50202
Author: Alex Eng <aeng at redhat.com>
Date: Tue Apr 1 16:00:44 2014 +1000
WIP: integrating copytrans query to use lucene
commit 5f12a1a6b8008513dcf25abc420c87570d6df70d
Author: Alex Eng <aeng at redhat.com>
Date: Mon Mar 31 16:02:27 2014 +1000
WIP: refactoring copy trans and TM merge
More information about the zanata-commits
mailing list