[zanata/zanata] a65087: Apply css into iteration page, rename iteration.xh...

[GitHub]

  Branch: refs/heads/rhbz803572
  Home:   https://github.com/zanata/zanata
  Commit: a650875363e3ee94dfb9ecba95989b383b499c1f
      https://github.com/zanata/zanata/commit/a650875363e3ee94dfb9ecba95989b383b499c1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Apply css into iteration page, rename iteration.xhtml to view.html


  Commit: 86cf39fbc20bd3d108628e9395a217fbdb983d45
      https://github.com/zanata/zanata/commit/86cf39fbc20bd3d108628e9395a217fbdb983d45
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

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


  Commit: b18d0f16cb00c3c04646ccb865e20ed2e2469796
      https://github.com/zanata/zanata/commit/b18d0f16cb00c3c04646ccb865e20ed2e2469796
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Merge branch 'master' into rhbz803572

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


Compare: https://github.com/zanata/zanata/compare/8ebda96...b18d0f1