[zanata/zanata-server] 10f9a4: Revert back request to join group page from versio...

[GitHub]

  Branch: refs/heads/project-page
  Home:   https://github.com/zanata/zanata-server
  Commit: 10f9a4dab21fc09b37eb340eb69aafc9112643ae
      https://github.com/zanata/zanata-server/commit/10f9a4dab21fc09b37eb340eb69aafc9112643ae
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Revert back request to join group page from version group


  Commit: 861a70a1fd9ae2339d9b3119d5f771393a2590fd
      https://github.com/zanata/zanata-server/commit/861a70a1fd9ae2339d9b3119d5f771393a2590fd
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge pull request #367 from zanata/rhbz1060970

Revert back request to join group page from version group


  Commit: a5c32c9b4f7aed3d4be1164a6281b1c48867b65e
      https://github.com/zanata/zanata-server/commit/a5c32c9b4f7aed3d4be1164a6281b1c48867b65e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Redirect to previous page when 'cancel' is clicked on request to join group: https://bugzilla.redhat.com/show_bug.cgi?id=1060973


  Commit: bf8f080118435a7c0f2372d27319bcd3594fa593
      https://github.com/zanata/zanata-server/commit/bf8f080118435a7c0f2372d27319bcd3594fa593
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-10 (Mon, 10 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    M zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge pull request #369 from zanata/rhbz1060973

Redirect to previous page when 'cancel' is clicked on request join group


  Commit: 4a6186941648f80da6745df4d500c12ad0d342f5
      https://github.com/zanata/zanata-server/commit/4a6186941648f80da6745df4d500c12ad0d342f5
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Modify message display to use flashscope bean: https://bugzilla.redhat.com/show_bug.cgi?id=1060987


  Commit: 488bc68013cef2a3b37bcabe34bea0198d1f57f6
      https://github.com/zanata/zanata-server/commit/488bc68013cef2a3b37bcabe34bea0198d1f57f6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

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

  Log Message:
  -----------
  Fix css layout


  Commit: 29de4991b655f8742b35b78d2508da6d8119f41d
      https://github.com/zanata/zanata-server/commit/29de4991b655f8742b35b78d2508da6d8119f41d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-11 (Tue, 11 Feb 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #371 from zanata/rhbz1060987

Change message display to use flashscope bean


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/request_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/request_to_join_group.xhtml
    A zanata-war/src/main/webapp/version-group/request_to_join.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' into project-page

Conflicts:
	zanata-war/src/main/webapp/iteration/view.xhtml


Compare: https://github.com/zanata/zanata-server/compare/5fd9d62efd7b...d18f385e163a