[zanata/zanata-server] 2f8549: Cache downloaded wildfly modules to ~/Downloads

Tue Feb 24 06:02:03 UTC 2015

  Branch: refs/heads/reduce-boms
  Home:   https://github.com/zanata/zanata-server
  Commit: 2f8549ec2c7365f9911b97a11370251a5e81a93f
      https://github.com/zanata/zanata-server/commit/2f8549ec2c7365f9911b97a11370251a5e81a93f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-11 (Wed, 11 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Cache downloaded wildfly modules to ~/Downloads

  Commit: 062565c69a67bdfba201613c3a47a41a012a0edf
      https://github.com/zanata/zanata-server/commit/062565c69a67bdfba201613c3a47a41a012a0edf
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.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
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-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/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement override plural forms:
https://bugzilla.redhat.com/show_bug.cgi?id=1184708

Squashed commit of the following:

commit 863b2bb5727cd993cbb9982e0a2267c285b40369
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 14:39:25 2015 +1000

    Implement override plural forms: https://bugzilla.redhat.com/show_bug.cgi?id=1184708

commit f147b27487715611901dc45aa45417fc31712919
Merge: d42e58f f374e74
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 6 11:10:57 2015 +1000

    Merge branch 'integration/master' into rhbz1184708

commit d42e58ff84ac3e5b24531c274f58c8694a71125d
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 5 09:53:45 2015 +1000

    Implement override plural forms:
    https://bugzilla.redhat.com/show_bug.cgi?id=1184708

  Commit: c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
      https://github.com/zanata/zanata-server/commit/c695cdb8a1f0c92ee83cc0f67dfddcb691982f8c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-12 (Thu, 12 Feb 2015)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml

  Log Message:
  -----------
  Update inactive account, password reset page. Remove captcha from password reset page.
https://bugzilla.redhat.com/show_bug.cgi?id=1191321

Squashed commit of the following:

commit 94837356020e34784e0ed8e67b89daa3709a5aa1
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 10 16:08:18 2015 +1000

    Update inactive account, password reset page. Remove captcha from password reset page.

    https://bugzilla.redhat.com/show_bug.cgi?id=1191321

  Commit: 51fd4b3e3c756b831026f9e01682edebd9fd40b1
      https://github.com/zanata/zanata-server/commit/51fd4b3e3c756b831026f9e01682edebd9fd40b1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml

  Log Message:
  -----------
  disable rendering in filter list if empty string
https://bugzilla.redhat.com/show_bug.cgi?id=1190557

Squashed commit of the following:

commit a1c6547965cacd3f1cac600524486f007d689e7e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 11 13:43:00 2015 +1000

    disable rendering in filter list if empty string: https://bugzilla.redhat.com/show_bug.cgi?id=1190557

  Commit: a828049979c44bab4d0415ac8784afacf35f04b7
      https://github.com/zanata/zanata-server/commit/a828049979c44bab4d0415ac8784afacf35f04b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java

  Log Message:
  -----------
  Fix inactive account redirection with openid account

https://bugzilla.redhat.com/show_bug.cgi?id=1191827

Squashed commit of the following:

commit 0ddec629799a6bacc9c24c67d545a841dcd2e0ff
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 12:20:07 2015 +1000

    Fix inactive account redirection with openid account

  Commit: e099e57f0a0887010a0b85cdfc39d87098e31127
      https://github.com/zanata/zanata-server/commit/e099e57f0a0887010a0b85cdfc39d87098e31127
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-13 (Fri, 13 Feb 2015)

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

  Log Message:
  -----------
  Warn if EAP version < 6.3.3

  Commit: 542f564e9e099b225f4be17c3b7bbb3888af234e
      https://github.com/zanata/zanata-server/commit/542f564e9e099b225f4be17c3b7bbb3888af234e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Fix bookmarked url not working
https://bugzilla.redhat.com/show_bug.cgi?id=1193699

Squashed commit of the following:

commit d7bd79450d4006581782019a05791441744269b0
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Feb 18 08:32:37 2015 +1000

    Fix bookmarked url not working - https://bugzilla.redhat.com/show_bug.cgi?id=1193699

  Commit: c32305a3d01e90a05be88909e4d7e45cbbc7119b
      https://github.com/zanata/zanata-server/commit/c32305a3d01e90a05be88909e4d7e45cbbc7119b
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

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

  Commit: 4a2019594da3cb16180ddf59a8a304137000028d
      https://github.com/zanata/zanata-server/commit/4a2019594da3cb16180ddf59a8a304137000028d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Clear document statistic cache when uploading from client
