jro_apps/redmine Commit - r1611:fc42dd2cef3f

0

config/email.yml.example created 644 +21 0

@@ -0,0 +1,21
	1	# Outgoing email settings
	2
	3	production:
	4	delivery_method: :smtp
	5	smtp_settings:
	6	address: smtp.somenet.foo
	7	port: 25
	8	domain: somenet.foo
	9	authentication: :login
	10	user_name: redmine@somenet.foo
	11	password: redmine
	12
	13	development:
	14	delivery_method: :smtp
	15	smtp_settings:
	16	address: 127.0.0.1
	17	port: 25
	18	domain: somenet.foo
	19	authentication: :login
	20	user_name: redmine@somenet.foo
	21	password: redmine

0

config/initializers/40-email.rb created 644 +17 0

@@ -0,0 +1,17
	1	# Loads action_mailer settings from email.yml
	2	# and turns deliveries on if configuration file is found
	3
	4	filename = File.join(File.dirname(__FILE__), '..', 'email.yml')
	5	if File.file?(filename)
	6	mailconfig = YAML::load_file(filename)
	7
	8	if mailconfig.is_a?(Hash) && mailconfig.has_key?(Rails.env)
	9	# Enable deliveries
	10	ActionMailer::Base.perform_deliveries = true
	11
	12	mailconfig[Rails.env].each do \|k, v\|
	13	v.symbolize_keys! if v.respond_to?(:symbolize_keys!)
	14	ActionMailer::Base.send("#{k}=", v)
	15	end
	16	end
	17	end

0

app/controllers/settings_controller.rb +1 0

                 end
                 @options = {}
                 @options[:user_format] = User::USER_FORMATS.keys.collect {|f| [User.current.name(f), f.to_s] }
+                @deliveries = ActionMailer::Base.perform_deliveries
               end
               def plugin

0

app/views/settings/_notifications.rhtml +6 0

+            <% if @deliveries %>
             <% form_tag({:action => 'edit', :tab => 'notifications'}) do %>
             <div class="box tabular settings">
             <%= submit_tag l(:button_save) %>
             <% end %>
+            <% else %>
+            <div class="nodata">
+            <%= simple_format(l(:text_email_delivery_not_configured)) %>
+            </div>
+            <% end %>

0

config/environment.rb +4 -20

@@ -49,25 +49,9 Rails::Initializer.run do \|config\|
49	# Use Active Record's schema dumper instead of SQL when creating the test database	49	# Use Active Record's schema dumper instead of SQL when creating the test database
50	# (enables use of different database adapters for development and test environments)	50	# (enables use of different database adapters for development and test environments)
51	# config.active_record.schema_format = :ruby	51	# config.active_record.schema_format = :ruby
52
53	# See Rails::Configuration for more options
54		52
55	# SMTP server configuration	53	# Deliveries are disabled by default. Do NOT modify this section.
56	config.action_mailer.smtp_settings = {	54	# Define your email configuration in email.yml instead.
57	:address => "127.0.0.1",	55	# It will automatically turn deliveries on
58	:port => 25,	56	config.action_mailer.perform_deliveries = false
59	:domain => "somenet.foo",
60	:authentication => :login,
61	:user_name => "redmine@somenet.foo",
62	:password => "redmine",
63	}
64
65	config.action_mailer.perform_deliveries = true
66
67	# Tell ActionMailer not to deliver emails to the real world.
68	# The :test delivery method accumulates sent emails in the
69	# ActionMailer::Base.deliveries array.
70	#config.action_mailer.delivery_method = :test
71	config.action_mailer.delivery_method = :smtp
72
73	end	57	end

0

config/environments/test.rb +1 0

             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
+            config.action_mailer.perform_deliveries = true
             config.action_mailer.delivery_method = :test

0

config/environments/test_pgsql.rb +2 -1

             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
-            config.action_mailer.delivery_method = :test
  No newline at end of file
