Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 665e8d75b8591d1c590f91fe72c7852ff7da430b
      
https://github.com/zanata/zanata-server/commit/665e8d75b8591d1c590f91fe72c7852ff7da430b
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  chore(version): Update Zanata dependencies


  Commit: 7e68fe73bbedac90e7fe56298d5f0c702456c875
      
https://github.com/zanata/zanata-server/commit/7e68fe73bbedac90e7fe56298d5f0c702456c875
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    A zanata-war/src/main/resources/messages_anp.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es_AR.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_me_ME.properties
    A zanata-war/src/main/resources/messages_mk.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  trans(pull): Update translation


  Commit: af525f47694d2972d39e9716a9437e295d1f3f0b
      
https://github.com/zanata/zanata-server/commit/af525f47694d2972d39e9716a9437e295d1f3f0b
  Author: Ding-Yi Chen <dc...@redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    A zanata-war/src/main/resources/messages_anp.properties
    M zanata-war/src/main/resources/messages_bg.properties
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_ca.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_de.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_eo.properties
    A zanata-war/src/main/resources/messages_es_AR.properties
    M zanata-war/src/main/resources/messages_es_ES.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_gu.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_ko.properties
    A zanata-war/src/main/resources/messages_me_ME.properties
    A zanata-war/src/main/resources/messages_mk.properties
    M zanata-war/src/main/resources/messages_nl.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_ru.properties
    M zanata-war/src/main/resources/messages_tr.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_Hans_CN.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties

  Log Message:
  -----------
  Merge branch 'release'

Conflicts:
        pom.xml


  Commit: e47e9ae2744280a76dacdc1337ea2315784ca9c1
      
https://github.com/zanata/zanata-server/commit/e47e9ae2744280a76dacdc1337ea2315784ca9c1
  Author: Alex Eng <a...@redhat.com>
  Date:   2016-05-24 (Tue, 24 May 2016)

  Changed paths:
    M docs/release-notes.md
    M zanata-war/src/main/java/org/zanata/action/ContactAdminAction.java
    M zanata-war/src/main/webapp/WEB-INF/layout/admin/contact_admin_modal.xhtml
    M 
zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join_modal.xhtml

  Log Message:
  -----------
  fix(request join group): limit message field in request join group dialog 
(#1179)

https://zanata.atlassian.net/browse/ZNTA-846


Compare: 
https://github.com/zanata/zanata-server/compare/6065cb36be61...e47e9ae27442
_______________________________________________
zanata-commits mailing list
zanata-commits@redhat.com
https://www.redhat.com/mailman/listinfo/zanata-commits

Reply via email to