[zanata/zanata] 0e7805: rhbz831035 - Add progress feddback for on-demand c...
GitHub
noreply at github.com
Sun Jul 1 21:26:30 UTC 2012
Branch: refs/heads/centraliseKeyboardShortcut
Home: https://github.com/zanata/zanata
Commit: 0e780595b09fda78e8b26d1517d0e99dfa45d15d
https://github.com/zanata/zanata/commit/0e780595b09fda78e8b26d1517d0e99dfa45d15d
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-13 (Wed, 13 Jun 2012)
Changed paths:
A zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcess.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - Add progress feddback for on-demand copy trans.
- Add a time estimation mechanism for background processes.
Commit: cefeb811d05b8b9cd727fcf8cdca5ca0658b8ae1
https://github.com/zanata/zanata/commit/cefeb811d05b8b9cd727fcf8cdca5ca0658b8ae1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-14 (Thu, 14 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - On-demand copy trans improvements.
- Tested for multi-user concurrent access.
- Add more feedback about an ongoing copy trans.
Commit: b031146696bf4f6965d9903bed73ea5edd8b4d8b
https://github.com/zanata/zanata/commit/b031146696bf4f6965d9903bed73ea5edd8b4d8b
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-15 (Fri, 15 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - On-demand copy trans improvements.
- Keep track of completed and cancelled copy trans.
- Show info on last copy trans for the iteration.
Commit: a12eb39eb99bb0da860a80c0a821143dbed6e8f8
https://github.com/zanata/zanata/commit/a12eb39eb99bb0da860a80c0a821143dbed6e8f8
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-17 (Sun, 17 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
Log Message:
-----------
rhbz831035 - Refactor background process mechanism.
- Add listener capability to background processes.
- Add self-cleaning to the copy trans manager bean.
- Add more feedback to the on-demand copy trans UI.
Commit: d24ba2fb747e32b73b1629a34126c8617ab58e76
https://github.com/zanata/zanata/commit/d24ba2fb747e32b73b1629a34126c8617ab58e76
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-18 (Mon, 18 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
rhbz831035 - Apply Post-Redirect-Get pattern to the copy trans actions.
- Introduce a conversation scoped bean to serve as a "flash" scope of sorts.
- Correct url rewrite rule that was preventing the conversation id from being propagated.
- Use the new "flash" scoped bean to store messages that would otherwise be lost with FacesMessages on subsequent ajax refreshes.
Commit: ffec30c5c88f3ebfc2e2b4366a648ab426b0d764
https://github.com/zanata/zanata/commit/ffec30c5c88f3ebfc2e2b4366a648ab426b0d764
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-25 (Mon, 25 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
Log Message:
-----------
Changed copy from TM shortcut to CTRL+ALT (1,2,3,4) to avoid key conflict: https://bugzilla.redhat.com/show_bug.cgi?id=834979
Commit: da7287f966cb3993f4c1cd2f8fb4a28ab8741437
https://github.com/zanata/zanata/commit/da7287f966cb3993f4c1cd2f8fb4a28ab8741437
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.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/GetTransUnitsNavigationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
rhbz831035 - Add copy trans options.
- Add very basic options for the execution of copy trans. Options in this revision include what to do on content and context mismatch (ignore, downgrade to fuzzy, or reject the translation).
- Change how copy trans executes, now looking at more than one possible translation per text flow.
- Add support for one transaction per document/locale pair.
- Add new page for copy trans to select options.
Commit: 52720c0509253ba1c75dd380f9f75422769fa6e6
https://github.com/zanata/zanata/commit/52720c0509253ba1c75dd380f9f75422769fa6e6
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
Log Message:
-----------
use manual scrolling for reindex queries
Commit: 921adcecc487c349071e33f77523856a87c59fea
https://github.com/zanata/zanata/commit/921adcecc487c349071e33f77523856a87c59fea
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/project/project.xhtml
A zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
rhbz831035 - Url rewrite rule changes for copy trans page.
Also change rewrite rules and the way links are generated in the project page.
Commit: cab09a9e6bdcbf819b0677a316d8aca260c5cf62
https://github.com/zanata/zanata/commit/cab09a9e6bdcbf819b0677a316d8aca260c5cf62
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
A zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
M zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcess.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
A zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
Merge branch 'rhbz831035' into integration/master
Conflicts:
zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
zanata-war/src/main/webapp/WEB-INF/pages.xml
zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
zanata-war/src/main/webapp/iteration/view.xhtml
Commit: 3bb24188d97264cdb691b72bb24daf7f6ca9a85a
https://github.com/zanata/zanata/commit/3bb24188d97264cdb691b72bb24daf7f6ca9a85a
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
Log Message:
-----------
Add comment on keycode used in keyboard shortcut
Commit: 706834683c1dc6825c5a5951ed77fb43d83ba0a8
https://github.com/zanata/zanata/commit/706834683c1dc6825c5a5951ed77fb43d83ba0a8
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: f01ef93ff6e16ee14d745fea7c419ee9852e3dae
https://github.com/zanata/zanata/commit/f01ef93ff6e16ee14d745fea7c419ee9852e3dae
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
Log Message:
-----------
Fix failing tests due to recent changes.
Also fix incorrect manual merge issues.
Commit: 11aafc9baabce3e00985e71152d4e086ac7e2ca5
https://github.com/zanata/zanata/commit/11aafc9baabce3e00985e71152d4e086ac7e2ca5
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-26 (Tue, 26 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: bccd332f4a4bfd52148717834e7d07354f905c4a
https://github.com/zanata/zanata/commit/bccd332f4a4bfd52148717834e7d07354f905c4a
Author: David Mason <dr.d.mason at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/stylesheet/base.css
Log Message:
-----------
rhbz826310 add tooltips and update strings for search administration page
Commit: 39124842a57a441aa7ee863a4ce51fcbb4f5ad88
https://github.com/zanata/zanata/commit/39124842a57a441aa7ee863a4ce51fcbb4f5ad88
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
Log Message:
-----------
Fix compilation error on OpenJDK platforms.
Sun JDKs seem unaffected by this.
Commit: 6a8c45b97e4d8baec7b64bf8fe6664f771aa9a52
https://github.com/zanata/zanata/commit/6a8c45b97e4d8baec7b64bf8fe6664f771aa9a52
Author: Alex Eng <aeng at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
Log Message:
-----------
Fix test problem by clearing hibernate cache in before and after method
Commit: 56677aeb7465a5285c0a7a1e57e70a3b6a5ae050
https://github.com/zanata/zanata/commit/56677aeb7465a5285c0a7a1e57e70a3b6a5ae050
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
Log Message:
-----------
Move some static strings to messages.properties
Commit: a8bff042c39e589ea7298c0646acfe79a1ee09e8
https://github.com/zanata/zanata/commit/a8bff042c39e589ea7298c0646acfe79a1ee09e8
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
Log Message:
-----------
Fix https://bugzilla.redhat.com/show_bug.cgi?id=826307 for 1.7
Commit: 07ba3e6f936bc0bbf13c9bb92f89e67183dc9541
https://github.com/zanata/zanata/commit/07ba3e6f936bc0bbf13c9bb92f89e67183dc9541
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Give editor textarea the same font as the table
Commit: 2a77a99226921d4a669ce159502dd3cf1275460a
https://github.com/zanata/zanata/commit/2a77a99226921d4a669ce159502dd3cf1275460a
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/webapp/admin/search.xhtml
M zanata-war/src/main/webapp/stylesheet/base.css
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: d6f80e0c387f5f59af139a781ceb677b9a0c3a07
https://github.com/zanata/zanata/commit/d6f80e0c387f5f59af139a781ceb677b9a0c3a07
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
Log Message:
-----------
Remove some redundant styling
Commit: 722b5d89750998ccc6de4821a03a862a73bc2e32
https://github.com/zanata/zanata/commit/722b5d89750998ccc6de4821a03a862a73bc2e32
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilter.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
use hibernate search in GetTransUnitListHandler
Commit: 49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
https://github.com/zanata/zanata/commit/49ce2a7f68690138aa2c124b6a5ebf0cc40ad9dc
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-27 (Wed, 27 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
rhbz836092 - Add assamese plural form.
Also added a default plural form (no plurals allowed by default) when no plural form is detected.
Commit: e2406f4d4655f47da865606ce86c0fb9c0ba9bc1
https://github.com/zanata/zanata/commit/e2406f4d4655f47da865606ce86c0fb9c0ba9bc1
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/stylesheet/zanata.css
Log Message:
-----------
GUI change for on-demand copy trans.
Commit: 1fdcb698d499b9d8f63e3c853b53e38d5855b7fc
https://github.com/zanata/zanata/commit/1fdcb698d499b9d8f63e3c853b53e38d5855b7fc
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
M zanata-war/src/main/webapp/WEB-INF/pages.xml
Log Message:
-----------
Add security restrictions to copy trans pages and action classes.
Commit: 4e405272dd4f455da1609340ca1a478ff0fd1ac1
https://github.com/zanata/zanata/commit/4e405272dd4f455da1609340ca1a478ff0fd1ac1
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
Log Message:
-----------
fix bug
Commit: 0074c94b6b9001ce399e88fb8b5760faef942404
https://github.com/zanata/zanata/commit/0074c94b6b9001ce399e88fb8b5760faef942404
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/pluralforms.properties
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: fb64a3c79e222aa70c23d5416e5555246952010f
https://github.com/zanata/zanata/commit/fb64a3c79e222aa70c23d5416e5555246952010f
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
Log Message:
-----------
Merge branch 'integration/master' of github.com:zanata/zanata into integration/master
Commit: deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
https://github.com/zanata/zanata/commit/deeac58abe7ebaaf19e08f2ca3d0f0b6ae8094dd
Author: Sean Flanigan <sflaniga at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Update zanata-common to 1.6.1
Commit: 7b992e7a36110a321e41b5902de4e5d5e52e3013
https://github.com/zanata/zanata/commit/7b992e7a36110a321e41b5902de4e5d5e52e3013
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
rhbz836092 - Allowing addition of locales for which no plural information is found.
A warning will be shown when this occurs but the system won't prevent the addition of the new locale. All other locale validation rules still apply.
Commit: 0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
https://github.com/zanata/zanata/commit/0888bbf93df4bee6844e4cf31e797b7fd1ef0e62
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
Log Message:
-----------
Merge branch '1.6' of github.com:zanata/zanata into 1.6
Commit: 6baccfb516017da17584bd1e123f851b2d1bf955
https://github.com/zanata/zanata/commit/6baccfb516017da17584bd1e123f851b2d1bf955
Author: Carlos Munoz <camunoz at redhat.com>
Date: 2012-06-28 (Thu, 28 Jun 2012)
Changed paths:
M pom.xml
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
M zanata-war/src/main/resources/messages.properties
Log Message:
-----------
Merge branch '1.6' into integration/master
Commit: 797959740b1d2bf4bbb0d004c35561a8a371542b
https://github.com/zanata/zanata/commit/797959740b1d2bf4bbb0d004c35561a8a371542b
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M 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
Log Message:
-----------
refactor - rename enum names and message values to be consistent with jsf copy tran values
Commit: 4879a9fde414a2576a8282dd8e4cf40a1bcd682a
https://github.com/zanata/zanata/commit/4879a9fde414a2576a8282dd8e4cf40a1bcd682a
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRadioButtonGroup.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
Log Message:
-----------
change to use radio button
Commit: f83949651a7898d4111f03cd570fe45efeb520b0
https://github.com/zanata/zanata/commit/f83949651a7898d4111f03cd570fe45efeb520b0
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
M 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
Log Message:
-----------
compare not only res id but also msg context
Commit: 3cb21a01db4a358a71f8fe4d8adb408c8484e7c8
https://github.com/zanata/zanata/commit/3cb21a01db4a358a71f8fe4d8adb408c8484e7c8
Author: Patrick Huang <pahuang at redhat.com>
Date: 2012-06-29 (Fri, 29 Jun 2012)
Changed paths:
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
Log Message:
-----------
fix - HTextFlow.getTargets().get to use locale id
Commit: c0808c9d2efee7bba28cb3418f6564b98f72358c
https://github.com/zanata/zanata/commit/c0808c9d2efee7bba28cb3418f6564b98f72358c
Author: Alex Eng <loones1595 at gmail.com>
Date: 2012-07-01 (Sun, 01 Jul 2012)
Changed paths:
M pom.xml
M zanata-model/src/main/java/org/zanata/model/HLocale.java
M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
A zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
A zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.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/process/BackgroundProcess.java
A zanata-war/src/main/java/org/zanata/process/BackgroundProcessListener.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcess.java
A zanata-war/src/main/java/org/zanata/process/CopyTransProcessHandle.java
M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
M zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
A zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
A zanata-war/src/main/java/org/zanata/util/HTextFlowPosComparator.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
M zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/EnumRadioButtonGroup.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeOptionRenderer.java
A zanata-war/src/main/java/org/zanata/webtrans/client/ui/MergeStatusRenderer.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.java
M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TMMergeForm.ui.xml
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/GetTransUnitListHandler.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationHandler.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/TransMemoryMergeStatusResolver.java
M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/MergeOption.java
M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryMerge.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilter.java
R zanata-war/src/main/java/org/zanata/webtrans/shared/util/TextFlowFilterImpl.java
M zanata-war/src/main/resources/messages.properties
M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
M zanata-war/src/main/resources/pluralforms.properties
M zanata-war/src/main/webapp/WEB-INF/pages.xml
M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
M zanata-war/src/main/webapp/admin/search.xhtml
A zanata-war/src/main/webapp/iteration/copy_trans.xhtml
M zanata-war/src/main/webapp/iteration/view.xhtml
M zanata-war/src/main/webapp/project/project.xhtml
M zanata-war/src/main/webapp/stylesheet/base.css
M zanata-war/src/main/webapp/stylesheet/zanata.css
M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
M zanata-war/src/main/webapp/version-group/request_to_join.xhtml
M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
M zanata-war/src/test/java/org/zanata/model/TestFixture.java
M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
A zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryMergePresenterTest.java
M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
M 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
M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
Log Message:
-----------
Merge branch 'master' into centraliseKeyboardShortcut
Compare: https://github.com/zanata/zanata/compare/9754c04ccec9...c0808c9d2efe
More information about the zanata-commits
mailing list