[zanata-commits] [zanata/zanata] 5e579b: Separate the Zip file preparation tasks into a sep...

noreply at github.com noreply at github.com
Fri Nov 11 03:48:47 UTC 2011


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

  Commit: 5e579beb264e1f6e1c187cc6f3f9c224b5570a11
      https://github.com/zanata/zanata/commit/5e579beb264e1f6e1c187cc6f3f9c224b5570a11
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M 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/dao/DocumentDAO.java
  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/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css

  Log Message:
  -----------
  Separate the Zip file preparation tasks into a separate Seam component.

The use of a conversation scoped bean causes table search and pagination to fail. This revision still holds a small bug when downloading the zip file multiple times that should be corrected in later revisions.


  Commit: c4ad5b9369db8874592a801f661229e7747994d1
      https://github.com/zanata/zanata/commit/c4ad5b9369db8874592a801f661229e7747994d1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

  Log Message:
  -----------
  use template for generated emails, with link to server instance


  Commit: 60cfdf95f236497583fbc9b0a767220ad84b73a1
      https://github.com/zanata/zanata/commit/60cfdf95f236497583fbc9b0a767220ad84b73a1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-07 (Mon, 07 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

  Log Message:
  -----------
  Merge branch '1.4'


  Commit: 6c9418e6fab465c1a73271b13605d20a4690b9ce
      https://github.com/zanata/zanata/commit/6c9418e6fab465c1a73271b13605d20a4690b9ce
  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/process/IterationZipFileBuildProcess.java
  M server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java

  Log Message:
  -----------
  Correct bug with Zip file generation logic.

There is still a small visual glitch when downloading the same zip file multiple times, but it does not cause any errors in functionality.


  Commit: a97b026b69bccb34f463a95b1b1cd5dbfcade82d
      https://github.com/zanata/zanata/commit/a97b026b69bccb34f463a95b1b1cd5dbfcade82d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-08 (Tue, 08 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java

  Log Message:
  -----------
  Fix bug: Ghost translation in search results: https://bugzilla.redhat.com/show_bug.cgi?id=751264


  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


  Commit: aa574db9149de33e17d1fa0ac5d3706109cfe610
      https://github.com/zanata/zanata/commit/aa574db9149de33e17d1fa0ac5d3706109cfe610
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-09 (Wed, 09 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-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
  A server/zanata-model/src/main/resources/.gitignore
  A server/zanata-model/src/test/resources/.gitignore
  M server/zanata-war/etc/scripts/zanata-deploy.sh
  M server/zanata-war/pom.xml
  R server/zanata-war/src/main/java/org/zanata/ZanataMySQL5InnoDBDialect.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/ProjectSearch.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/service/FileSystemService.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.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-jboss/WEB-INF/classes/META-INF/persistence.xml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/template_email.xhtml
  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/help/email_admin.xhtml
  M server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  M server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml
  A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.properties
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  M zanata-parent/pom.xml

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

Conflicts:
	server/zanata-war/src/main/resources/security.drl


  Commit: d62307ce523c7061790de2e7a13a81e387531a82
      https://github.com/zanata/zanata/commit/d62307ce523c7061790de2e7a13a81e387531a82
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-11-09 (Wed, 09 Nov 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java

  Log Message:
  -----------
  rhbz748154: Reactivate HLocaleMember hibernate security level restrictions.

Reactivate the hibernate level security restrictions and add a precautionary pre-fetching of a lazily loaded conllection which is being used in the security rules. This prevents hibernate from loading said collection while in the middle of a Drools security check, a scenario that was causing issues.


  Commit: 59f9c074d3231926f86fa0d807c00dfd70c5ca88
      https://github.com/zanata/zanata/commit/59f9c074d3231926f86fa0d807c00dfd70c5ca88
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-war/pom.xml

  Log Message:
  -----------
  Fix l10n-maven-plugin to read from src/main/resources to target folder


  Commit: a12bb323329db9beb123cdbaad2f640a3d8385d9
      https://github.com/zanata/zanata/commit/a12bb323329db9beb123cdbaad2f640a3d8385d9
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java

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


  Commit: dc8d5a52406d18a0c393d1d613f86ff9df8561fb
      https://github.com/zanata/zanata/commit/dc8d5a52406d18a0c393d1d613f86ff9df8561fb
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java

  Log Message:
  -----------
  Disable HLocaleMember hibernate level restrictions.

Action level restrictions are still active in this revision nonetheless, but there are still issues with hibernate's collection loading inside the security rules.


  Commit: a6600dbef47cf8fcb080e233b3c7347374fde286
      https://github.com/zanata/zanata/commit/a6600dbef47cf8fcb080e233b3c7347374fde286
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-war/pom.xml

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


  Commit: 7a9ad3cc5fa6e239437842a17bcf4c0355dccfb2
      https://github.com/zanata/zanata/commit/7a9ad3cc5fa6e239437842a17bcf4c0355dccfb2
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
  R server/zanata-war/src/main/webapp/help/email_admin.xhtml
  R server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  R server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

  Log Message:
  -----------
  move some email templates to WEB-INF so they are not accessible by users


  Commit: 3ccf32ea966fbb2bbd5c724a14c0e7ef19a0ca6c
      https://github.com/zanata/zanata/commit/3ccf32ea966fbb2bbd5c724a14c0e7ef19a0ca6c
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-11-10 (Thu, 10 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-model/src/main/java/org/zanata/model/HLocaleMember.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/java/org/zanata/webtrans/client/editor/filter/TransFilterPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.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 'master' of github.com:zanata/zanata


  Commit: 4500fdb03d51e95767a432df7ac261b467c2662d
      https://github.com/zanata/zanata/commit/4500fdb03d51e95767a432df7ac261b467c2662d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.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/WEB-INF/layout/iteration_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css

  Log Message:
  -----------
  Show obsolete UI component - project and project iteration


  Commit: c79175c14c19e96838dd99352cdd53ebc07d0228
      https://github.com/zanata/zanata/commit/c79175c14c19e96838dd99352cdd53ebc07d0228
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-11-10 (Thu, 10 Nov 2011)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.java
  M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
  R server/zanata-war/src/main/webapp/help/email_admin.xhtml
  R server/zanata-war/src/main/webapp/language/email_coordinator.xhtml
  R server/zanata-war/src/main/webapp/language/email_request_to_join.xhtml

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


Compare: https://github.com/zanata/zanata/compare/609a46c...c79175c




More information about the zanata-commits mailing list