[zanata-commits] [zanata/zanata] bfd407: Add file statistics to the Iteration files' page.

[noreply at github.com]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata

  Commit: bfd407bc23111b69965114a534b0183b6719e7b6
      https://github.com/zanata/zanata/commit/bfd407bc23111b69965114a534b0183b6719e7b6
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css

  Log Message:
  -----------
  Add file statistics to the Iteration files' page.


  Commit: 274007456b4668bcd9280167b6c61e293f7013ec
      https://github.com/zanata/zanata/commit/274007456b4668bcd9280167b6c61e293f7013ec
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M client/pom.xml
  R client/zanata-adapter-po/pom.xml
  R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  R client/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  R client/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
  R client/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
  R client/zanata-adapter-po/src/test/resources/pot/RPM.pot
  M common/pom.xml
  A common/zanata-adapter-po/pom.xml
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
  A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
  A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
  A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
  A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
  A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
  A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
  A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
  A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
  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-jboss/WEB-INF/classes/META-INF/components.xml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'rhbz749439'

Conflicts:
	server/zanata-war/pom.xml
	server/zanata-war/src/main/resources/security.drl
	server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml


Compare: https://github.com/zanata/zanata/compare/a97b026...2740074