[zanata/zanata-server] 2dd3e4: Extract application permissions from a drools file...

GitHub noreply at github.com
Thu Aug 7 05:04:29 UTC 2014


  Branch: refs/heads/ui-update
  Home:   https://github.com/zanata/zanata-server
  Commit: 2dd3e41a09cc26e26bc8eaae7d09a1f39ff79493
      https://github.com/zanata/zanata-server/commit/2dd3e41a09cc26e26bc8eaae7d09a1f39ff79493
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/ResolvesPermissions.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    A zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Extract application permissions from a drools file and into Java code.


  Commit: 760d1c302074118125dd5e85c4036e8024790bdf
      https://github.com/zanata/zanata-server/commit/760d1c302074118125dd5e85c4036e8024790bdf
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-02 (Mon, 02 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/Action.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Resolve checkstyle violations.


  Commit: dddbf9d1df9b6be27b45cade699f1adc6861f69a
      https://github.com/zanata/zanata-server/commit/dddbf9d1df9b6be27b45cade699f1adc6861f69a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-17 (Tue, 17 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml

  Log Message:
  -----------
  Remove unnecessary comments and obsolete secruity.drl file.


  Commit: 1a1326ce96dabf0390c323f9d5a5ae1dab80e191
      https://github.com/zanata/zanata-server/commit/1a1326ce96dabf0390c323f9d5a5ae1dab80e191
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    A functional-test/src/test/java/org/zanata/feature/Feature.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/document/DocTypeUploadTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    A functional-test/src/test/java/org/zanata/feature/document/SubtitleDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    A functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    A functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/PagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ProjectAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/adapter/SubtitleAdapter.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/AccountDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    M zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/security/JBossSSOLoginModule.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/LeakListener.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractSortAction.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/MessageStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorTextArea.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutContextAwareDialogBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.ui.xml
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/adapter/SubtitleAdapterDefaultConfiguration.yml
    R zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/admin/language.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/search.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/groovy/org/zanata/ZanataGroovyJpaTest.groovy
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/provider/JPAProvider.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into sec-functions


  Commit: 983119d85e627763481f0b61d290c9f077ffccce
      https://github.com/zanata/zanata-server/commit/983119d85e627763481f0b61d290c9f077ffccce
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-18 (Wed, 18 Jun 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java

  Log Message:
  -----------
  Remove security.drl file from the Arquillian deployment.


  Commit: 0495ae121fec6aaa6799a1a3197a5039cbe4ee45
      https://github.com/zanata/zanata-server/commit/0495ae121fec6aaa6799a1a3197a5039cbe4ee45
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Hold active tasks in a map, but cache finished tasks briefly


  Commit: 928ea7aecea8f9d11fa39dfb453287648284befb
      https://github.com/zanata/zanata-server/commit/928ea7aecea8f9d11fa39dfb453287648284befb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Allow lookup of finished tasks; test that onComplete is called


  Commit: cc282bb02e2a19df3618594973f80077162818a0
      https://github.com/zanata/zanata-server/commit/cc282bb02e2a19df3618594973f80077162818a0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-23 (Mon, 23 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/Action.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    R zanata-war/src/main/java/org/zanata/security/permission/ResolvesPermissions.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Create a new PermissionGranter class to perform invocations of granter methods.

Also validate that all arguments in a granter method are provided if the granter is to be invoked.
Keep granter methods indexed by the action(s) they apply to.
Make sure granters are only called if necessary.


  Commit: b35bd04892c066546b4e21b53f3768ef060e7819
      https://github.com/zanata/zanata-server/commit/b35bd04892c066546b4e21b53f3768ef060e7819
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    R functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.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/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java

  Log Message:
  -----------
  Merge pull request #484 from zanata/optimize-copytrans

:+1: Verified


  Commit: 6e61a9d703fb8ec4a4c031df72c84b3b23d53a30
      https://github.com/zanata/zanata-server/commit/6e61a9d703fb8ec4a4c031df72c84b3b23d53a30
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Merge pull request #507 from zanata/async-task-manager

Hold active tasks in a map, but cache finished tasks briefly


  Commit: 6f128e57dffb2eaa374361b57047c824812b6c48
      https://github.com/zanata/zanata-server/commit/6f128e57dffb2eaa374361b57047c824812b6c48
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  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.4.2


  Commit: c64b08a14dd38a97affbe82cdc51ca66c61455b3
      https://github.com/zanata/zanata-server/commit/c64b08a14dd38a97affbe82cdc51ca66c61455b3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

  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: 24a432e3f49b5ed36b11dc74eb8949c5b3a6a88c
      https://github.com/zanata/zanata-server/commit/24a432e3f49b5ed36b11dc74eb8949c5b3a6a88c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-06-27 (Fri, 27 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    M zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Formatting changes and code review updates.

Correct some code formatting and tweak some of the security rules that although equivalent to the drools rule, were incorrect in terms of business logic.


  Commit: be252c9a11b740f0626b714b3608439c23690926
      https://github.com/zanata/zanata-server/commit/be252c9a11b740f0626b714b3608439c23690926
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Make sure csrf tokens match on client and server.


  Commit: 63406f6bb18f119685bb555c137e04ae14be847d
      https://github.com/zanata/zanata-server/commit/63406f6bb18f119685bb555c137e04ae14be847d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java

  Log Message:
  -----------
  Fix checkstyle violations.


  Commit: 5ce8d6cb2a20b3bc4fda0a093c20110997c6b6e4
      https://github.com/zanata/zanata-server/commit/5ce8d6cb2a20b3bc4fda0a093c20110997c6b6e4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java

  Log Message:
  -----------
  Refactor some exception handling and extract a method.


  Commit: 7370e162348d6d2da47a95b710427ea56b444c97
      https://github.com/zanata/zanata-server/commit/7370e162348d6d2da47a95b710427ea56b444c97
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/EnsureLogoutRule.java
    A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    R functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/graphics.svg
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/AccountMergeAction.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    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/DashboardAction.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.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/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.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/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/validator/NotDuplicateEmail.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethodResult.java
    R zanata-war/src/main/java/org/zanata/annotation/CachedMethods.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/i18n/Messages.java
    R zanata-war/src/main/java/org/zanata/seam/interceptor/CachedMethodResultInterceptor.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractAutocomplete.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/ActivityEntry.java
    M zanata-war/src/main/java/org/zanata/util/UrlUtil.java
    R zanata-war/src/main/java/org/zanata/util/ZanataMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/combo_box_arrow.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/admin_icon.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/actions/help.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/bug.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/error.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kdf.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/kllckety.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/locale.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_16x16/filesystems/file_doc.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/crystal_project/_48x48/apps/package_editors.png
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/favicon.ico
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/first_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/last_entry.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo-small.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/logo.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_entry.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/next_mode.png
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/fedora.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/google.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/openid.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/openid/yahoo.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_entry.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/prev_mode.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    R zanata-war/src/main/resources/images/z-logo-16px.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    R zanata-war/src/main/resources/images/z-logo-50px.png
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/messages_bg.properties
    R zanata-war/src/main/resources/messages_de.properties
    R zanata-war/src/main/resources/messages_en_GB.properties
    R zanata-war/src/main/resources/messages_fr.properties
    R zanata-war/src/main/resources/messages_gu.properties
    R zanata-war/src/main/resources/messages_it.properties
    R zanata-war/src/main/resources/messages_ja.properties
    R zanata-war/src/main/resources/messages_ko.properties
    R zanata-war/src/main/resources/messages_tr.properties
    R zanata-war/src/main/resources/messages_uk.properties
    R zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-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/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.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/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/breadcrumbs.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/footer.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_2x.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/template_nobanner.xhtml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/changepassword.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/login.xhtml
    M zanata-war/src/main/webapp/account/logout.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/account/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/rolemanager.xhtml
    M zanata-war/src/main/webapp/admin/roleruledetails.xhtml
    M zanata-war/src/main/webapp/admin/rolerules.xhtml
    M zanata-war/src/main/webapp/admin/search.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/main/webapp/error.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/contact_admin.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/help/view.xhtml
    M zanata-war/src/main/webapp/home.xhtml
    R zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/profile/create_user.xhtml
    R zanata-war/src/main/webapp/resources/images/spacer.gif
    R zanata-war/src/main/webapp/resources/richext/spacer.xhtml
    A zanata-war/src/test/java/org/zanata/database/CustomH2Dialect.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/integration/master' into sec-functions

Conflicts:
	zanata-war/src/test/java/org/zanata/arquillian/Deployments.java


  Commit: 3ba2ce8c2f617971e0a3a15b5b51ca4bba67966c
      https://github.com/zanata/zanata-server/commit/3ba2ce8c2f617971e0a3a15b5b51ca4bba67966c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-17 (Thu, 17 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java

  Log Message:
  -----------
  rhbz1113843 - Fix permission evaluation when dealing with multiple targets.


  Commit: ebcc32a9d6c2f6fead99a2c302506f70c904c9ca
      https://github.com/zanata/zanata-server/commit/ebcc32a9d6c2f6fead99a2c302506f70c904c9ca
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Merge pull request #527 from zanata/gwt-token-mismatch

Make sure csrf tokens match on client and server.


  Commit: 19bd165debf3e4849b141d7deb5b896d24ec7ac6
      https://github.com/zanata/zanata-server/commit/19bd165debf3e4849b141d7deb5b896d24ec7ac6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
	zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
	zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
	zanata-war/src/main/resources/messages_en_GB.properties
	zanata-war/src/main/resources/messages_ja.properties
	zanata-war/src/main/resources/messages_uk.properties
	zanata-war/src/main/resources/messages_zh_TW_Hant.properties
	zanata-war/src/main/webapp/WEB-INF/pages.xml
	zanata-war/src/main/webapp/admin/processmanager.xhtml


  Commit: 96aec51a495c81ecb7ee59a937c980f1d04a39d4
      https://github.com/zanata/zanata-server/commit/96aec51a495c81ecb7ee59a937c980f1d04a39d4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  rhbz1122373 Fix message format parameter


  Commit: 20a51e27a02df0a313b3fce39383a49aada0ee00
      https://github.com/zanata/zanata-server/commit/20a51e27a02df0a313b3fce39383a49aada0ee00
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #538 from zanata/rhbz1122373

rhbz1122373 Fix message format parameter


  Commit: dee14288ab106ab212af7865077a0f2ba3b42d36
      https://github.com/zanata/zanata-server/commit/dee14288ab106ab212af7865077a0f2ba3b42d36
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    A zanata-war/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/email/EmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    A zanata-war/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/activation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_validation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/password_reset.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/username_changed.vm
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A zanata-war/src/test/java/org/zanata/email/EmailBuilderITCase.java
    A zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    A zanata-war/src/test/java/org/zanata/email/EmailUtilTest.java

  Log Message:
  -----------
  Use Velocity to generate email

https://github.com/zanata/zanata-server/pull/534

Squashed commit of the following:

commit cd0fbee650b4e92b9ccd795a9410259e87d8d2ca
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Jul 22 14:14:35 2014 +1000

    Update unit test: HTML should appear after text

commit 58f956aa565815b47655213441f02df76a0070a9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:10:50 2014 +1000

    Add @AutoCreate to injected components

commit d035448add298583965b7bb2abf87f6d94147427
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 18:08:27 2014 +1000

    Construct Reply-To correctly

commit 8ee323c2b561b415b8898e5e8a04457adecb90db
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 18 17:58:24 2014 +1000

    Add HTML mail part after text; produce text version of the HTML body

commit bae62c5a5f417600bc2bd0718f34649caceb0762
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 17:13:36 2014 +1000

    Refactor email-handling code and fix injection of mailSession

    Eliminate redundant template "email_activation.vm".
    Rename EmailUtil -> Addresses and use it more.
    Rename EmailBuilderStrategy -> EmailStrategy.
    Move all EmailStrategy classes to top-level under org.zanata.email.
    Ensure that all emails go through EmailService and get FacesMessages
       from Msgs so that they can be localised.

commit 8365f539ea292770257821f2953785c268199365
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Jul 14 12:22:28 2014 +1000

    Make EmailBuilder into a component

commit 6f9ec47af5e5227fb3a68962ea97e34f54063b73
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Jul 11 12:46:36 2014 +1000

    Use Velocity to generate email


  Commit: e0afdde0dd9478f625c312600b793096e0408690
      https://github.com/zanata/zanata-server/commit/e0afdde0dd9478f625c312600b793096e0408690
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-07-24 (Thu, 24 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    A zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java

  Log Message:
  -----------
  Merge pull request #478 from zanata/sec-functions

:+1:


  Commit: 4a63db5fa579ebb171e39d82929e4a6d26fb349e
      https://github.com/zanata/zanata-server/commit/4a63db5fa579ebb171e39d82929e4a6d26fb349e
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java

  Log Message:
  -----------
  avoid stack overflow error when taking screenshot throws exception


  Commit: a40b37e2a667e337221fdf418f2ad9bc16db33dd
      https://github.com/zanata/zanata-server/commit/a40b37e2a667e337221fdf418f2ad9bc16db33dd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  fix: remove reference to drools rules security resolver after the security change


  Commit: 2e0439b7b61a54e2f87747dc746e647c301defd2
      https://github.com/zanata/zanata-server/commit/2e0439b7b61a54e2f87747dc746e647c301defd2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-29 (Tue, 29 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java

  Log Message:
  -----------
  Merge pull request #542 from zanata/stackoverflow

avoid stack overflow error when taking screenshot throws exception


  Commit: 5d9bc0ffdc4f6b4a777de6fc8701e7894741a05b
      https://github.com/zanata/zanata-server/commit/5d9bc0ffdc4f6b4a777de6fc8701e7894741a05b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/test-tmx.xml
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.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/glossary/view.xhtml

  Log Message:
  -----------
  Update glossary view: https://github.com/zanata/zanata-server/pull/537


  Commit: 05e31c2fbb21a5680694748ffa53b40e87187f8e
      https://github.com/zanata/zanata-server/commit/05e31c2fbb21a5680694748ffa53b40e87187f8e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/template/scripts.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/jquery.typing-0.2.0.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

  Log Message:
  -----------
  Usability Fixes: https://github.com/zanata/zanata-server/pull/522

Squashed commit of the following:

commit 4d93b1161d2f564ce425a085fd14ad1d0336308e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Jul 23 15:06:25 2014 +1000

    More usability fixes.

    - Make autocompletes only fire when there is a change to the search text (avoid ctrl keys), and after the user has stopped typing.
    - Search for maintainers is now case insensitive.
    - Add a loader when adding maintainers (currently only at the version group page).

commit bd243870f70725434cbe3f6c039a57d84d11450c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Jul 14 15:15:19 2014 +1000

    Revert change for version group page.

commit d4d584282f3ab5dd3fab12b98ba592dcd9014002
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 3 15:46:25 2014 +1000

    Refactor test to avoid random timing-related failures.

commit b048ff49f5184738aa91d442733d24f3398a3add
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 3 09:34:51 2014 +1000

    Make the requests from list filters have a short (500ms) delay before being sent to the server.

    This means less requests sent to the server.
    This generates some unnecessary warning messages on the logs. See the following for more details:
    https://issues.jboss.org/browse/RF-11737
    https://issues.jboss.org/browse/RF-11941

commit 48b6f98d697262c0dba50e87fb1a4f4d59bf34aa
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jul 1 16:51:40 2014 +1000

    Usability fixes.

    Includes changes to the autocomplete controller so that it shows ajax indicators as well as resetting to its initial state when it needs to.
    When Escape key is hit on the autocomplete, the result list is hidden and the whole text is selected.
    When searching for projects, the presence of spaces no longer omits results.
    Remove some default Seam messages that conflict with application defined messages.
    Version Group page changes:
    Refactor the page so that when adding or removing versions, languages and maintainers, there are ajax indicators for these operations.
    Make sure the loaded tab (according to the URL) is displayed before sending off the initial ajax requests.


  Commit: 87695aa7b0aaa7bd7b66a38d9dec329c6a42e849
      https://github.com/zanata/zanata-server/commit/87695aa7b0aaa7bd7b66a38d9dec329c6a42e849
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/testing/TestTransformer.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/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Squashed commit of the following:

commit 2352b6349e9d96c51b610db5758c9c6d0094f2dc
Author: Patrick Huang <pahuang at redhat.com>
Date:   Wed Jul 30 09:10:54 2014 +1000

    fix classloading issue

commit c1b0728b7310c6ffd24c1a0c75335b619405958d
Author: Patrick Huang <pahuang at redhat.com>
Date:   Tue Jul 29 11:21:44 2014 +1000

    rhbz1011310 - provide better error message when email service is down


  Commit: 0a7b0fbd0b4b5f1a607dccb86df3a037594d5df2
      https://github.com/zanata/zanata-server/commit/0a7b0fbd0b4b5f1a607dccb86df3a037594d5df2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-30 (Wed, 30 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java

  Log Message:
  -----------
  Merge pull request #543 from zanata/fix-security

fix: remove reference to drools rules security resolver after the security change


  Commit: 08f93c993b72c00ef6660f3e6c0a775a42c76252
      https://github.com/zanata/zanata-server/commit/08f93c993b72c00ef6660f3e6c0a775a42c76252
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  Prevent NullPointerException from account in SecurityFunctions


  Commit: 7da217e3b365ef954abbffb0aefb0712c4a0c642
      https://github.com/zanata/zanata-server/commit/7da217e3b365ef954abbffb0aefb0712c4a0c642
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java

  Log Message:
  -----------
  Merge pull request #546 from zanata/avoid-null-account

Avoid NullPointerExceptions for null accounts in SecurityFunctions


  Commit: 805ec4487af98f409efdb96015625d8bdc2a24e3
      https://github.com/zanata/zanata-server/commit/805ec4487af98f409efdb96015625d8bdc2a24e3
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  FAS-only authentication - https://github.com/zanata/zanata-server/pull/536

Squashed commit of the following:

commit 6b281d9240e9573174329459f6db15ff44a2e480
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 31 15:32:53 2014 +1000

    rhbz1120016 - Organize redirection directives for Open id.

    This was leaving an unused scenario which was causing a blank page.

commit 86d181b0e223a7f7930da94cbe2dab11934397bd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Jul 31 12:32:27 2014 +1000

    rhbz1120016 - Fix missing "Log In" button label.

commit e6333fe01b957ea03512f987d1497375c3dffbb7
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Wed Jul 30 15:07:55 2014 +1000

    Code Review fixes.

commit 110db4032685f9e59eb4759602e9e81b25b3eb57
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Jul 22 14:41:04 2014 +1000

    rhbz1120016 - Allow single OpenId authentication.

    Offer a configuration setup that allows for just a single open id provider to be configured.


  Commit: 0ae0075ef518fe68b966e459765f6ca929f94470
      https://github.com/zanata/zanata-server/commit/0ae0075ef518fe68b966e459765f6ca929f94470
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml


  Commit: 2428da76af9f7e12e8c7f8f625b3a95cea341851
      https://github.com/zanata/zanata-server/commit/2428da76af9f7e12e8c7f8f625b3a95cea341851
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-07-31 (Thu, 31 Jul 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/DelegatingDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DialogBoxCloseButton.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.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/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    A zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java

  Log Message:
  -----------
  Add gwtmockito; remove gwt-dev

Replace com.google.gwt.core.client.GWT with com.google.gwt.core.shared.GWT.
Introduce gwtmockito for tests which need to create ClickEvents:
   https://groups.google.com/d/msg/google-web-toolkit/H0Blv3C_fns/35PqYGlGvQ8J
Clean up enforcer exceptions.


  Commit: 0c68ef2dc1aed0bde659630fbdc43465b0bea256
      https://github.com/zanata/zanata-server/commit/0c68ef2dc1aed0bde659630fbdc43465b0bea256
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-01 (Fri, 01 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Configure maven-duplicate-finder-plugin; clean up some duplicate deps


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Add javamail exception for maven-duplicate-finder-plugin


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

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Remove banned dependency


  Commit: 2e4c78db1c9282fa2dcf8409edd4b91a055a3139
      https://github.com/zanata/zanata-server/commit/2e4c78db1c9282fa2dcf8409edd4b91a055a3139
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-04 (Mon, 04 Aug 2014)

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

  Log Message:
  -----------
  Remove banDuplicateClasses enforcer

Replaced by maven-duplicate-finder-plugin.  See
   https://github.com/zanata/zanata-parent/pull/28 and
   https://github.com/zanata/zanata-parent/commit/04a7b8d


  Commit: d82b11133812eae3ed1dc7eda454e8bb2472be93
      https://github.com/zanata/zanata-server/commit/d82b11133812eae3ed1dc7eda454e8bb2472be93
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

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

  Log Message:
  -----------
  Reduce duplicate code in ServerConfigurationBean

commit 30b60c4a7f2e1b77556680270c5e3974f760244a
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 5 11:14:21 2014 +1000

    Ensure excess accessors are not generated for ServerConfigurationBean

commit 21d10c5eb96337770cadfd73c60115209241413f
Author: David Mason <drdmason at gmail.com>
Date:   Tue Aug 5 09:34:13 2014 +1000

    Refactor to remove code duplication from ServerConfigurationBean.


  Commit: faa1f5a6bbea138c875a88d4cbc4af08d6ae3c44
      https://github.com/zanata/zanata-server/commit/faa1f5a6bbea138c875a88d4cbc4af08d6ae3c44
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  create project REST service will fail on adding maintainer

- we flush early and that causes an update when adding the user as maintainer, which then failed on update permission check because he is not yet a maintainer


  Commit: 444bb3bdc7106b10fad8fc404af77a4a4b4ce049
      https://github.com/zanata/zanata-server/commit/444bb3bdc7106b10fad8fc404af77a4a4b4ce049
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java

  Log Message:
  -----------
  fix test after change


  Commit: 9f2fad20a18abb52f2b0ebc6061213b0da66f2a4
      https://github.com/zanata/zanata-server/commit/9f2fad20a18abb52f2b0ebc6061213b0da66f2a4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/resources/test-tmx.xml
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/AbstractProfileAction.java
    A zanata-war/src/main/java/org/zanata/action/ApplicationConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/AuthenticationEvents.java
    M zanata-war/src/main/java/org/zanata/action/GlossaryAction.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/java/org/zanata/action/NewProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
    M zanata-war/src/main/java/org/zanata/action/RegisterAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    M zanata-war/src/main/java/org/zanata/action/UserAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    A zanata-war/src/main/java/org/zanata/email/ActivationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/Addresses.java
    A zanata-war/src/main/java/org/zanata/email/ContactAdminEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/ContactLanguageCoordinatorEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    A zanata-war/src/main/java/org/zanata/email/EmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/EmailUtil.java
    A zanata-war/src/main/java/org/zanata/email/EmailValidationEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/PasswordResetEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/RequestToJoinVersionGroupEmailStrategy.java
    A zanata-war/src/main/java/org/zanata/email/UsernameChangedEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/seam/mail/ZanataMailSession.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    M zanata-war/src/main/java/org/zanata/security/OpenIdLoginModule.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    A zanata-war/src/main/java/org/zanata/security/permission/Action.java
    A zanata-war/src/main/java/org/zanata/security/permission/CustomPermissionResolver.java
    A zanata-war/src/main/java/org/zanata/security/permission/GrantsPermission.java
    A zanata-war/src/main/java/org/zanata/security/permission/MultiTargetList.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionEvaluator.java
    A zanata-war/src/main/java/org/zanata/security/permission/PermissionGranter.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/DelegatingDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirrorReadOnlyWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DialogBoxCloseButton.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DiffColorLegendPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/HistoryEntryComparisonPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationDetailsBox.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/NotificationItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReferencePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchResultsDocumentTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.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/TooltipPopupPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransMemoryMergePopupPanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationWarningPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ChangeReferenceLangView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/NotificationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SearchResultsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/org/zanata/email/templates/activation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_admin.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_coordinator.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_group.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/email_validation.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/password_reset.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/template_email.vm
    A zanata-war/src/main/resources/org/zanata/email/templates/username_changed.vm
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    R zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/username_changed.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    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/scripts.xhtml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    A zanata-war/src/main/webapp/resources/script/jquery.typing-0.2.0.min.js
    M zanata-war/src/main/webapp/resources/zanata/autocomplete.xhtml
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    A zanata-war/src/test/java/com/google/gwt/core/client/GWTBridge.java
    A zanata-war/src/test/java/org/ForceLoadClass.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/arquillian/Deployments.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    A zanata-war/src/test/java/org/zanata/email/EmailBuilderITCase.java
    A zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    A zanata-war/src/test/java/org/zanata/email/EmailUtilTest.java
    M zanata-war/src/test/java/org/zanata/rest/compat/ProjectCompatibilityITCase.java
    A zanata-war/src/test/java/org/zanata/security/permission/PermissionEvaluatorTest.java
    M zanata-war/src/test/java/org/zanata/testing/TestTransformer.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SourceContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.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/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into ui-update

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java


Compare: https://github.com/zanata/zanata-server/compare/6b4be012f3fc...9f2fad20a18a


More information about the zanata-commits mailing list