[zanata/zanata-server] aac6aa: Implement fix for activity log: https://bugzilla.r...

Tue Aug 27 03:56:10 UTC 2013

  Branch: refs/heads/async-refactor
  Home:   https://github.com/zanata/zanata-server
  Commit: aac6aa6b5b10eff927fbdb45ab9631e8d3866556
      https://github.com/zanata/zanata-server/commit/aac6aa6b5b10eff927fbdb45ab9631e8d3866556
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Implement fix for activity log: https://bugzilla.redhat.com/show_bug.cgi?id=996377
- Update activity target when update entry
- Dashboard page requires login from user
- Fix up translation document upload activity string - incorrect "Finishing on..." was displayed

  Commit: 5e6baa3b1781405f4820c9934425e5c4d281c427
      https://github.com/zanata/zanata-server/commit/5e6baa3b1781405f4820c9934425e5c4d281c427
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  - Remove 'dashboard' from left side menu
- Increase left side menu icon size

  Commit: 53a4583f8c86aaecb8a36ecc09ce66c868f7f324
      https://github.com/zanata/zanata-server/commit/53a4583f8c86aaecb8a36ecc09ce66c868f7f324
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java

  Log Message:
  -----------
  Add @Restrict in dashboard related action class

  Commit: 211cd4c684b96f2fbd23631dc498e2d1e3ca5808
      https://github.com/zanata/zanata-server/commit/211cd4c684b96f2fbd23631dc498e2d1e3ca5808
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml

  Log Message:
  -----------
  Merge pull request #128 from zanata/MinorUiChange

Minor UI change

  Commit: 96af233212edd46300c5e0d5814cd00c33a5620e
      https://github.com/zanata/zanata-server/commit/96af233212edd46300c5e0d5814cd00c33a5620e
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml

  Log Message:
  -----------
  Merge pull request #127 from zanata/rhbz996377

Implement fix for activity log: https://bugzilla.redhat.com/show_bug.cgi?id=996377

  Commit: 60a95cf0d1ffe34abc0edb71c56d5c3812803047
      https://github.com/zanata/zanata-server/commit/60a95cf0d1ffe34abc0edb71c56d5c3812803047
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.1

  Commit: 21666add5b2a709df3e4594afec44ccd824174b4
      https://github.com/zanata/zanata-server/commit/21666add5b2a709df3e4594afec44ccd824174b4
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 973f6e55f477f2999e453229f266c7854bdf0373
      https://github.com/zanata/zanata-server/commit/973f6e55f477f2999e453229f266c7854bdf0373
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  rhbz995964 - Fix issue with the clearing of large TMs.

Reduce the batch size to a smaller size.
USe the correct method when setting up TU batches to clear.

  Commit: 344357ba52dd23c21cb59649b3b0ae7c414ead63
      https://github.com/zanata/zanata-server/commit/344357ba52dd23c21cb59649b3b0ae7c414ead63
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  Merge pull request #129 from zanata/tm-clear-fix

