[zanata/zanata] 78ec49: use server configured url for sample zanata.ini on...

[GitHub]

  Branch: refs/heads/rhbz736898
  Home:   https://github.com/zanata/zanata
  Commit: 78ec49f366896c1df64f54a244b0d9d4e1c483af
      https://github.com/zanata/zanata/commit/78ec49f366896c1df64f54a244b0d9d4e1c483af
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/webapp/profile/view.xhtml

  Log Message:
  -----------
  use server configured url for sample zanata.ini on profile page


  Commit: 9554e6b011b84c9138883c201f14945c1585f583
      https://github.com/zanata/zanata/commit/9554e6b011b84c9138883c201f14945c1585f583
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/webapp/iteration/edit.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rhbz736898 - Fix issue with naming in security checks.

Some security checks were referencing outdated component names.
Correct some iteration page titles to use the appropriate component names.


  Commit: 796bf169272c3975cbaeea7cfa55a5c3bf888a01
      https://github.com/zanata/zanata/commit/796bf169272c3975cbaeea7cfa55a5c3bf888a01
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-25 (Wed, 25 Apr 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/webapp/profile/view.xhtml

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master


  Commit: bad3aadd1eecfcb7de3dc4fd75424942755ef6ff
      https://github.com/zanata/zanata/commit/bad3aadd1eecfcb7de3dc4fd75424942755ef6ff
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-29 (Sun, 29 Apr 2012)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java

  Log Message:
  -----------
  rhbz736898 - Change security permission check on translation push.

Allow translators to push translations for their allowed language teams. Had to move the check to inside the method instead of the @Restrict annotation.


Compare: https://github.com/zanata/zanata/compare/ce9ad19...bad3aad