[zanata/zanata-server] dfae21: accept json in server configuration REST service a...

[GitHub]

  Branch: refs/heads/jersey-boys
  Home:   https://github.com/zanata/zanata-server
  Commit: dfae212b45954d0e4f344f11f44af14a68d601f4
      https://github.com/zanata/zanata-server/commit/dfae212b45954d0e4f344f11f44af14a68d601f4
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-28 (Tue, 28 Apr 2015)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/resources/log4j.xml
    M zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java

  Log Message:
  -----------
  accept json in server configuration REST service and fix tests


  Commit: f2c2b7b66ddad082eb27535c1d108d0a52fe94b8
      https://github.com/zanata/zanata-server/commit/f2c2b7b66ddad082eb27535c1d108d0a52fe94b8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2015-04-28 (Tue, 28 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/0d6d220c048b...f2c2b7b66dda