[zanata/zanata-server] 046227: Separate wildfly client version from server versio...

GitHub noreply at github.com
Mon Apr 27 02:23:35 UTC 2015 

  Branch: refs/heads/jersey-boys
  Home:   https://github.com/zanata/zanata-server
  Commit: 0462274451010f89f129f87cb6c725655acbcd6f
      https://github.com/zanata/zanata-server/commit/0462274451010f89f129f87cb6c725655acbcd6f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-16 (Thu, 16 Apr 2015)

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

  Log Message:
  -----------
  Separate wildfly client version from server version


  Commit: 6ae447ec30f4ed65dd62e991e4b36682822719b7
      https://github.com/zanata/zanata-server/commit/6ae447ec30f4ed65dd62e991e4b36682822719b7
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-21 (Tue, 21 Apr 2015)

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

  Log Message:
  -----------
  Update to EAP 6.4


  Commit: a9cd6cf0df2d8e7079afaba43389dd1666631d35
      https://github.com/zanata/zanata-server/commit/a9cd6cf0df2d8e7079afaba43389dd1666631d35
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

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

  Log Message:
  -----------
  Enable errors for connection leaks during tests


  Commit: 0d0b865ad57dc171f80537274b4f8a120099a2ea
      https://github.com/zanata/zanata-server/commit/0d0b865ad57dc171f80537274b4f8a120099a2ea
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml

  Log Message:
  -----------
  Enable connection leak detection and prevention


  Commit: d23eb531216b73a9397f2a3b3282d0b1ceebae5f
      https://github.com/zanata/zanata-server/commit/d23eb531216b73a9397f2a3b3282d0b1ceebae5f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #780 from zanata/eap64

Update to EAP 6.4


  Commit: 70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
      https://github.com/zanata/zanata-server/commit/70e53a4fdd93ad39914b27b6a58fcb668ffff7d9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

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

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

Conflicts:
	functional-test/pom.xml


  Commit: f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
      https://github.com/zanata/zanata-server/commit/f4267c26d0de00aa9019b42f7c97bd48d2f5b52d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-22 (Wed, 22 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    R zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    A zanata-war/src/main/java/org/zanata/adapter/PropertiesAdapter.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    R zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.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/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M 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
    A zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_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/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    R zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java

  Log Message:
  -----------
  Update request to join group/language page

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

Squashed commit of the following:

commit 79184b7cbf4189a8cae9311c7bbbc15ef5178eab
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 22 09:37:22 2015 +1000

    Disable contact coordinator button is empty message

commit 276e1ba5a250ef13bb9b4930e12ef3c93d9039ab
Merge: d177563 3448525
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:43:39 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit d177563e8718b17cd672c522264eede92b14c8d0
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 20:43:18 2015 +1000

    Add 'No versions' indicator for request join group, fix checkbox for request join language, fix contact coordinator 'Send' button

commit 76951a6934fa4535be4872a1780d504317f337aa
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 21 15:35:41 2015 +1000

    Add release notes

commit c28e17f602eb1b30cbf3cbbd622cf3f91dae1581
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 13 16:23:35 2015 +1000

    Refactor sendEmailAction

commit 6beb3d8fde8206cdda9481fd8d6bca93ea2595fe
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 16:45:38 2015 +1000

    Fix button disabled when non-selected in version group request

commit 512768810e6c42aea2f396ec8416434b867f6151
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 10:12:56 2015 +1000

    Use absolute path reference in JSF

commit 2a82c12fd7e58673b3c0c4c83dba9c33cd841020
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 10:09:12 2015 +1000

    Revert messages properties

commit 2d600e01471f767556263323f648389b70ffb118
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 09:29:07 2015 +1000

    Remove unused method

commit 84d86fa4face258c64ef11f0de8779bd625dd13f
Merge: 7395b78 307b890
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 7 08:46:54 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit 7395b78fa11358bfa30aebdf108a05cb5ff99195
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 15:26:16 2015 +1000

    Fix functional test

commit be9c2247076094ad9e8e708943d7221dbc7f3bbb
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 08:57:35 2015 +1000

    Refactor, add comments in version-group join method

commit 5b3f90934591ddc56cf711c1b130aad370ece743
Merge: bbe42df e033111
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 2 08:08:00 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit bbe42dfc7c144605d95bfa18d320f75457678d0e
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 15:07:43 2015 +1000

    fix checkstyle

commit 65eeb018051446ebfd2654b971719f3452042a50
Merge: f76ad23 4b1baa5
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 1 12:48:51 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

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

commit f76ad237e491af0b3a5906ea1bbf10bdd1fada17
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 14:47:30 2015 +1000

    remove old request_join for version group

commit 3b47b6f9d307d7d5598f5876a216e23e9823f74e
Merge: 447ec2b e9d0b2c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 31 10:44:58 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit 447ec2b6cb3235ba18e6be23e8385e44aacf2cd9
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 13:43:34 2015 +1000

    WIP: Get checkbox rerender send buttons

