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

GitHub noreply at github.com
Tue Sep 2 04:28:56 UTC 2014


  Branch: refs/heads/gwt260
  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: 64af89c5dbbbf88f12b62604578c5239af67fa0e
      https://github.com/zanata/zanata-server/commit/64af89c5dbbbf88f12b62604578c5239af67fa0e
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-04 (Fri, 04 Jul 2014)

  Changed paths:
    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/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Slightly change the wording on the signup/login pages, add tests


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.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
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java

  Log Message:
  -----------
  Add new and cleanup existing Admin tests

- Covert to assertj
- Clean up existing tests
- Make edit homepage test work
- Add new tests
- Add Feature annotations
- Move chunky repeated text to the test file generator


  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: c3e2cb663e76b3141d30f925f581e0fb13591a11
      https://github.com/zanata/zanata-server/commit/c3e2cb663e76b3141d30f925f581e0fb13591a11
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-08 (Tue, 08 Jul 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  use angular.js to generate feature inventory


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  fix tests after change


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

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

  Log Message:
  -----------
  rbhz1116688 - clear HRoleAssignmentRule table after test


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java

  Log Message:
  -----------
  add copyright and remove setter/getter


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  Merge pull request #529 from zanata/feature-inventory

Fix test after PR #517


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java

  Log Message:
  -----------
  Remove dependency on Collections.emptyEnumeration() from Java 1.7


  Commit: 850c5691e00d98f39121d18901d42a72e9332c49
      https://github.com/zanata/zanata-server/commit/850c5691e00d98f39121d18901d42a72e9332c49
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-10 (Thu, 10 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/feature-inventory/app.js
    M functional-test/src/test/resources/feature-inventory/controllers.js
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  fix issue in feature detail controller


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java

  Log Message:
  -----------
  Merge pull request #532 from zanata/java16enum

Remove dependency on Collections.emptyEnumeration() from Java 1.7


  Commit: 71bb98f784271c8716495952ef58d27e33cbe523
      https://github.com/zanata/zanata-server/commit/71bb98f784271c8716495952ef58d27e33cbe523
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-07-11 (Fri, 11 Jul 2014)

  Changed paths:
    M functional-test/src/test/resources/feature-inventory/app.js
    M functional-test/src/test/resources/feature-inventory/controllers.js
    M functional-test/src/test/resources/feature-inventory/partials/detail.html
    M functional-test/src/test/resources/feature-inventory/partials/list.html

  Log Message:
  -----------
  Merge pull request #533 from zanata/feature-inventory

fix issue in feature detail controller


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

  Changed paths:
    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/test/java/org/zanata/feature/account/RegisterTest.java
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  Merge pull request #524 from zanata/add-some-register-tests

Slightly change the wording on the signup/login pages, add tests


  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: 013b2ae90c87c42cc67766f26d8ce3610b2a8070
      https://github.com/zanata/zanata-server/commit/013b2ae90c87c42cc67766f26d8ce3610b2a8070
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-18 (Fri, 18 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    A functional-test/src/test/resources/test-tmx.xml

  Log Message:
  -----------
  Move tmx test text chunk to file

Also clean up some review comments


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.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
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/resources/test-tmx.xml

  Log Message:
  -----------
  Merge pull request #526 from zanata/assertj-admin-tests

Add new and cleanup existing Admin tests


  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: e65e55b0c8068f4713656c14c672bff4ce5f1ea5
      https://github.com/zanata/zanata-server/commit/e65e55b0c8068f4713656c14c672bff4ce5f1ea5
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-07-28 (Mon, 28 Jul 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Rhbz973509 Indicate periods are acceptable for ids


  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: 5f97d5e0e713dd510effcfd9c3eb83f96e07fd87
      https://github.com/zanata/zanata-server/commit/5f97d5e0e713dd510effcfd9c3eb83f96e07fd87
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-05 (Tue, 05 Aug 2014)

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

  Log Message:
  -----------
  Fix cancel copy translations mouseover hint


  Commit: b9ee41633e587c3bd85626fac70cb40f5e1c68d2
      https://github.com/zanata/zanata-server/commit/b9ee41633e587c3bd85626fac70cb40f5e1c68d2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-06 (Wed, 06 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Rhbz995904 Remove ellipsis on TM Origin when not necessary

Only add ellipsis on TM origins substring when length is
greater than 10 characters.


  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: 7c0ddda64cad7acc1097bf5f4d7854d3e51afd73
      https://github.com/zanata/zanata-server/commit/7c0ddda64cad7acc1097bf5f4d7854d3e51afd73
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update H2 version used for tests.


  Commit: 13992d6cd797d75c3fc4e5d976e86014ba78f5fc
      https://github.com/zanata/zanata-server/commit/13992d6cd797d75c3fc4e5d976e86014ba78f5fc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  rhbz1110627 - add REST endpoint for project config


  Commit: cc86275f06b6130ba6d3c5cf7c50ce961ee9947a
      https://github.com/zanata/zanata-server/commit/cc86275f06b6130ba6d3c5cf7c50ce961ee9947a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

  Log Message:
  -----------
  Fix problem with repeatability of tests - https://github.com/zanata/zanata-server/pull/552

Upgrade H2 database version.
Indicate which tests simulate a session context.


  Commit: 174e7f80061a69249b2d1abe03018560804374c1
      https://github.com/zanata/zanata-server/commit/174e7f80061a69249b2d1abe03018560804374c1
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-07 (Thu, 07 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/AutowireContexts.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java

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


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

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  Merge pull request #520 from zanata/rhbz1110627-zanata-init

rhbz1110627 - add REST endpoint for project config


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M 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/MultiFileUploadTest.java
    M 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/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 zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.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
    A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
    A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/README.md
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.min.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/README.md
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.xdr-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-process.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-ui.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload-validate.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.fileupload.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/jquery.iframe-transport.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/main.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/vendor/jquery.ui.widget.js
    A zanata-war/src/main/webapp/resources/zanata/multi-file-upload.xhtml
    M zanata-war/src/test/java/org/zanata/file/DocumentUploadUtilTest.java

  Log Message:
  -----------
  Merge branch multi-file-upload.

Adds multi-file upload dialog to version -> settings -> documents
tab allowing multiple files to be uploaded in a single operation.

Maximum files per upload can be configured in
administration -> server config.

Squashed commit of the following:

commit 607ca73925f7bd3b3bf1540f83c3de383d2c5acf
Author: David Mason <drdmason at gmail.com>
Date:   Fri Aug 8 14:08:33 2014 +1000

    fix grammar and broken link output in multi-file upload

commit 3c1013d432f01e12155d880f614130a606739890
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 17:51:18 2014 +1000

    use canonical supported file types for project types

commit 23ee9cb16f957f47e5a9c3a066670824a04a896e
Merge: a6bb99c 9be4de8
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 17:49:59 2014 +1000

    Merge branch 'master' into multi-file-upload

commit a6bb99c385abde9d36cb4e85a17210f7e1904596
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 13:54:20 2014 +1000

    use proper formatting for multi-file-upload.xhtml

commit 9f098868d79a60ad344cb961cd72f319559a4dab
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 13:20:14 2014 +1000

    remove unused parts of jQuery File Upload library

commit d339f86ef38a168bf77b6535f54b5f0bcc43fbf9
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:59:35 2014 +1000

    remove unused parts of JavaScript Templates library

commit 51870f54df53bc51ab89f08191b947324a914f23
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:55:14 2014 +1000

    remove excess jquery import

commit dadbcabe2e066d4688dbe9df2238df23adccdb92
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:40:01 2014 +1000

    remove unused file

commit b4718fe362da0396cc9de88d314771c6e9c2d286
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:38:58 2014 +1000

    use Slf4j for logging in MultiFileUploadServlet

commit d79e64419e08f07e088f5fe48c32d38e954b3bd3
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:36:53 2014 +1000

    use DocumentType constant to compare types

commit 413f33307f5a8a361dab854e3c22d44d9509d197
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:28:30 2014 +1000

    Use static LocaleId field for en-US

commit 3d6ee66dc4dea788cb22d4ee84ce400a0b2f5c4c
Author: David Mason <drdmason at gmail.com>
Date:   Thu Aug 7 12:23:36 2014 +1000

    indicate where inline templates are processed

commit a7c6f67393820fd760de96c1ff619c4233a8863f
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 6 14:29:36 2014 +1000

    add server config option for max files per upload

commit 1bc23580933ac4105701bee1ff45b03f1c84d487
Merge: ed23803 d82b111
Author: David Mason <drdmason at gmail.com>
Date:   Wed Aug 6 12:35:58 2014 +1000

    Merge branch 'master' into multi-file-upload

commit ed23803361c13d28c3294673c5609768c1f90b6b
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 4 11:59:49 2014 +1000

    prevent invalid upload file extensions being seen as valid

commit fa8d238c76e6539f82849bb0921566e179b3cb7f
Author: David Mason <drdmason at gmail.com>
Date:   Mon Aug 4 07:59:14 2014 +1000

    Use translatable strings for multi-file upload script.

    Strings are included in the DOM of the multi-file upload widget so they
    can be translated through the same mechanism as the other UI strings in
    JSF. The script looks up the list of strings in the DOM and populates
    the messages object.

commit c0773c82d75392e7fc94d38bf3574ae5dfbdaf05
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Aug 1 15:22:33 2014 +1000

    Fix document upload functional tests

commit 152acc670a67f9044e8af7883c670471a3fdd670
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 17:13:21 2014 +1000

    use translatable strings for multi-file-upload template

commit 99d41d6b3918cb476210ba9ee05c73f24df24df9
Merge: 276bc67 7da217e
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 15:30:12 2014 +1000

    Merge branch 'master' into merge-multi-file-upload

commit 276bc67ef484dc06df96444bcd8ad372abbf6823
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 14:07:28 2014 +1000

    WIP: using localizable messages in multi file upload

commit 1306648616408eb1b65499ebf6e44076e571f170
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 31 11:07:21 2014 +1000

    fix compile errors caused by merge conflict resolution

commit 861de99121a5515eb7521722c76c7083e696f2cc
Merge: 0e66e8f 708a3a9
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 30 17:21:12 2014 +1000

    Merge branch 'multi-file-upload-tests' into merge-multi-file-upload

    Conflicts:
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    	functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
   Resolved all using --ours option (keeping version from master).
  Intend to manually apply necessary changes in these files in a subsequent commit,
  rather than risk overwriting the newer code.

commit 0e66e8fba241ab2d8b4a8b67ebeeecef3d82f325
Merge: 05e31c2 8b2bd46
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 30 16:42:19 2014 +1000

    Merge branch 'multi-file-upload' into merge-multi-file-upload

    Conflicts:
    	zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    had conflict where multi-file-upload element was added, same location
    had "messages" changed to "msgs". Kept chunk from multi-file-upload
    but changed "messages" in that chunk to "msgs".

commit 708a3a910d5beb56c3a35f396819eb46f93073b2
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Jun 27 13:51:19 2014 +1000

    Multiple file upload test

commit 8b2bd4615be9fd6782313e764ee0c1a6df52da09
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 28 12:23:45 2014 +1000

    Use format strings for UI text

    All strings for display are wrapped in i18n function.
    At the moment this only replaces placeholders since I have not provided
    a way to make translated strings available. The simplest approach I can
    think of to make translated strings available would be to output them as
    text in hidden DOM elements of the component, since that would allow
    translations to be handled through the existing page translation workflow.

commit 7370f5335025d8f5c5f19f4823a7d20bbe61a8aa
Author: Damian Jansen <djansen at redhat.com>
Date:   Fri Jun 27 00:24:10 2014 +1000

    Fix testing of uploading files

    Also remove a number of unnecessary steps in the upload tests.

commit a65b0d2418b1fb2438ce3f7913bfc4ad1e43f818
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 25 11:39:02 2014 +1000

    SQUASH some cleanup

commit dd25056f29a1f8bf4de39d3eda5c124ce9392d60
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 24 17:00:29 2014 +1000

    Needs Cleanup: WIP different upload stages being recorded, not used for count display yet

commit e8e054739036b4b75690f1764842cff80a7da998
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 15:23:10 2014 +1000

    make custom file parameters collapsed by default for multi-file upload

commit 7b38ddc62c9537cbe81cef4b1466ab35986ccc06
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 14:34:45 2014 +1000

    Add help for custom document parameters field in multi-file upload

commit db43a80276cf8a17188a1572179ed6cd5648611d
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 23 10:54:42 2014 +1000

    hide advanced settings when multi-file-upload starts

commit f629abc459bcf194575727e06e224a5929e631c8
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 22 17:33:55 2014 +1000

    update error message for users with multiple concurrent uploads

commit b11d4fda15f3e3f8e82746bd753ea1444463e2db
Author: David Mason <drdmason at gmail.com>
Date:   Tue Jul 22 17:31:43 2014 +1000

    Ensure multi-file-upload dialog always responds to finished uploads

commit 78d45e844976d09405bc16ac62ac7d3a37695353
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 12:37:38 2014 +1000

    Use change in filename emphasis to indicate which files have uploaded.

    This replaces the green circle icon that was indicating upload completion
    previously.

commit caf560632fb7b4e445518bfdb8091c832a27fa77
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 12:35:59 2014 +1000

    Ensure loader reserves space in multi-file upload dialog.

    This will prevent layout changes for long filenames during upload,
    but only when the .is-reserve-space css class is implemented in the
    assets.

commit 4980b1ed86f949da72c79d1edc5c978873c06672
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 11:41:43 2014 +1000

    Ensure uploading file items display with consistent height.

    During multi-file upload, file items were changing size slightly
    when they finished uploading, due to the loader widget changing the
    height. This is a workaround until the loader widget is updated to
    work better in inline mode - it just adds a hidden loader to the
    uploaded template to force it to the same height.

commit cddd1bd3665b36063e3e4fe13175af22d41e6359
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 14 11:40:04 2014 +1000

    Warn user when closing page during multiple file upload

    This adds a modal dialog when a user is currently uploading source
    files and they attempt to close or navigate away from the page.

commit e39be2a7148219c70ee298e4ef4eedddfcf18674
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 19:32:21 2014 +1000

    Add confirmation to all operations that cancel an upload.

    Makes sure the event 'hide.zanata.modal' is triggered in all cases that
    close the modal, then add the check to that event.
    Also incidentally fixed some cases in which the modal could be closed
    without refreshing the document list by attaching an event on
    'hide.zanata.modal' to refresh the statistics.

commit b7e6606cc5c1d14cae574936561057cdf98f9cce
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 14:09:56 2014 +1000

    Prevent file upload progress bar incrementing before files are uploaded.

    This is just a workaround that delays the increment until the next
    progress event, which seems sufficient without a complete overhaul
    of the progress system (which seems to have something really wrong with it).

commit 27e7359daebeafe33d986f563922a8dac150eb45
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 14:09:44 2014 +1000

    clean up leftover comment

commit 5004bd4302106063812f4905760d9212ac2075e0
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jul 11 13:01:31 2014 +1000

    User throbber instead of progress bar for uploading files.

    Individual file items in multi-file upload dialog show a throbber
    when they are uploading. The overall progress for all the files
    still uses a progress bar.

commit 92d587a812b740caf4ebff5182555ab15e63e889
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 14:08:26 2014 +1000

    ensure file count indicator resets when multi file upload form resets

commit edf2f3d926b52340b63862a5f7ad3669fda9416a
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 13:43:01 2014 +1000

    clear errors when retrying upload of multiple files

commit 43822c0525936fcfb77e516627d0c057797ce73d
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jul 10 13:42:29 2014 +1000

    Clean up fileupload ui code

commit 2613787fb772f3a7e889b8cb5a413cf83c594f4f
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jul 7 16:02:56 2014 +1000

    SPLIT: check logged in and not already uploading before initiating upload
   Upload button now changes to "Try Again" if user is not logged in or has an upload
  going in another tab/window/computer.
   Still needs to display errors upon failure, and the code is messy,
  but it works so I'm making a commit in case I break it.

    Squashed commits:

    SQUASH clean up code for GET on MultiFileUploadServlet

    SQUASH clean up code for POST on MultiFileUploadServlet

    Display appropriate error when transaction times out for uploaded file persistence.

    Show appropriate error when concurrent uploads reach the database.

    log id properly for a user who is already uploading

    change error text for timed-out file upload

    SQUASH update error message in MultiFileUploadServlet

commit df239c4a5eab567ee628242895b0cb4a249ffe8e
Author: David Mason <drdmason at gmail.com>
Date:   Wed Jul 2 11:42:09 2014 +1000

    Prevent opening of file select dialog when clicking outside the intended click target.

    The dialog was opening when clicking anywhere in a region to the right of and below
    the "browse files" text that is the intended click target. This change limits the
    target to just the "browse files" text.
    Wrapping of the "browse files" text is prevented since the transparent file upload
    button must overlay all of the text for the dialog to open properly (plus it looks
    better with the whole link on the next line than split across lines).

commit 5a0828a74a36fbe0d10dd75cc9f450bf4b0d138b
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 18:17:47 2014 +1000

    Limit file uploads to 100 files at a time.
   This adds a hard-coded limit of 100 files, with the intention to replace the limit with a
  configurable value.

commit 3231d731793aa727285d6cfb97f89104219e975a
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 15:40:16 2014 +1000

    Remove cancel button from files while upload is in progress.

commit bb694a125d56113f992c9f8d421b9c2e2ecb1a4f
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 12:58:27 2014 +1000

    Prevent advanced settings being retained after closing upload dialog.
   Prevents both file path and custom upload parameters from remaining
  when the multi-file-upload dialog is closed and re-opened.

commit 0f977a13487cd668bb1af1c0de2e82af921e4e58
Author: David Mason <drdmason at gmail.com>
Date:   Fri Jun 27 12:16:47 2014 +1000

    Make 'browse files' link vertically centred.

commit 749ad6ed977e7d3cc0b5382b356f74e3f2deda91
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 12:46:53 2014 +1000

    Update file upload test to work with new component.

commit 4779e62d61ca6d372504424c3e59518bfe989795
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 11:20:00 2014 +1000

    Remove org.json as a used dependency for maven-dependency-plugin

commit 5be8be5b6b1e7e96ec0f738eb729639568613bc5
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 10:34:21 2014 +1000

    Remove source language selector from multi file upload dialog.

      Source language is ignored by the server at the moment, so there is
      no value in having a user select it.

commit f306a8c056d184b4a933fe1a52ccbaab327ea600
Author: David Mason <drdmason at gmail.com>
Date:   Mon Jun 23 10:26:27 2014 +1000

    Use multi-file upload component on settings tab.

commit a1e784e47b3beb4ee34bb56a5e5cdd08fd64afe4
Merge: 308bfc3 abab959
Author: David Mason <drdmason at gmail.com>
Date:   Thu Jun 19 13:01:26 2014 +1000

    Merge branch 'master' into multi-file-upload

    Conflicts:
    	zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
   A servlet mapping is added at the same position on each branch.
  Merge keeps both mappings.

commit 308bfc35bd905ad6820c01b0d75580405c70bf9e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Tue May 20 09:55:02 2014 +1000

    WIP: getting json libraries working properly

commit 361cc8c962dcddff13dcd2174a10ac55d2ed19ad
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu May 1 10:54:14 2014 +1000

    show intelligible error when uploading multiple files after session timeout

commit aad070027301c34ea19f87fd21ccfb841590d68f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu May 1 10:52:13 2014 +1000

    improve inline file upload error style

commit a2cec76491d9b3623cd09157c7d80532bff80683
Author: David Mason <dr.d.mason at gmail.com>
Date:   Wed Apr 30 15:55:57 2014 +1000

    show uploaded documents when multi-file-upload dialog is closed

commit dbad9ba98cc655a0fd5cad8ca0d06cdc7362acf7
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Apr 3 08:42:28 2014 +1000

    SQUASH add style classes to multi file upload widget

commit 93ca7569adf4e0d18d6c4738a5fee0e099ee14b4
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Apr 3 08:42:00 2014 +1000

    SQUASH hide files panel when no files are shown

commit 7f34125fe2bffbbd5ab0d8f2c4ecf4637ecf07c3
Author: David Mason <dr.d.mason at gmail.com>
Date:   Wed Apr 2 09:56:08 2014 +1000

    show and hide portions of the form when upload is not supported

commit e757dee5f3538efc60eb8a96285b8215514ee334
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 31 13:58:49 2014 +1000

    ensure that .pot extensions are handled properly in uploaded source files.

commit 0e62035fb75f2a9338bc2fb155d33dd5d0af1716
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 11:53:02 2014 +1000

    add 'accepted' attribute to multi-file-upload widget

commit 60986fef16d811122d4dd13fc8617b45509c2958
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 11:46:07 2014 +1000

    limit individual file size to 200MB

commit 3abb78bcc52f6575c73277d09015add0a3aaa775
Author: David Mason <dr.d.mason at gmail.com>
Date:   Fri Mar 28 15:29:17 2014 +1000

    Various display behaviour tweaks to file upload dialog.
   - when there is an error adding a file, just show an error and do not add it
  - show number of queued and uploading files
  - change drop zone style when files are dragged over it
  - reset dialog when it is reopened
  - close dialog when any of the cancel buttons are pressed
  - disable adding more files when upload has started

commit 7b6ca7cf07328abd348f07eb1186eed61b6614bd
Author: David Mason <dr.d.mason at gmail.com>
Date:   Thu Mar 20 14:24:37 2014 +1000

    prepend modal dialogs to body to prevent automatic cloning

commit 40cbd4704472265498a6f19c41e130264d4e350f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 17 09:44:12 2014 +1000

    limit uploads to accepted file types

commit 816627108433efd44ce4bfe8c27934bea9ece856
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:11:56 2014 +1000

    create multi file upload widget

commit 19d99e4efcdbf3cdef5ad1c29ac7d6b5bee0deb8
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 21:36:38 2014 +1000

    strip CDATA from template strings

commit d8bcac50beef58b29dd2e6e0e640e2f559c3933e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 21:43:15 2014 +1000

    modify main script for fileupload to work with multi-file-upload widget

commit 9a25e0bcad4546ccf38d3aa78ebb30391d4bb86e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 23:38:44 2014 +1000

    add javascript templates library

commit 5c1271daec3aae626f40013eb319f2e8916d520e
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:10:35 2014 +1000

    add jquery file upload library

commit e9fc692195fd9b6ad0d00ee1291e8bf3e4f360ae
Author: David Mason <dr.d.mason at gmail.com>
Date:   Sun Mar 16 19:06:53 2014 +1000

    add upload servlet for multiple files

commit 083ce607eca235845bf95cc1259be28426b5454f
Author: David Mason <dr.d.mason at gmail.com>
Date:   Mon Mar 17 18:15:40 2014 +1000

    Add method to allow uploads without provided hash


  Commit: 42e9f0e6a9ddc4a613b1a47655a39919f6c80734
      https://github.com/zanata/zanata-server/commit/42e9f0e6a9ddc4a613b1a47655a39919f6c80734
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java

  Log Message:
  -----------
  Merge pull request #540 from zanata/rhbz995904

Rhbz995904 Remove ellipsis on TM Origin when not necessary


  Commit: 70ec903869c7842e19be81708b98fbdd8ea1cb7d
      https://github.com/zanata/zanata-server/commit/70ec903869c7842e19be81708b98fbdd8ea1cb7d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-11 (Mon, 11 Aug 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Merge pull request #541 from zanata/periods-are-valid-id

Rhbz973509 Indicate periods are acceptable for ids


  Commit: e9f6e66c67672bfea885a203df08c20919bb3e81
      https://github.com/zanata/zanata-server/commit/e9f6e66c67672bfea885a203df08c20919bb3e81
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    A zanata-model/src/main/java/org/zanata/util/JPACopier.java
    A zanata-model/src/test/java/org/zanata/util/JPACopierTest.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/seam/scope/ConversationScopeMessages.java
    A zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/MockHandlerFactory.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/org/zanata/test/model/CopyVersionData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml

  Log Message:
  -----------
  Copy version feature: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
Squashed commit of the following:

commit caf208c41090e261c0a4c73042c77511d51a4a0c
Merge: 55e8dd8 70ec903
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 12 07:53:09 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 55e8dd8748384aacbafbfb7ee6bde7cade1a00a2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 15:51:50 2014 +1000

    reduce number of batches for document

commit 805c23a8c9d21ed97dac0fbe2c28671c451d4752
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 15:47:32 2014 +1000

    Change order of rerender after copy version cancel

commit 171d0485b723c6c8db91c1148ce9385711e868f2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 13:17:01 2014 +1000

    clear versionHome bean after cancel copy version

commit 8b3e50d8465f2a00ad4b2f4d68bd3260276d16c2
Merge: e05ef92 5b76932
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 10:57:13 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

    Conflicts:
    	zanata-war/src/main/java/org/zanata/action/VersionHome.java

commit e05ef9230162c6c37ecf6904d5dc3e01663b8296
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 11 10:34:18 2014 +1000

    Implement confirmation message when cancel version copy

commit 01b9df829c6102b825bd6a5c768c2db71338f626
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 12:38:52 2014 +1000

    Fix version status while copying

commit 4a853b74a5948460d940e48ffc6b418b1da9766e
Merge: 3992f1b 9be4de8
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 07:25:22 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 3992f1bc77aa095f33d2eda760111077451cc6c1
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 8 07:24:49 2014 +1000

    Fix returned percentage for progressBar

commit 80de2ea2ddbac97222e8e0e65fa9ecd6f27e5a2d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 14:43:51 2014 +1000

    Implement copy version option from version page, fix url rewrite for copy version

commit 0e301de917342a226c2fc39c8e8c4e4ed6224bfb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 08:16:52 2014 +1000

    Fix version status in version page after copy

commit b78fda237235f523ea7cc31fb72fbc1a1900da53
Merge: 21a2817 444bb3b
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 7 08:07:34 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 21a2817429922f163e25d714c9d6f61aba618fc7
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Aug 6 13:00:40 2014 +1000

    Fix copy version cancel button

commit 0ade0d101e858f4a2d3abbc4f03e90aaef742328
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 15:35:15 2014 +1000

    WIP: fixing onComplete and onCancel for copy version

commit c0b49a9661f83454fb91bf9f2cdb853a9c4b04c6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 12:49:45 2014 +1000

    Fix cancel copy version button

commit 3fb30fdd60bb469543bceeb702175d1bfd09a9b6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 12:10:13 2014 +1000

    Fix version status after cancel copy

commit b44c14a699c91230f9be9c49acf2c6d93fa23ac9
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 5 10:36:19 2014 +1000

    Fix copy target history

commit 372da045d9efffeaa079a1c53f43e2fc0e543147
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 4 15:26:05 2014 +1000

    fix invalid slug when copy version, progressBar check on optional method onComplete

commit 07511aa57e11dc90ca9efca18545be6b822118c3
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 4 13:03:53 2014 +1000

    Disable copy from obsolete version

commit 6b74db58bc25728e2a67939238179534cabdb948
Merge: 36a3125 0a7b0fb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 31 10:44:03 2014 +1000

    Merge branch 'integration/master' into rhbz1104015

commit 36a31254212291671806f3454291d6411fd5b578
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Jul 31 09:47:46 2014 +1000

    Add comments, refactor test

commit 0522a6f7aa4eb1991a7d089d130d3254fd466907
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Jul 30 15:27:40 2014 +1000

    Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015
    Squashed commit of the following:

    commit ca25839b932ee9ee962099c47b8582f2a6731b41
    Merge: 30a2fbe 87695aa
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 15:24:37 2014 +1000
   Merge branch 'integration/master' into rhbz1104015
   Conflicts:
  	zanata-war/src/main/resources/messages.properties

    commit 30a2fbe19100e7fa3aaf5469b5a658924cef3e6a
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 15:12:35 2014 +1000
   Refactor JPACopier

    commit 53e441459ae9c6239acc10f18950d80dd062e2ad
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 30 08:53:54 2014 +1000
   WIP: fixing test

    commit 639efdc86068bd4695c8d729a0cefd83783981de
    Merge: dfc12f3 2e0439b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 15:44:25 2014 +1000
   Merge branch 'integration/master' into rhbz1104015

    commit dfc12f33c67f525ac44360301443f71b06eb67ff
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 15:11:44 2014 +1000
   WIP: refactoring copy bean implementation

    commit e85c7c19b1182f3a7afc77ea82c8f634f8197c60
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 29 08:29:55 2014 +1000
   Refactor return type

    commit 509e7f98bd52c72fd9895db5a93e0c24ea290992
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 28 09:24:36 2014 +1000
   Fix test

    commit 885727c0839ffdf1084c5a118c2b51b7acd4fc73
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 28 07:41:57 2014 +1000
   Refactor beanUtil

    commit 028336ae8ec9544f1a6cce9368a70f9da5c85345
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 23 15:05:56 2014 +1000
   Update comments, refactor copy of Collection type in beanUtils

    commit aa3ea50dccd445940f60079ee1294b55e83324f4
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 23 10:03:40 2014 +1000
   Update powermock version used in zanata-model

    commit 8ada818fed2b180f8941910716faf25c83d5e3f6
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 22 12:42:54 2014 +1000
   Fix plural copy, move Copy annotation to getter method

    commit 5dcfd0ec06179b7bef9476901fe760623f2c2c39
    Merge: f9710b4 4f02f0a
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 21 10:40:09 2014 +1000
   Merge branch 'integration/master' into rhbz1104015

    commit f9710b467f211052fd30a06ac62d2fed420a7e51
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Jul 21 09:42:31 2014 +1000
   Add unit test for beanUtils

    commit ea5d7804da100b5b9f590c15eb9908fd2ebb4613
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jul 18 10:30:30 2014 +1000
   Implement annotation Copy for cloning property

    commit be178d518dbc29ca9e08e6cf5932d02bfd1e3a34
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 17 15:08:54 2014 +1000
   WIP: copy version refactoring

    commit 6e07eed21a1acbac8c77c85a479bf6bb41def14f
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 17 10:16:58 2014 +1000
   WIP: Copy annotation

    commit 0d80531f850d387449913014c09563e3f93c6480
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Jul 11 15:05:09 2014 +1000
   Implement copy version progress in version-tab

    commit 80d8404f632a622367dcd25b85e4debbe6b4f8b5
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Jul 10 15:24:31 2014 +1000
   WIP: show copy progress in project page

    commit d43624b57e92f30af4098dd26639a00e48f99bdf
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Jul 9 15:16:02 2014 +1000
   add batch process unit test

    commit 6a2f3fa47370c4532d0d7a3101a6e8d530445d7f
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 8 15:20:49 2014 +1000
   Round to 4 decimal for progress bar complete

    commit b029e3c20418b02abab3dca3d899a88336bfe4d6
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Jul 8 15:10:06 2014 +1000
   Implement copy version: http://bugzilla.redhat.com/show_bug.cgi?id=1104015


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  Update deps to satisfy requireUpperBoundDeps enforcer


  Commit: 3493acba87a0a0039921a7f2fc75f76679829279
      https://github.com/zanata/zanata-server/commit/3493acba87a0a0039921a7f2fc75f76679829279
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-12 (Tue, 12 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  Ensure that RESTEasy is packaged with war, for WildFly compatibility


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

  Changed paths:
    M pom.xml
    R zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
    R zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/mysql.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml

  Log Message:
  -----------
  Update JavaMelody; clean up old dialect code


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

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Upgrade JavaMelody again


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

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

  Log Message:
  -----------
  Downgrade gwtmockito since we can't use GWT 2.6.0 yet

Also upgrade GWT from 2.5.0 to 2.5.1


  Commit: 42f576af91ac32b7b7a724ff1cd85eafcb61ef97
      https://github.com/zanata/zanata-server/commit/42f576af91ac32b7b7a724ff1cd85eafcb61ef97
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension

  Log Message:
  -----------
  Add DummyAuthenticationMechanism to replace SPNEGO on WildFly


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

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Add comments to persistence.xml


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

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

  Log Message:
  -----------
  Update jboss-deployment-structure.xml to be compatible with WildFly 8.1 and EAP 6


  Commit: 7c386a51ff8c8175b7c7e588d371fc046b311e41
      https://github.com/zanata/zanata-server/commit/7c386a51ff8c8175b7c7e588d371fc046b311e41
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java

  Log Message:
  -----------
  Remove invalid use of @NonEmpty on a setter


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

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M pom.xml
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Fix war overlay in functional-test

- added a new module to create the overlay (with only needed code and libraries)
- functional test will no longer build war overlay but just executing tests


  Commit: 35fda355b3c25b28d3272f50b0ea8f24c789466e
      https://github.com/zanata/zanata-server/commit/35fda355b3c25b28d3272f50b0ea8f24c789466e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M zanata-war/src/main/resources/ehcache.xml

  Log Message:
  -----------
  Change versionStatisticCache to be eternal with overflow to disk: https://bugzilla.redhat.com/show_bug.cgi?id=1099736


  Commit: 50129c76ba7496a40bf47e586381d5d844b833b0
      https://github.com/zanata/zanata-server/commit/50129c76ba7496a40bf47e586381d5d844b833b0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M zanata-war/src/main/resources/ehcache.xml

  Log Message:
  -----------
  add path for ehcache file


  Commit: 481717409c7c4213a246e9065a9d5f945796a6e1
      https://github.com/zanata/zanata-server/commit/481717409c7c4213a246e9065a9d5f945796a6e1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-15 (Fri, 15 Aug 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M pom.xml
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java

  Log Message:
  -----------
  Merge pull request #556 from zanata/fix-war-overlay

Fix war overlay in functional-test


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

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  fix after overlay rename


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

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

  Log Message:
  -----------
  fix home and help content config to be consistent with other config


  Commit: 07991437e304eb2c16bfd1e355d0e60f3d0e9fcf
      https://github.com/zanata/zanata-server/commit/07991437e304eb2c16bfd1e355d0e60f3d0e9fcf
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-08-18 (Mon, 18 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #559 from zanata/fix-home-content-config

Prevent access failure when editing home content or help content.


  Commit: 6ab883aaa9d154ee7b5cfb92c8a20ce0d82a47a7
      https://github.com/zanata/zanata-server/commit/6ab883aaa9d154ee7b5cfb92c8a20ce0d82a47a7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-19 (Tue, 19 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml

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


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

  Changed paths:
    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

  Log Message:
  -----------
  Change url in group project tab to version link
https://bugzilla.redhat.com/show_bug.cgi?id=1128954

Squashed commit of the following:

commit 3ee9c622edbd4fc9b9ce0126d16c3983c48c6044
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 14 15:04:44 2014 +1000

    Change url in group project tab to version link

commit a9a0735189cf2b95d3d01c26dc15d83aa07e7265
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Aug 14 13:40:27 2014 +1000

    Make link a selected locale url in group page:
    https://bugzilla.redhat.com/show_bug.cgi?id=1128954


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

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/resources/zanata/checkbox.xhtml

  Log Message:
  -----------
      Fix create version page: https://bugzilla.redhat.com/show_bug.cgi?id=1129906


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

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.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/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.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/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextAreaWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.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/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.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/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.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/TargetContentsView.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/TransMemoryDetailsDisplay.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/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorTranslatorsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java

  Log Message:
  -----------
  Update editor UI: https://bugzilla.redhat.com/show_bug.cgi?id=1131300

Squashed commit of the following:

commit 55c10fbbdda280868ce2d7456c49e3d1751bc86c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Aug 19 09:19:16 2014 +1000

    Update on tm and glossary view

commit e220205fa503b82ea70f3fd363efc0f8c7a6db98
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 13:55:05 2014 +1000

    Refactor and make selection section more obvious

commit c78ee8bdc08f0508408db05a3d697f80cc028124
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 10:48:37 2014 +1000

    Re-enable unit test

commit 9d2aaee41ff7651be190edabfeb41de163c33b69
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 10:15:19 2014 +1000

    fix unit test

commit 974f4f5326feeebe56a4f5dbaec302f0f716735d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 09:58:29 2014 +1000

    Update GWT editor


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

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  rhbz1110627 - add REST endpoint for project config


  Commit: 1d2e03616f413e9ee67e8213815ee79174a4e271
      https://github.com/zanata/zanata-server/commit/1d2e03616f413e9ee67e8213815ee79174a4e271
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java

  Log Message:
  -----------
  Merge pull request #563 from zanata/backport-zanata-init

rhbz1110627 - add REST endpoint for project config


  Commit: e6fe2347e2a3c81dcb2fdc849ef991637fa5c300
      https://github.com/zanata/zanata-server/commit/e6fe2347e2a3c81dcb2fdc849ef991637fa5c300
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-08-26 (Tue, 26 Aug 2014)

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

  Log Message:
  -----------
  Merge pull request #551 from zanata/fix-cancel-copytrans-mouseover

Fix cancel copy translations mouseover hint


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

  Log Message:
  -----------
  ehcache implementation for HDocument/Locale cache
https://bugzilla.redhat.com/show_bug.cgi?id=1130797

Squashed commit of the following:

commit 2c53e772c2beda3bbe7ec91822154858c0411720
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 13:57:45 2014 +1000

    Rename parameter, reinstate author of class

commit 460fad116c5b7d2a73648563501266f529a8d57b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Aug 18 12:47:07 2014 +1000

    Rename cache class

commit 4e757aa363ef7e01aab03c695a708522a5653bbe
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 15 13:10:16 2014 +1000

    fix unit test

commit b7167b1baff44d6c14bc42d2db27bd68f9504109
Merge: 3d769ed 50129c7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 15 12:17:03 2014 +1000

    Merge branch 'release' into doc-statistic-cache

commit 3d769ed8b41380aec8f76e8b9457284d3e15f79e
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 15 10:43:36 2014 +1000

    Document statistic cache

commit f5e1c104ca64428499e6f84593d7c298f4ee4383
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Aug 15 07:40:40 2014 +1000

    WIP: implement document statistic cache

commit c2f12de3ebb1757c95d68e43fca6b4cb6b8ff220
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 22 15:00:02 2014 +1000

    add path for ehcache file

commit 67d0ba52e8670c6f054b5d4c297d66fd50ecd3c0
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 22 14:07:43 2014 +1000

    Change versionStatisticCache to be eternal with overflow to disk: https://bugzilla.redhat.com/show_bug.cgi?id=1099736


  Commit: 40bafe99432e4dec0987feea2ca4a8fb876056e0
      https://github.com/zanata/zanata-server/commit/40bafe99432e4dec0987feea2ca4a8fb876056e0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-27 (Wed, 27 Aug 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    M zanata-war/src/main/resources/ehcache.xml
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationStateCacheImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
	zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java


  Commit: 76f37a2ad89183b16ea2e750fc4e5ce1ff80355e
      https://github.com/zanata/zanata-server/commit/76f37a2ad89183b16ea2e750fc4e5ce1ff80355e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml

  Log Message:
  -----------
  Fix document access from version page, documents' tab.

Corrects an issue on this specific page: when clicking on a file with a path on it, the languages' list does not get updated with the available languages.


  Commit: 10103e1910a900833da90105f4ed9d5a18c51540
      https://github.com/zanata/zanata-server/commit/10103e1910a900833da90105f4ed9d5a18c51540
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-08-28 (Thu, 28 Aug 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml

  Log Message:
  -----------
  Merge pull request #565 from zanata/doclist

Fix document access from version page, documents' tab.


  Commit: 9f08d866ecfbeef0be5dd280a0831ff4bae24cf5
      https://github.com/zanata/zanata-server/commit/9f08d866ecfbeef0be5dd280a0831ff4bae24cf5
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

  Changed paths:
    M pom.xml
    A zanata-war/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.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/language/language.xhtml
    A zanata-war/src/main/webapp/resources/script/jquery-2.0.3-min.js
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  JSF performance improvements - https://github.com/zanata/zanata-server/pull/566

Squashed commit of the following:

commit 2e1df8385401f8cadb47d5c89096c5c8ad2fc0a4
Author: Carlos Munoz <chavo16 at hotmail.com>
Date:   Fri Aug 29 15:45:10 2014 +1000

    Manually import jquery in case richfaces doesn’t.

    This will not generate an extra request for the jquery resource, since it’s using outputScript, JSF is aware that it has already imported it.

commit 79e7aca7704052203ce08bba45a86839631f70f8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Aug 28 17:12:34 2014 +1000

    JSF performance improvements

    - Enabled resource optimization which allows richfaces to compress and unify several of its javascript and css resources into a single request. This mode can be disabled by setting the project stage to ‘Development’ (see web.xml).
    - Switch several internally served javascript resources to use the JSF resource filter to allow for caching.
    - Replace Richfaces’ provided JSF jquery with a higher versioned one. This script is now back in the war file.
    - Remove unnecessary inclusions of the richfaces provided jquery library.
    - Reorganize some javascript resources to the bottom of the page per best practices.
    - Upgrade Richfaces libraries.


  Commit: 95bbfadab08255cd2900bffaa982de588dfae055
      https://github.com/zanata/zanata-server/commit/95bbfadab08255cd2900bffaa982de588dfae055
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-08-29 (Fri, 29 Aug 2014)

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

  Log Message:
  -----------
  Prevent update missing docStatus cache


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

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

  Log Message:
  -----------
  Merge commit '95bbfad' into integration/master


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java

  Log Message:
  -----------
  Allow changes in whitespace


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

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java

  Log Message:
  -----------
  Merge pull request #570 from zanata/fix-email-test

Allow changes in whitespace


  Commit: 711b0bd82d4e78b3b4e2a9e63c2ec1a080e9ddc0
      https://github.com/zanata/zanata-server/commit/711b0bd82d4e78b3b4e2a9e63c2ec1a080e9ddc0
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

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

  Log Message:
  -----------
  New startup banner (italics).

Pull request: https://github.com/zanata/zanata-server/pull/568


  Commit: 1632f7ffe4127b7ba70bc7ab4558993256b8d9ba
      https://github.com/zanata/zanata-server/commit/1632f7ffe4127b7ba70bc7ab4558993256b8d9ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

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

  Log Message:
  -----------
  Fix multi-line handling


  Commit: 712e7c46ee7cca8ae8cffe204208230409268dea
      https://github.com/zanata/zanata-server/commit/712e7c46ee7cca8ae8cffe204208230409268dea
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Fix editor and project tests

Editor buttons changed
Upload forces only supported types
Single field on first version created
Also, there is a version languages setting behaviour that needs to
be reviewed. Ignored for now.


  Commit: a24819035e0343a6bf489d63f44cb2d1a8bab572
      https://github.com/zanata/zanata-server/commit/a24819035e0343a6bf489d63f44cb2d1a8bab572
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-01 (Mon, 01 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.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/projectversion/EditVersionLanguagesTest.java

  Log Message:
  -----------
  Merge pull request #572 from zanata/fix-editor-and-project-tests

Fix editor and project tests


  Commit: e17d5f670740142c5c5bd84996c71fc904e3ceab
      https://github.com/zanata/zanata-server/commit/e17d5f670740142c5c5bd84996c71fc904e3ceab
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 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/ContactAdminTest.java

  Log Message:
  -----------
  Use rest caller in upload tests, fix breakages

There were a few errors regarding project and version creation.
Using the ZanataRestCaller removes these and reduces test runtime
by roughly 10 seconds where a project and version needs to be
created.
Also make the contact admin test less strict.


  Commit: 163d1b78f10c6c6c269f3a8b87326111cc5ea1d8
      https://github.com/zanata/zanata-server/commit/163d1b78f10c6c6c269f3a8b87326111cc5ea1d8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/document/MultiFileUploadTest.java
    M 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/ContactAdminTest.java

  Log Message:
  -----------
  Merge pull request #573 from zanata/use-restcaller-in-uploadtest

Use rest caller in upload tests, fix breakages


  Commit: b2c8adb7a81bd459c1de38cac6259f96fc90c465
      https://github.com/zanata/zanata-server/commit/b2c8adb7a81bd459c1de38cac6259f96fc90c465
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-02 (Tue, 02 Sep 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/WebDriverFactory.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/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditRoleAssignmentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    A functional-test/src/main/java/org/zanata/page/administration/RoleAssignmentsPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    R functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/TestEventForScreenshotListener.java
    M functional-test/src/main/java/org/zanata/util/TestFileGenerator.java
    M functional-test/src/main/java/org/zanata/workflow/ProjectWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AutoRoleAssignmentTest.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
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M 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/MultiFileUploadTest.java
    M 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/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/glossary/InvalidGlossaryPushTest.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/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    A functional-test/src/test/java/org/zanata/util/FeatureEntry.java
    M functional-test/src/test/java/org/zanata/util/FeatureInventoryRecorder.java
    R functional-test/src/test/java/org/zanata/util/FeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/FunctionalTestHelper.java
    R functional-test/src/test/java/org/zanata/util/HTMLFeatureReporter.java
    M functional-test/src/test/java/org/zanata/util/HasEmailRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/feature-inventory/app.js
    A functional-test/src/test/resources/feature-inventory/controllers.js
    A functional-test/src/test/resources/feature-inventory/filter.js
    A functional-test/src/test/resources/feature-inventory/index.html
    A functional-test/src/test/resources/feature-inventory/partials/detail.html
    A functional-test/src/test/resources/feature-inventory/partials/list.html
    A functional-test/src/test/resources/test-tmx.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HPerson.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HSimpleComment.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/po/HPotEntryData.java
    M zanata-model/src/main/java/org/zanata/model/validator/Slug.java
    A zanata-model/src/main/java/org/zanata/util/JPACopier.java
    R zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
    A zanata-model/src/test/java/org/zanata/util/JPACopierTest.java
    A zanata-test-war/pom.xml
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResource.java
    A zanata-test-war/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    A zanata-test-war/src/main/java/org/zanata/util/SampleProjectProfile.java
    M zanata-war/pom.xml
    M zanata-war/src/etc/mysql.properties
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/ZanataInit.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/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/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/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.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/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    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/async/tasks/CopyVersionTask.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    A zanata-war/src/main/java/org/zanata/config/JaasConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    A zanata-war/src/main/java/org/zanata/dao/RawDocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    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/DocumentUploadUtil.java
    M zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    M zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UserFileUploadTracker.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.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/seam/scope/ConversationScopeMessages.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
    A zanata-war/src/main/java/org/zanata/security/DummyAuthenticationMechanism.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
    A zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyDocumentWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowTargetWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTextFlowWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/EmailServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/servlet/MultiFileUploadServlet.java
    A zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    M zanata-war/src/main/java/org/zanata/ui/ProgressBar.java
    A zanata-war/src/main/java/org/zanata/util/EmptyEnumeration.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorTranslators.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/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.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/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DownloadFilesConfirmationBox.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/Editor.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorSearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/RevertTransUnitUpdateLink.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchField.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TextAreaWrapper.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.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/TooltipPopupPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslatorListWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.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/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/KeyShortcutView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/OptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SideMenuView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/SourceContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.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/TargetContentsView.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/TransMemoryDetailsDisplay.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/TransMemoryDetailsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.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/client/view/TransUnitsTableView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitsTableView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    A zanata-war/src/main/resources/META-INF/richfaces/static-resource-mappings.properties
    A zanata-war/src/main/resources/META-INF/services/io.undertow.servlet.ServletExtension
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/ehcache.xml
    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
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-deployment-structure.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.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/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-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/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/WEB-INF/template/template.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/README.md
    A zanata-war/src/main/webapp/resources/JavaScript-Templates/2_5_3/js/tmpl.min.js
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/README.md
    A zanata-war/src/main/webapp/resources/jQuery-File-Upload/9_5_6/js/cors/jquery.xdr-transport.js

  Log Message:
  -----------
  Merge remote branch 'origin/master' into gwt260

Conflicts:
	pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
	zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
	zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java


Compare: https://github.com/zanata/zanata-server/compare/9a841a9d94b0...b2c8adb7a81b


More information about the zanata-commits mailing list