rhbz995964 - Fix issue with the clearing of large TMs.

  Commit: ee98166d27b31008ce7fdd8fbd1949c0d2407b67
      https://github.com/zanata/zanata-server/commit/ee98166d27b31008ce7fdd8fbd1949c0d2407b67
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-14 (Wed, 14 Aug 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/webapp/resources/richext/spacer.xhtml

  Log Message:
  -----------
  Normalize line endings

  Commit: 936b0392745b242d649356a300415e434dfa2ec2
      https://github.com/zanata/zanata-server/commit/936b0392745b242d649356a300415e434dfa2ec2
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Fixed the untraslated color in the editor, which was too dark.

  Commit: 0120ffcb97d376c3e85f21430f2f7942cc54c7c8
      https://github.com/zanata/zanata-server/commit/0120ffcb97d376c3e85f21430f2f7942cc54c7c8
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Add test for part upload with no upload id.

  Commit: 6e63446fbcaa702bbe8982587909f80fdb7f78a1
      https://github.com/zanata/zanata-server/commit/6e63446fbcaa702bbe8982587909f80fdb7f78a1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml

  Log Message:
  -----------
  Merge pull request #131 from zanata/update-untranslated-color

Fixed the untraslated color in the editor, which was too dark.

  Commit: bcb89c053c3a1800c100d42397ea67c41e61fad1
      https://github.com/zanata/zanata-server/commit/bcb89c053c3a1800c100d42397ea67c41e61fad1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  rhbz996388 - reviewer only should be able to comment and reject

  Commit: 3b4f1732e1dfcfc2965703081bb9a2139f2f3b2b
      https://github.com/zanata/zanata-server/commit/3b4f1732e1dfcfc2965703081bb9a2139f2f3b2b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Update sign up and login button

  Commit: 78afafcedc492dbbbdead971f566cc30733971ee
      https://github.com/zanata/zanata-server/commit/78afafcedc492dbbbdead971f566cc30733971ee
  Author: Luke Brooker <mail at lukebrooker.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge pull request #132 from zanata/bannerChange

Update sign up and login button

  Commit: ef9cdda316d5d8fcc5fef1af4986e11276ce3f1a
      https://github.com/zanata/zanata-server/commit/ef9cdda316d5d8fcc5fef1af4986e11276ce3f1a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java

  Log Message:
  -----------
  rhbz996388 - move some work after validation is done

  Commit: 4e69f72d1791737438d20e19d9102b0179273e56
      https://github.com/zanata/zanata-server/commit/4e69f72d1791737438d20e19d9102b0179273e56
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java

  Log Message:
  -----------
  Move upload lookup to DAO

    Using criteria in the util makes it far more complicated to test
    with no benefit.

  Commit: 05b167c50d6ffa5404e32175da3cdf0337391c1b
      https://github.com/zanata/zanata-server/commit/05b167c50d6ffa5404e32175da3cdf0337391c1b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  rhbz996388 - add drools rule for security check

  Commit: 3b8f40d75b8b597bfc5bc15b1f924264154c52ae
      https://github.com/zanata/zanata-server/commit/3b8f40d75b8b597bfc5bc15b1f924264154c52ae
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/LockManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java

  Log Message:
  -----------
  Record username when locking, report username when already locked

  Commit: 856da7dda6642e44784a7e17fe2a7734b1506c2a
      https://github.com/zanata/zanata-server/commit/856da7dda6642e44784a7e17fe2a7734b1506c2a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/ProcessManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java

  Log Message:
  -----------
  Allow individual ProcessHandles to be removed

  Commit: 831126fca8005b08381b212b463979e2a44c5119
      https://github.com/zanata/zanata-server/commit/831126fca8005b08381b212b463979e2a44c5119
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  rhbz996939 Check lock when uploading/clearing TM, report lock errors in web UI

  Commit: b2fb2646a343139539265f886bf54efb4c2a97b1
      https://github.com/zanata/zanata-server/commit/b2fb2646a343139539265f886bf54efb4c2a97b1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Ensure TM table is refreshed when last TM is deleted

  Commit: 6fdf99fb599104c6379b176f444d19df57a4e058
      https://github.com/zanata/zanata-server/commit/6fdf99fb599104c6379b176f444d19df57a4e058
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Fix creation of TMs

  Commit: 2c0643ac37b0ee7f1506885645e89cca85de3d54
      https://github.com/zanata/zanata-server/commit/2c0643ac37b0ee7f1506885645e89cca85de3d54
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-15 (Thu, 15 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java

  Log Message:
  -----------
  Remove unnecessary Restrict

  Commit: de6c0eacfa025d20cb3e3a330f18996635125da5
      https://github.com/zanata/zanata-server/commit/de6c0eacfa025d20cb3e3a330f18996635125da5
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/service/LockManagerService.java
    M zanata-war/src/main/java/org/zanata/service/ProcessManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Merge pull request #134 from zanata/lock-tm

rhbz996939 Check lock when uploading/clearing TM, report lock errors

  Commit: a76ce1c38a6db839789db8486729d6d8318134a1
      https://github.com/zanata/zanata-server/commit/a76ce1c38a6db839789db8486729d6d8318134a1
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update module versions

  Commit: ed13e683f1b339aa56acead1852d87bb09120f2d
      https://github.com/zanata/zanata-server/commit/ed13e683f1b339aa56acead1852d87bb09120f2d
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-3.0.2

  Commit: d19ee6cdd087b5194f16e6ca8eafd13c68c4b4f3
      https://github.com/zanata/zanata-server/commit/d19ee6cdd087b5194f16e6ca8eafd13c68c4b4f3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-08-16 (Fri, 16 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 18fc7bc59842bdd510ee75e24298ad4698f884d7
      https://github.com/zanata/zanata-server/commit/18fc7bc59842bdd510ee75e24298ad4698f884d7
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  rhbz998294 Avoid storing last upload part in database.

    This fixes an issue where the last part was not returning any
    bytes, and reduces unnecessary database activity.

  Commit: 2555aded53e4182837dfa8f9359f6e479c8b863d
      https://github.com/zanata/zanata-server/commit/2555aded53e4182837dfa8f9359f6e479c8b863d
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java

  Log Message:
  -----------
  rhbz998294 make upload chunk count calculation more explicit

  Commit: 8b951b572652ecadf343440381a75c84a762a0db
      https://github.com/zanata/zanata-server/commit/8b951b572652ecadf343440381a75c84a762a0db
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  prepare for next development iteration

  Commit: 9ce54258ad096a847149d547ef4a464c7e23a383
      https://github.com/zanata/zanata-server/commit/9ce54258ad096a847149d547ef4a464c7e23a383
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Merge pull request #133 from zanata/tests/document-upload

Fix multiple chunk document upload

  Commit: 72e72c152ee6639b281407fbba892f99319d6eef
      https://github.com/zanata/zanata-server/commit/72e72c152ee6639b281407fbba892f99319d6eef
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  RHBZ-997199 remove the space between word and full stop

A space between the last word and the full stop just looks weird.

  Commit: 026aa224b77624621aa693607ad1512699f0a45f
      https://github.com/zanata/zanata-server/commit/026aa224b77624621aa693607ad1512699f0a45f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml

  Log Message:
  -----------
  Merge pull request #135 from zanata/fix-the-fullstop

RHBZ-997199 remove the space between word and full stop

  Commit: ea5daca653ec2b6f44debe0b82e11c5e5276e7f4
      https://github.com/zanata/zanata-server/commit/ea5daca653ec2b6f44debe0b82e11c5e5276e7f4
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Add test for uploading a part to an old upload.

  Commit: ce042e4691621995ab3747fcef3448f21c590b41
      https://github.com/zanata/zanata-server/commit/ce042e4691621995ab3747fcef3448f21c590b41
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Add test for uploading with mismatched upload id and doc id.

  Commit: 5c734324de8b588a143aedb0ddf27ecb164aec2e
      https://github.com/zanata/zanata-server/commit/5c734324de8b588a143aedb0ddf27ecb164aec2e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Add tests ensuring correct stream is returned during file upload.

  Commit: f6b167d64b571b831d615ebdf2a13641cdbec7f2
      https://github.com/zanata/zanata-server/commit/f6b167d64b571b831d615ebdf2a13641cdbec7f2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Add tests for combining upload parts to a temp file.

  Commit: 6de5f5601b49a02431b9bec19c27593400ea426c
      https://github.com/zanata/zanata-server/commit/6de5f5601b49a02431b9bec19c27593400ea426c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-18 (Sun, 18 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java

  Log Message:
  -----------
  fix typo and organize imports

  Commit: 0a68817a5b66424b5db2d0f06c6ebdd96a3d4171
      https://github.com/zanata/zanata-server/commit/0a68817a5b66424b5db2d0f06c6ebdd96a3d4171
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-19 (Mon, 19 Aug 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  Update changelog

  Commit: f798523e8ee08cf2f3d01b4a70a18a926a3f8403
      https://github.com/zanata/zanata-server/commit/f798523e8ee08cf2f3d01b4a70a18a926a3f8403
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Merge pull request #136 from zanata/tests/document-upload-util

Additional tests for DocumentUploadUtil

  Commit: 1bbcbb6268bfd94f9d40d8cde9220567f8197a89
      https://github.com/zanata/zanata-server/commit/1bbcbb6268bfd94f9d40d8cde9220567f8197a89
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  fix workflow in 'Find User to Add Dialog' in language team : https://bugzilla.redhat.com/show_bug.cgi?id=998825

  Commit: 3af0250961cbb13886ba460810bdd08e2d4eb0e3
      https://github.com/zanata/zanata-server/commit/3af0250961cbb13886ba460810bdd08e2d4eb0e3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java

  Log Message:
  -----------
  Only select user when a role is selected, as per comment

  Commit: d2fb3637ae72f4c26b493f0363e0b8e979271629
      https://github.com/zanata/zanata-server/commit/d2fb3637ae72f4c26b493f0363e0b8e979271629
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  fix for wrong remaining hours shown in statistic: https://bugzilla.redhat.com/show_bug.cgi?id=998298

  Commit: 79e142ddc0000a1e962cc74859e2229ff5c3d023
      https://github.com/zanata/zanata-server/commit/79e142ddc0000a1e962cc74859e2229ff5c3d023
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge pull request #130 from zanata/rhbz996388-reviewer-only

rhbz996388 - reviewer only should be able to comment and reject

  Commit: abe463860a16eaff29a733d927d445e7fe56604e
      https://github.com/zanata/zanata-server/commit/abe463860a16eaff29a733d927d445e7fe56604e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Remove 'Selected' column, user gets added when a role a selected

  Commit: ef59f9da4229767a54b80a760825f88aa134b141
      https://github.com/zanata/zanata-server/commit/ef59f9da4229767a54b80a760825f88aa134b141
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java

  Log Message:
  -----------
  Merge pull request #139 from zanata/rhbz998298

fix for wrong remaining hours shown in statistic: https://bugzilla.redhat.com/show_bug.cgi?id=998298

  Commit: 21fe07143d6306e19315af79b26c9eb289298da0
      https://github.com/zanata/zanata-server/commit/21fe07143d6306e19315af79b26c9eb289298da0
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M CHANGELOG.md

  Log Message:
  -----------
  update changelog

  Commit: 2185679687f39d39db224d53ae4e52720ec8fcc9
      https://github.com/zanata/zanata-server/commit/2185679687f39d39db224d53ae4e52720ec8fcc9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java

  Log Message:
  -----------
  Fix unexpected error when requesting to join group: https://bugzilla.redhat.com/show_bug.cgi?id=998724

  Commit: 790c70add6251a5ee1246d2e48ef211f968c8ec3
      https://github.com/zanata/zanata-server/commit/790c70add6251a5ee1246d2e48ef211f968c8ec3
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Apply coding format to changed files

  Commit: 09d65daf0b05a5b2c584f873172e895447842bf5
      https://github.com/zanata/zanata-server/commit/09d65daf0b05a5b2c584f873172e895447842bf5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java

  Log Message:
  -----------
  Apply coding format to changed file

  Commit: 8e4167eb5cbf7e9decc04aed4b872d39031c985b
      https://github.com/zanata/zanata-server/commit/8e4167eb5cbf7e9decc04aed4b872d39031c985b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  replace tab with white spaces

  Commit: dc28f93dc9497f127c3e7efcdd015c51812e0ec1
      https://github.com/zanata/zanata-server/commit/dc28f93dc9497f127c3e7efcdd015c51812e0ec1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-08-21 (Wed, 21 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/webapp/language/language.xhtml

  Log Message:
  -----------
  Merge pull request #138 from zanata/rhbz998825

Fix workflow in 'Find User to Add Dialog' in language team : https://bugzilla.redhat.com/show_bug.cgi?id=998825

  Commit: b89e46208848105e1d6cf94f51c1f0feac00ae7f
      https://github.com/zanata/zanata-server/commit/b89e46208848105e1d6cf94f51c1f0feac00ae7f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java

  Log Message:
  -----------
  Merge pull request #140 from zanata/rhbz998724

Fix unexpected error when requesting to join group: https://bugzilla.redhat.com/show_bug.cgi?id=998724

  Commit: ffd12a1f72a9fda9ed639b97b3353986a9cca054
      https://github.com/zanata/zanata-server/commit/ffd12a1f72a9fda9ed639b97b3353986a9cca054
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java

  Log Message:
  -----------
  fix function test for modified UI in add new language member

  Commit: 162f2ab4a3a1dbda8fdc738591368c145a350543
      https://github.com/zanata/zanata-server/commit/162f2ab4a3a1dbda8fdc738591368c145a350543
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-08-25 (Sun, 25 Aug 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java

  Log Message:
  -----------
  Merge pull request #142 from zanata/fixfunctiontest

fix function test for modified UI in add new language member

  Commit: 5848eab5efe532112e66597331a2c5ea3ca08785
      https://github.com/zanata/zanata-server/commit/5848eab5efe532112e66597331a2c5ea3ca08785
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-08-26 (Mon, 26 Aug 2013)

  Changed paths:
    M CHANGELOG.md
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/Activity.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    A zanata-war/src/main/java/org/zanata/dao/DocumentUploadDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/LockManagerService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LockManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/left_menu.xhtml
    M zanata-war/src/main/webapp/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/dashboard/maintainedProject.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadTest.java
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/integration/master' into async-refactor

Conflicts:
	zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
	zanata-war/src/main/java/org/zanata/service/ProcessManagerService.java
	zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java

Compare: https://github.com/zanata/zanata-server/compare/1681e9a8ce10...5848eab5efe5