commit 24cd0af46d1cfafae92a4de2b4e38c8a98e5b6c1
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 13:01:57 2015 +1000

    Rename selectableProject to selectableVersion

commit ccee996ab97c09b497c5c52fe3c1b2f17010b28b
Merge: b155f2e 9fd2486
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Mar 26 10:17:47 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit b155f2e22d8a8afc1da4442ff5fb126799588ae6
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 16:07:31 2015 +1000

    Initial build for version group request

commit a99814cf806cd6682635a267b8a5f5dc18cf4b85
Merge: dad7852 bacdfcd
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 13:39:53 2015 +1000

    Merge branch 'integration/master' into update-join-language-page

commit dad7852e37e4664353e867760b1f12c454595ea1
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 13:27:53 2015 +1000

    WIP: converting join group to model

commit c489b57919e9c5c95d08d7a3dd7baca07685f4de
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Mar 18 09:59:43 2015 +1000

    Implement modal dialog for request to join language page

commit 9b7048807e21641e9921109393a42b53eaa7b371
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 15:44:31 2015 +1000

    Clear selected roles when cancel

commit a9d3eac95abcf2b37e55ee0350f5a5475ad1bb6f
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 13:14:23 2015 +1000

    Create request join and update role dialog

commit 1719dfbf5f8c1485822eeb59174d9d8596e43f3e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 09:00:33 2015 +1000

    Refactor contact admin and coordinator dialog

commit 139982095d4f1aa12ed1913debd2fc0f2e894645
Merge: 32679e4 649a824
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 17 06:52:41 2015 +1000

    Merge remote-tracking branch 'origin' into update-join-language-page

commit 32679e45ff296d3f0a75e84512c75751e7368fd4
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Mar 3 15:35:28 2015 +1000

    Update join language page


  Commit: c5130c055d950c5d70755a9438951e20139a2d5e
      https://github.com/zanata/zanata-server/commit/c5130c055d950c5d70755a9438951e20139a2d5e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

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

  Log Message:
  -----------
  Fix checkstyle failure


  Commit: 87412537b68cfdfc697485aeaec943786d10f73c
      https://github.com/zanata/zanata-server/commit/87412537b68cfdfc697485aeaec943786d10f73c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge pull request #781 from zanata/prevent-connection-leaks

Prevent connection leaks


  Commit: 1b0a64bca512c2d1960712d780d62bc7e68b4ea4
      https://github.com/zanata/zanata-server/commit/1b0a64bca512c2d1960712d780d62bc7e68b4ea4
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

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

  Log Message:
  -----------
  Merge pull request #775 from zanata/separate-wildfly-client-version

Separate wildfly client version from server version


  Commit: 7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
      https://github.com/zanata/zanata-server/commit/7a5769ae7e113d2eb1118a5cf2a4b984f721bc99
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2015-04-23 (Thu, 23 Apr 2015)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

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

Conflicts:
	functional-test/pom.xml


  Commit: 0d6d220c048bee74d503a6614ecfce094bb3ef1a
      https://github.com/zanata/zanata-server/commit/0d6d220c048bee74d503a6614ecfce094bb3ef1a
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-27 (Mon, 27 Apr 2015)

  Changed paths:
    M docs/release-notes.md
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    M functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    M functional-test/src/main/java/org/zanata/page/utility/ContactAdminFormPage.java
    M functional-test/src/test/java/org/zanata/feature/administration/ServerSettingsTest.java
    M functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M pom.xml
    M zanata-overlay/distros/eap-6/standalone/configuration/standalone-zanata.xml
    M zanata-overlay/distros/wildfly-8.1/standalone/configuration/standalone-zanata.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageContactCoordinatorAction.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinAction.java
    R zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    R zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    A zanata-war/src/main/java/org/zanata/adapter/PropertiesAdapter.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    R zanata-war/src/main/java/org/zanata/email/RequestRoleLanguageEmailStrategy.java
    M zanata-war/src/main/java/org/zanata/email/RequestToJoinLanguageEmailStrategy.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
    R zanata-war/src/main/resources/org/zanata/email/templates/email_request_role_language.vm
    M zanata-war/src/main/resources/org/zanata/email/templates/email_request_to_join_language.vm
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/contact_coordinator_modal.xhtml
    M 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
    A zanata-war/src/main/webapp/WEB-INF/layout/language/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/search_user_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language/settings-tab.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/upload_translation_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/roledetail.xhtml
    M zanata-war/src/main/webapp/admin/userdetail.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    R zanata-war/src/main/webapp/version-group/request_to_join.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/email/EmailStrategyTest.java
    M zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    M zanata-war/src/test/resources/arquillian/standalone-arquillian.xml

  Log Message:
  -----------
  Merge branch 'master' into jersey-boys


Compare: https://github.com/zanata/zanata-server/compare/61eb9cda3704...0d6d220c048b

More information about the zanata-commits mailing list