[zanata-commits] [zanata/zanata] 5298d5: send individual admin emails instead of one with m...

noreply at github.com noreply at github.com
Fri Oct 7 02:25:24 UTC 2011 

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

  Commit: 5298d5c16fc46c56daac811e2849f33d229e51d1
      https://github.com/zanata/zanata/commit/5298d5c16fc46c56daac811e2849f33d229e51d1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-05 (Wed, 05 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/help/email_admin.xhtml

  Log Message:
  -----------
  send individual admin emails instead of one with multiple 'to' lines


  Commit: 2458e17bb6caf84371e1bb75c6f6cf3bcf2a078b
      https://github.com/zanata/zanata/commit/2458e17bb6caf84371e1bb75c6f6cf3bcf2a078b
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java

  Log Message:
  -----------
  prevent error when non-admins contact admin on a server that does not have admin emails set


  Commit: 03d947d18eb098129771e4375ba0f1b8b9282c3e
      https://github.com/zanata/zanata/commit/03d947d18eb098129771e4375ba0f1b8b9282c3e
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 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

  Log Message:
  -----------
  show names properly in activation, validation and password reset emails


  Commit: 241289a7e16b7dd5c6a81e0b60fed6f4904e1137
      https://github.com/zanata/zanata/commit/241289a7e16b7dd5c6a81e0b60fed6f4904e1137
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java

  Log Message:
  -----------
  fix password reset for internal authentication


  Commit: 1ea14edbcbc3c90473c54f6939162966875b0314
      https://github.com/zanata/zanata/commit/1ea14edbcbc3c90473c54f6939162966875b0314
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2011-10-06 (Thu, 06 Oct 2011)

  Changed paths:
    M .gitignore
  M CHANGELOG.md
  M client/pom.xml
  M client/zanata-adapter-po/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M copyright.txt
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/PasswordResetAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentListView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/DocumentNode.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/FolderNode.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/Node.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitCountGraph.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/TranslationEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/EditRowCallback.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationCacheCallback.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingCachedTableModel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/RedirectingTableModel.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/editor/table/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableModelHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/NavConfigChangeEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/NavConfigChangeHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectStatusCountHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitNavigationHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AbstractWorkspaceAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCount.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetProjectStatusCountResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
  M server/zanata-war/src/main/resources/messages.properties
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/configure.png
  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
  R server/zanata-war/src/main/webapp/WEB-INF/layout/project_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/statsbar.xhtml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/roledetail.xhtml
  M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/search.xhtml
  M server/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
  M server/zanata-war/src/main/webapp/language/home.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/search.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyActivateWorkspaceCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
  R server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetProjectStatusCountCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetStatusCountCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslatorListCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyUpdateTransUnitCommand.java
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch '1.4' into rhbz742083 to get updated email templates.

Conflicts:
	server/zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
	server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
	server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_validation.xhtml
	server/zanata-war/src/main/webapp/WEB-INF/facelets/email/password_reset.xhtml
             the above 4 just needed to use ApplictionConfiguration.fromEmailAddr
             rather than ApplicationConfiguration.adminEmail

	server/zanata-war/src/main/webapp/WEB-INF/layout/language_view_inline.xhtml
             I think this was added by Carlos and the merge wanted to delete it. Kept.


Compare: https://github.com/zanata/zanata/compare/01d0dc6...1ea14ed

More information about the zanata-commits mailing list