This repository has been archived by the owner on Nov 9, 2017. It is now read-only.
Copy trans UI #428
Merged
Copy trans UI #428
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
@zanata-jenkins, retest this please. |
added 2 commits
May 5, 2014 14:44
Squashed commit of the following: commit 7d5477e46dc21776f8fbb785dd4497be6d5a184e Merge: 085ac03 9025ac0 Author: Alex Eng <aeng@redhat.com> Date: Mon May 5 14:43:21 2014 +1000 Merge branch 'integration/master' into copy-trans-ui Conflicts: zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java commit 085ac03 Author: Alex Eng <aeng@redhat.com> Date: Mon May 5 09:59:07 2014 +1000 fix html markup commit 214a003 Merge: 760eb9d 1821543 Author: Alex Eng <aeng@redhat.com> Date: Mon May 5 08:53:06 2014 +1000 Merge branch 'integration/master' into copy-trans-ui commit 760eb9d Author: Alex Eng <aeng@redhat.com> Date: Thu May 1 19:57:03 2014 +1000 fix display of copy trans modal, remove activity panel if there's no activity Squashed commit of the following: commit e325d90 Merge: 9fdeab4 4ec8ed7 Author: Alex Eng <aeng@redhat.com> Date: Thu May 1 19:54:46 2014 +1000 Merge branch 'integration/master' into copy-trans-ui commit 9fdeab4 Author: Alex Eng <aeng@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 bddb5a8 Merge: 8e548a8 4072799 Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 30 14:32:12 2014 +1000 Merge branch 'integration/master' into copy-trans-ui commit 8e548a8 Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 30 14:31:33 2014 +1000 implement modal window for copytrans option in version page commit 2b31689 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 29 15:45:06 2014 +1000 WIP: new copy trans ui in version page commit 24f2cec Merge: 1c03d88 427f128 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 29 10:41:13 2014 +1000 Merge branch 'integration/master' into rhbz1077439 commit 1c03d88 Merge: e33a56c c7ca62a Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 29 10:04:08 2014 +1000 Merge branch 'integration/master' into rhbz1077439 commit e33a56c Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 29 10:03:22 2014 +1000 Have copyTrans options in version page commit 7c09cda Merge: 7584ef4 0323f24 Author: Alex Eng <aeng@redhat.com> Date: Mon Apr 28 10:43:35 2014 +1000 Merge branch 'integration/master' into rhbz1077439 commit 7584ef4 Author: Sean Flanigan <sflaniga@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 475fde4 Author: Sean Flanigan <sflaniga@redhat.com> Date: Wed Apr 23 17:46:13 2014 +1000 Remove need to pass in a persistent HTextFlow commit 64f2b56 Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 22 14:50:35 2014 +1000 Reduce number of executions to keep test time manageable commit 52347cf Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 22 14:49:10 2014 +1000 Fix broken unit test commit 3a1d349 Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 15 17:53:34 2014 +1000 Move searchBestMatchTargetTest to TranslationFinderTest commit 164c674 Author: Alex Eng <aeng@redhat.com> Date: Thu Apr 17 09:16:00 2014 +1000 Implement lucene sort using lastChanged commit 890c48d Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 16 14:54:41 2014 +1000 revert naming of the test method. commit 6db712f Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 16 12:15:22 2014 +1000 Fix unit test with new documentDAO param commit 1f5f5ad Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 16 11:26:29 2014 +1000 Remove lastChanged override in target commit f7b408c Merge: 997dd5b 1db4c3e Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 15:54:38 2014 +1000 Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439 commit 997dd5b Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 15:54:22 2014 +1000 Use text flow id index for excluding option in tm search commit 1db4c3e Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 15 15:11:44 2014 +1000 Remove redundant test Requirement is covered by TranslationMemoryServiceImplTest.searchBestMatchTargetTest. commit 05197b4 Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 15 14:40:56 2014 +1000 Annotate ZanataJpaTest with @test again (to fix REST tests) commit 3f6d381 Merge: 3b90ea2 c7a9df7 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 14:29:21 2014 +1000 Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439 commit c7a9df7 Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 15 14:22:12 2014 +1000 Update CopyTransServiceUnitTest commit 3b90ea2 Merge: d4bd248 c02a26b Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 14:06:11 2014 +1000 Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439 commit d4bd248 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 14:05:56 2014 +1000 Add tf_id as index commit c02a26b Author: Sean Flanigan <sflaniga@redhat.com> Date: Tue Apr 15 13:49:36 2014 +1000 Change TranslationMemoryServiceImplTest to load the DB once only commit 034c81d Merge: 26290c0 bb3d19c Author: Alex Eng <aeng@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 26290c0 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 15 10:15:19 2014 +1000 improve filtering of tm list commit bb3d19c Author: Sean Flanigan <sflaniga@redhat.com> Date: Mon Apr 14 17:31:18 2014 +1000 Extract CopyTransWorkFactory; add basic unit test for CopyTransService commit c3c1344 Author: Sean Flanigan <sflaniga@redhat.com> Date: Mon Apr 14 15:09:50 2014 +1000 Extract CopyTransWork from CopyTransServiceImpl, along with tests commit 559ddd1 Merge: 86fec53 0a1b1d4 Author: Alex Eng <aeng@redhat.com> Date: Mon Apr 14 13:45:19 2014 +1000 Merge branch 'integration/master' into rhbz1077439 commit 86fec53 Author: Alex Eng <aeng@redhat.com> Date: Mon Apr 14 13:44:19 2014 +1000 Merge copyTrans to use lucene index for search commit 85b6076 Author: Sean Flanigan <sflaniga@redhat.com> Date: Thu Apr 3 11:16:50 2014 +1000 Create TranslationFinder interface commit 5f656f2 Author: Alex Eng <aeng@redhat.com> Date: Fri Apr 11 15:53:35 2014 +1000 WIP: generating unit test for tm service commit 9459a43 Author: Alex Eng <aeng@redhat.com> Date: Thu Apr 10 15:44:50 2014 +1000 WIP: refactor copy trans commit 27a49fe Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 9 15:55:07 2014 +1000 WIP: test for TM search commit c3ded2b Merge: 628badd 907ce45 Author: Alex Eng <aeng@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 628badd Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 9 15:02:25 2014 +1000 WIP: integration test for TM service commit f461e6e Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 8 15:59:33 2014 +1000 Move test to TM merge handler test to ServiceImpl commit 80d9f18 Author: Alex Eng <aeng@redhat.com> Date: Mon Apr 7 15:38:51 2014 +1000 Fix unit test to use lucene index commit 81afeb0 Merge: 2d61836 ea1069b Author: Sean Flanigan <sflaniga@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 2d61836 Author: Sean Flanigan <sflaniga@redhat.com> Date: Fri Apr 4 10:52:56 2014 +1000 Ensure Lucene indexing in CopyTransServiceImplTest commit ea1069b Author: Alex Eng <aeng@redhat.com> Date: Fri Apr 4 08:30:54 2014 +1000 WIP: copytrans commit 790c942 Author: Alex Eng <aeng@redhat.com> Date: Thu Apr 3 16:19:47 2014 +1000 WIP: copytrans commit ea1b066 Merge: 6230240 1f3f7bf Author: Alex Eng <aeng@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 6230240 Author: Alex Eng <aeng@redhat.com> Date: Thu Apr 3 14:00:33 2014 +1000 WIP: include project, document and resId condition in TM query commit 2719411 Author: Alex Eng <aeng@redhat.com> Date: Wed Apr 2 15:55:31 2014 +1000 WIP: refactoring copytrans and get translation memory service commit 3cc1e79 Author: Alex Eng <aeng@redhat.com> Date: Tue Apr 1 16:00:44 2014 +1000 WIP: integrating copytrans query to use lucene commit 5f12a1a Author: Alex Eng <aeng@redhat.com> Date: Mon Mar 31 16:02:27 2014 +1000 WIP: refactoring copy trans and TM merge
|
👍 |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
https://bugzilla.redhat.com/show_bug.cgi?id=1094106
Reinstate copy trans option selection in version page using modal popup.