https://bugzilla.redhat.com/show_bug.cgi?id=1192271

Squashed commit of the following:

commit f0c7fe931e77074103371e59cdea0c8806650ddb
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Feb 16 16:22:13 2015 +1000

    clear document statistic cache when uploading from client: https://bugzilla.redhat.com/show_bug.cgi?id=1192271

  Commit: 17c6646608c6920fab8964b22e3ce654617f79b7
      https://github.com/zanata/zanata-server/commit/17c6646608c6920fab8964b22e3ce654617f79b7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-18 (Wed, 18 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

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

  Commit: 81054b713c3d9b1e1962915188c8d40c6513c0b5
      https://github.com/zanata/zanata-server/commit/81054b713c3d9b1e1962915188c8d40c6513c0b5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

  Log Message:
  -----------
  Implement customise language display name
https://bugzilla.redhat.com/show_bug.cgi?id=1169662

Squashed commit of the following:

commit 8a72ed3dfddee2a89cabe62a02df1cfd4f8862bb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 19:24:09 2015 +1000

    Implement customise language display name
    https://bugzilla.redhat.com/show_bug.cgi?id=1169662

  Commit: b319ce824c4fd49ce86b2814f17977b2bb16eae8
      https://github.com/zanata/zanata-server/commit/b319ce824c4fd49ce86b2814f17977b2bb16eae8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.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/account/inactive_account.xhtml
    M zanata-war/src/main/webapp/account/password_reset.xhtml
    M zanata-war/src/main/webapp/account/password_reset_request.xhtml

  Log Message:
  -----------
  Fix global messages in password reset page
https://bugzilla.redhat.com/show_bug.cgi?id=1191779

Squashed commit of the following:

commit 5aa8e22358bb84498dc566faeb43635d5bdf3212
Merge: 9be6611 a828049
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 17 14:54:32 2015 +1000

    Merge branch 'integration/master' into rhbz1191779

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

commit 9be6611801a09407879af1b8bf8eed2b466814d4
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Feb 12 13:59:17 2015 +1000

    Fix global messages in password reset page: https://bugzilla.redhat.com/show_bug.cgi?id=1191779

  Commit: b07873274d76165b9cd4d4358d1c27a0d87fc842
      https://github.com/zanata/zanata-server/commit/b07873274d76165b9cd4d4358d1c27a0d87fc842
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

  Log Message:
  -----------
  Fix generate api issue
https://bugzilla.redhat.com/show_bug.cgi?id=119359

Squashed commit of the following:

