[zanata/zanata] 231d7d: Merge branch 'master' into rhbz800869

GitHub noreply at github.com
Mon Apr 23 01:28:33 UTC 2012


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 231d7d62855a4b3663360a1b4c5f4f29cb9293d4
      https://github.com/zanata/zanata/commit/231d7d62855a4b3663360a1b4c5f4f29cb9293d4
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-22 (Sun, 22 Apr 2012)

  Changed paths:
    R server/zanata-war/src/main/java/org/zanata/action/AdminActionBean.java
    A server/zanata-war/src/main/java/org/zanata/action/ReindexActionBean.java
    M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A server/zanata-war/src/main/java/org/zanata/action/ReindexClassOptions.java
    M server/zanata-war/src/main/resources/messages.properties
    M server/zanata-war/src/main/webapp/admin/search.xhtml

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


  Commit: 042f24fbf6744098e0e0288e5594086fbf8960be
      https://github.com/zanata/zanata/commit/042f24fbf6744098e0e0288e5594086fbf8960be
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-22 (Sun, 22 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  project version group: add filter via status options


  Commit: 540e82d7f051dfd4c4d115cc85dedba50dd276e6
      https://github.com/zanata/zanata/commit/540e82d7f051dfd4c4d115cc85dedba50dd276e6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-04-22 (Sun, 22 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HIterationGroup.java
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M server/zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M server/zanata-war/src/main/java/org/zanata/dao/VersionGroupDAO.java
    M server/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M server/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
    M server/zanata-war/src/main/resources/security.drl
    M server/zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
    M server/zanata-war/src/main/webapp/project/home.xhtml
    M server/zanata-war/src/main/webapp/version-group/home.xhtml

  Log Message:
  -----------
  Merge branch 'rhbz800869' into integration/master


Compare: https://github.com/zanata/zanata/compare/a4da400...540e82d


More information about the zanata-commits mailing list