[zanata/zanata-server] e9f6e6: Copy version feature: http://bugzilla.redhat.com/s...
GitHub
noreply at github.com
Mon Aug 11 22:05:35 UTC 2014
Branch: refs/heads/integration/master
Home: https://github.com/zanata/zanata-server
Commit: e9f6e66c67672bfea885a203df08c20919bb3e81
https://github.com/zanata/zanata-server/commit/e9f6e66c67672bfea885a203df08c20919bb3e81
Author: Alex Eng <aeng at redhat.com>
Date: 2014-08-12 (Tue, 12 Aug 2014)
Changed paths:
M zanata-model/pom.xml
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
A zanata-model/src/main/java/org/zanata/util/JPACopier.java
A zanata-model/src/test/java/org/zanata/util/JPACopierTest.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/ProjectHome.java
M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.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
A zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.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
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/seam/scope/ConversationScopeMessages.java
A zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.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/TransMemoryMergeServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-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/template.xhtml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/project/add_iteration.xhtml
M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
A zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
M zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java
M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
A zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
Log Message:
-----------
Copy version feature: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
Squashed commit of the following:
commit caf208c41090e261c0a4c73042c77511d51a4a0c
Merge: 55e8dd8 70ec903
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 12 07:53:09 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit 55e8dd8748384aacbafbfb7ee6bde7cade1a00a2
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 11 15:51:50 2014 +1000
reduce number of batches for document
commit 805c23a8c9d21ed97dac0fbe2c28671c451d4752
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 11 15:47:32 2014 +1000
Change order of rerender after copy version cancel
commit 171d0485b723c6c8db91c1148ce9385711e868f2
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 11 13:17:01 2014 +1000
clear versionHome bean after cancel copy version
commit 8b3e50d8465f2a00ad4b2f4d68bd3260276d16c2
Merge: e05ef92 5b76932
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 11 10:57:13 2014 +1000
Merge branch 'integration/master' into rhbz1104015
Conflicts:
zanata-war/src/main/java/org/zanata/action/VersionHome.java
commit e05ef9230162c6c37ecf6904d5dc3e01663b8296
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 11 10:34:18 2014 +1000
Implement confirmation message when cancel version copy
commit 01b9df829c6102b825bd6a5c768c2db71338f626
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 8 12:38:52 2014 +1000
Fix version status while copying
commit 4a853b74a5948460d940e48ffc6b418b1da9766e
Merge: 3992f1b 9be4de8
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 8 07:25:22 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit 3992f1bc77aa095f33d2eda760111077451cc6c1
Author: Alex Eng <aeng at redhat.com>
Date: Fri Aug 8 07:24:49 2014 +1000
Fix returned percentage for progressBar
commit 80de2ea2ddbac97222e8e0e65fa9ecd6f27e5a2d
Author: Alex Eng <aeng at redhat.com>
Date: Thu Aug 7 14:43:51 2014 +1000
Implement copy version option from version page, fix url rewrite for copy version
commit 0e301de917342a226c2fc39c8e8c4e4ed6224bfb
Author: Alex Eng <aeng at redhat.com>
Date: Thu Aug 7 08:16:52 2014 +1000
Fix version status in version page after copy
commit b78fda237235f523ea7cc31fb72fbc1a1900da53
Merge: 21a2817 444bb3b
Author: Alex Eng <aeng at redhat.com>
Date: Thu Aug 7 08:07:34 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit 21a2817429922f163e25d714c9d6f61aba618fc7
Author: Alex Eng <aeng at redhat.com>
Date: Wed Aug 6 13:00:40 2014 +1000
Fix copy version cancel button
commit 0ade0d101e858f4a2d3abbc4f03e90aaef742328
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 5 15:35:15 2014 +1000
WIP: fixing onComplete and onCancel for copy version
commit c0b49a9661f83454fb91bf9f2cdb853a9c4b04c6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 5 12:49:45 2014 +1000
Fix cancel copy version button
commit 3fb30fdd60bb469543bceeb702175d1bfd09a9b6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 5 12:10:13 2014 +1000
Fix version status after cancel copy
commit b44c14a699c91230f9be9c49acf2c6d93fa23ac9
Author: Alex Eng <aeng at redhat.com>
Date: Tue Aug 5 10:36:19 2014 +1000
Fix copy target history
commit 372da045d9efffeaa079a1c53f43e2fc0e543147
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 4 15:26:05 2014 +1000
fix invalid slug when copy version, progressBar check on optional method onComplete
commit 07511aa57e11dc90ca9efca18545be6b822118c3
Author: Alex Eng <aeng at redhat.com>
Date: Mon Aug 4 13:03:53 2014 +1000
Disable copy from obsolete version
commit 6b74db58bc25728e2a67939238179534cabdb948
Merge: 36a3125 0a7b0fb
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 31 10:44:03 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit 36a31254212291671806f3454291d6411fd5b578
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 31 09:47:46 2014 +1000
Add comments, refactor test
commit 0522a6f7aa4eb1991a7d089d130d3254fd466907
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 30 15:27:40 2014 +1000
Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
Squashed commit of the following:
commit ca25839b932ee9ee962099c47b8582f2a6731b41
Merge: 30a2fbe 87695aa
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 30 15:24:37 2014 +1000
Merge branch 'integration/master' into rhbz1104015
Conflicts:
zanata-war/src/main/resources/messages.properties
commit 30a2fbe19100e7fa3aaf5469b5a658924cef3e6a
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 30 15:12:35 2014 +1000
Refactor JPACopier
commit 53e441459ae9c6239acc10f18950d80dd062e2ad
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 30 08:53:54 2014 +1000
WIP: fixing test
commit 639efdc86068bd4695c8d729a0cefd83783981de
Merge: dfc12f3 2e0439b
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 29 15:44:25 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit dfc12f33c67f525ac44360301443f71b06eb67ff
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 29 15:11:44 2014 +1000
WIP: refactoring copy bean implementation
commit e85c7c19b1182f3a7afc77ea82c8f634f8197c60
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 29 08:29:55 2014 +1000
Refactor return type
commit 509e7f98bd52c72fd9895db5a93e0c24ea290992
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jul 28 09:24:36 2014 +1000
Fix test
commit 885727c0839ffdf1084c5a118c2b51b7acd4fc73
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jul 28 07:41:57 2014 +1000
Refactor beanUtil
commit 028336ae8ec9544f1a6cce9368a70f9da5c85345
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 23 15:05:56 2014 +1000
Update comments, refactor copy of Collection type in beanUtils
commit aa3ea50dccd445940f60079ee1294b55e83324f4
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 23 10:03:40 2014 +1000
Update powermock version used in zanata-model
commit 8ada818fed2b180f8941910716faf25c83d5e3f6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 22 12:42:54 2014 +1000
Fix plural copy, move Copy annotation to getter method
commit 5dcfd0ec06179b7bef9476901fe760623f2c2c39
Merge: f9710b4 4f02f0a
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jul 21 10:40:09 2014 +1000
Merge branch 'integration/master' into rhbz1104015
commit f9710b467f211052fd30a06ac62d2fed420a7e51
Author: Alex Eng <aeng at redhat.com>
Date: Mon Jul 21 09:42:31 2014 +1000
Add unit test for beanUtils
commit ea5d7804da100b5b9f590c15eb9908fd2ebb4613
Author: Alex Eng <aeng at redhat.com>
Date: Fri Jul 18 10:30:30 2014 +1000
Implement annotation Copy for cloning property
commit be178d518dbc29ca9e08e6cf5932d02bfd1e3a34
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 17 15:08:54 2014 +1000
WIP: copy version refactoring
commit 6e07eed21a1acbac8c77c85a479bf6bb41def14f
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 17 10:16:58 2014 +1000
WIP: Copy annotation
commit 0d80531f850d387449913014c09563e3f93c6480
Author: Alex Eng <aeng at redhat.com>
Date: Fri Jul 11 15:05:09 2014 +1000
Implement copy version progress in version-tab
commit 80d8404f632a622367dcd25b85e4debbe6b4f8b5
Author: Alex Eng <aeng at redhat.com>
Date: Thu Jul 10 15:24:31 2014 +1000
WIP: show copy progress in project page
commit d43624b57e92f30af4098dd26639a00e48f99bdf
Author: Alex Eng <aeng at redhat.com>
Date: Wed Jul 9 15:16:02 2014 +1000
add batch process unit test
commit 6a2f3fa47370c4532d0d7a3101a6e8d530445d7f
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 8 15:20:49 2014 +1000
Round to 4 decimal for progress bar complete
commit b029e3c20418b02abab3dca3d899a88336bfe4d6
Author: Alex Eng <aeng at redhat.com>
Date: Tue Jul 8 15:10:06 2014 +1000
Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
More information about the zanata-commits
mailing list