commit 1835b479069daf30dc68f8eb1085e9bce1a39be7
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Feb 20 10:39:10 2015 +1000

    Fix generate api issue: https://bugzilla.redhat.com/show_bug.cgi?id=1193597

  Commit: d22d4432651da7bad8139ee736edaa7f045fb2d2
      https://github.com/zanata/zanata-server/commit/d22d4432651da7bad8139ee736edaa7f045fb2d2
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-20 (Fri, 20 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml

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

  Commit: a3e7763531fe17385d562d6a5ec3a066b5917748
      https://github.com/zanata/zanata-server/commit/a3e7763531fe17385d562d6a5ec3a066b5917748
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-23 (Mon, 23 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Update expected error message

  Commit: 79fbac57284db84fa4caa6fd8b83da3145766afa
      https://github.com/zanata/zanata-server/commit/79fbac57284db84fa4caa6fd8b83da3145766afa
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Merge pull request #699 from zanata/fix-broken-password-tests

Fix validation messages for password reset

  Commit: 59a0b5f347cb8bb52531fb9ecc909221e81cecd8
      https://github.com/zanata/zanata-server/commit/59a0b5f347cb8bb52531fb9ecc909221e81cecd8
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  pom.xml: zanata-api version to 3.6.0

  Commit: 79dff1996867f15ca58365c311a5770096b02ba7
      https://github.com/zanata/zanata-server/commit/79dff1996867f15ca58365c311a5770096b02ba7
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Fix security functional test error

  Commit: 848ec39ca8bdeb81b587d8563e1e52a683e0bba2
      https://github.com/zanata/zanata-server/commit/848ec39ca8bdeb81b587d8563e1e52a683e0bba2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

  Log Message:
  -----------
  Merge pull request #701 from zanata/fix-invalidresetpassword-test

Fix security functional test error

  Commit: 8deed904a4d9e7a99b89c9d2656b9c024d4500f0
      https://github.com/zanata/zanata-server/commit/8deed904a4d9e7a99b89c9d2656b9c024d4500f0
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update parent version

  Commit: 3b0d55a8d4113479be77d0e9c667e9c4ef017066
      https://github.com/zanata/zanata-server/commit/3b0d55a8d4113479be77d0e9c667e9c4ef017066
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java

  Log Message:
  -----------
  Fix password reset with null pointer exception

Squashed commit of the following:

commit 4d6467768326f236379b302a80567bc5f93de6dc
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Feb 24 10:38:19 2015 +1000

    Fix password reset with null pointer exception

  Commit: f57207b299ec138bee32388da8da5197d657f7fd
      https://github.com/zanata/zanata-server/commit/f57207b299ec138bee32388da8da5197d657f7fd
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Revert "pom.xml: zanata-api version to 3.6.0"

This reverts commit 59a0b5f347cb8bb52531fb9ecc909221e81cecd8.

  Commit: e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
      https://github.com/zanata/zanata-server/commit/e7f33a20ba63c1f88e9ef0b2775a65c9b6d00d67
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix pom.xml

  Commit: b95cca564b085bb7d5ec99a725bbdbbbd008f49f
      https://github.com/zanata/zanata-server/commit/b95cca564b085bb7d5ec99a725bbdbbbd008f49f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'release' into cache-downloads

  Commit: b23fc52284e9bf7db48975bc535ff850e4b903b6
      https://github.com/zanata/zanata-server/commit/b23fc52284e9bf7db48975bc535ff850e4b903b6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

  Log Message:
  -----------
  Merge pull request #693 from zanata/eap633

Warn if EAP version < 6.3.3

  Commit: 8dc5e95a27b63ede8b0da707e26a10fe1b90d873
      https://github.com/zanata/zanata-server/commit/8dc5e95a27b63ede8b0da707e26a10fe1b90d873
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Merge pull request #686 from zanata/cache-downloads

Cache downloaded wildfly modules to ~/Downloads

  Commit: 009a0ddec84ebfea66fe9b494eaed84f96029310
      https://github.com/zanata/zanata-server/commit/009a0ddec84ebfea66fe9b494eaed84f96029310
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

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

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

Conflicts:
	pom.xml

  Commit: 646e568d8b4a99b22da47ff4801b4f46870b03ac
      https://github.com/zanata/zanata-server/commit/646e568d8b4a99b22da47ff4801b4f46870b03ac
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-02-24 (Tue, 24 Feb 2015)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    R functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/workflow/LanguageWorkFlow.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
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageManagerAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageSearchAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguagesAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
    M zanata-war/src/main/java/org/zanata/action/PasswordResetRequestAction.java
    M zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/dao/AccountActivationKeyDAO.java
    M zanata-war/src/main/java/org/zanata/dao/AccountResetPasswordKeyDAO.java
    M zanata-war/src/main/java/org/zanata/events/DocumentStatisticUpdatedEvent.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/security/ZanataOpenId.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationUpdatedManager.java
    M zanata-war/src/main/java/org/zanata/service/impl/UserAccountServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/AbstractStatistic.java
    M zanata-war/src/main/java/org/zanata/ui/model/statistic/WordStatistic.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.7.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coodinator_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_list.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/language/language_view.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/members-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/new_language_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/language/settings-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/zip_download_progress_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/activate.xhtml
    M zanata-war/src/main/webapp/account/inactive_account.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/validate_email.xhtml
    M zanata-war/src/main/webapp/admin/home.xhtml
    R zanata-war/src/main/webapp/admin/language.xhtml
    R zanata-war/src/main/webapp/admin/languagemanager.xhtml
    M zanata-war/src/main/webapp/iteration/view.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/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/DocumentServiceImplTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/master' into reduce-boms

Conflicts:
	functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java

Compare: https://github.com/zanata/zanata-server/compare/61e28424edc2...646e568d8b4a