+            config.action_mailer.perform_deliveries = true
+            config.action_mailer.delivery_method = :test

0

config/environments/test_sqlite3.rb +2 -1

             config.action_controller.consider_all_requests_local = true
             config.action_controller.perform_caching             = false
-            config.action_mailer.delivery_method = :test
  No newline at end of file
+            config.action_mailer.perform_deliveries = true
+            config.action_mailer.delivery_method = :test

0

doc/INSTALL +5 -5

@@ -53,10 +53,10 Optional:
53	trackers, statuses, workflow) and adjust application settings	53	trackers, statuses, workflow) and adjust application settings
54		54
55		55
56	== ~~SMTP server~~ Configuration	56	== Email delivery Configuration
57
58	In config/environment.rb, you can set parameters for your SMTP server:
59	config.action_mailer.smtp_settings: SMTP server configuration
60	config.action_mailer.perform_deliveries: set to false to disable mail delivering
61		57
		58	Copy config/email.yml.example to config/email.yml and edit this file
		59	to adjust your SMTP settings.
62	Don't forget to restart the application after any change to this file.	60	Don't forget to restart the application after any change to this file.
		61
		62	Please do not enter your SMTP settings in environment.rb.

0

doc/UPGRADING +3 -5

 . Uncompress the program archive in a new directory
 . Copy your database settings (RAILS_ROOT/config/database.yml)
+               and SMTP settings (RAILS_ROOT/config/email.yml)
                into the new config directory
-. Enter your SMTP settings in config/environment.rb
+. Migrate your database (please make a backup before doing this):
-               Do not replace this file with the old one
-. Migrate your database (please make a backup before doing this):
                rake db:migrate RAILS_ENV="production"
 . Copy the RAILS_ROOT/files directory content into your new installation
                This directory contains all the attached files

0

lang/bg.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/cs.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/da.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/de.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/en.yml +1 0

             text_user_wrote: '%s wrote:'
             text_enumeration_destroy_question: '%d objects are assigned to this value.'
             text_enumeration_category_reassign_to: 'Reassign them to this value:'
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."
             default_role_manager: Manager
             default_role_developper: Developer

0

lang/es.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/fi.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/fr.yml +1 0

             text_user_wrote: '%s a écrit:'
             text_enumeration_destroy_question: 'Cette valeur est affectée à %d objets.'
             text_enumeration_category_reassign_to: 'Réaffecter les objets à cette valeur:'
+            text_email_delivery_not_configured: "L'envoi de mail n'est pas configuré, les notifications sont désactivées.\nConfigurez votre serveur SMTP dans config/email.yml et redémarrez l'application pour les activer."
             default_role_manager: Manager
             default_role_developper: Développeur

0

lang/he.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/hu.yml +1 0

             label_generate_key: Kulcs generálása
             setting_mail_handler_api_enabled: Web Service engedélyezése a beérkezett levelekhez
             setting_mail_handler_api_key: API kulcs
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/it.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/ja.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/ko.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/lt.yml +1 0

             setting_mail_handler_api_enabled: Įgalinti WS įeinantiems laiškams
             setting_mail_handler_api_key: API raktas
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/nl.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/no.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/pl.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/pt-br.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/pt.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/ro.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/ru.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/sr.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/sv.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/th.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/uk.yml +1 0

             label_generate_key: Generate a key
             setting_mail_handler_api_enabled: Enable WS for incoming emails
             setting_mail_handler_api_key: API key
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/zh-tw.yml +1 0

             enumeration_issue_priorities: 項目優先權
             enumeration_doc_categories: 文件分類
             enumeration_activities: 活動 (時間追蹤)
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

0

lang/zh.yml +1 0

             enumeration_issue_priorities: 问题优先级
             enumeration_doc_categories: 文档类别
             enumeration_activities: 活动（时间跟踪）
+            text_email_delivery_not_configured: "Email delivery is not configured, and notifications are disabled.\nConfigure your SMTP server in config/email.yml and restart the application to enable them."

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages