Commit Graph

89 Commits

Author SHA1 Message Date
Eric Davis 4a3e32b0f4 [#514] Fix forum notifications, only one email per created Message 2011-07-08 14:49:39 -07:00
Holger Just 07185fb169 [#436] Remove trailing whitespace 2011-05-30 20:52:25 +02:00
Eric Davis 99507a0391 [#197] Upgrade the copyright in the code files 2011-05-29 13:11:52 -07:00
Eric Davis e131c3b531 [#197] Remove old copyrights 2011-05-29 12:50:08 -07:00
Felix Schäfer b1ed5e4c7d Merge acts_as_journalized to unstable. #123 2011-04-23 21:25:52 +02:00
Jean-Philippe Lang dafbb8b283 Fixed links in new file notification broken by r4051 (#6590).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5230 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang b1c4f0fc4f Do not send reminders to locked users (#5773).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5225 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:47 -07:00
Jean-Philippe Lang da721facfe Fixes sort parameter in reminder email links (#7963).
Contributed by Beat Jörg.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5215 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 16:11:46 -07:00
Jean-Philippe Lang 6f5707c2b5 Adds email notifications support for news comments (#2074).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@5003 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-04-16 15:26:39 -07:00
Felix Schäfer 70e10ab4bd Merge the master-journalized branch from https://github.com/finnlabs/redmine/ 2011-04-14 16:28:10 +02:00
Eric Davis 99a12ecbcf [#129] Replace public strings using Redmine with ChiliProject 2011-02-19 20:38:50 -08:00
Felix Schäfer f35a9112eb Add Type headers to outgoing emails. #104 2011-02-10 02:04:50 -08:00
Jean-Philippe Lang 9a13b39e26 Adds an application configuration file: config/configuration.yml (#7408).
Email delivery settings that were stored in config/email.yml should be moved to this new configuration file.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4752 e93f8b46-1217-0410-a6f0-8f06a7374b81
2011-02-09 16:46:45 -08:00
Jean-Philippe Lang 338e407a91 Fixed: URLs broken in wiki notifications (#6838).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4373 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-06 13:23:23 +00:00
Tim Felgentreff 859bfa625d Merge branch 'master' of git://github.com/edavis10/redmine into master-journalized
Conflicts:
	app/models/wiki_content.rb
	app/views/wiki/history.rhtml
	config/locales/bg.yml
	config/locales/ca.yml
	config/locales/de.yml
	test/integration/api_test/projects_test.rb
2010-11-03 16:03:39 +01:00
Eric Davis e9efa5b981 Refactor: use :id instead of :page when linking to Wiki Pages
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4296 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-10-27 16:27:06 +00:00
Tim Felgentreff 8cece46dd4 Merge branch 'master' into master-journalized
Conflicts:
	app/controllers/application_controller.rb
	app/controllers/context_menus_controller.rb
	app/controllers/gantts_controller.rb
	app/controllers/issue_moves_controller.rb
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/controllers/previews_controller.rb
	app/controllers/timelog_controller.rb
	app/helpers/issues_helper.rb
	app/helpers/journals_helper.rb
	app/models/issue.rb
	app/models/journal.rb
	app/models/journal_observer.rb
	app/views/admin/projects.rhtml
	app/views/context_menus/issues.html.erb
	app/views/issues/_action_menu.rhtml
	app/views/issues/_history.rhtml
	app/views/news/_news.rhtml
	app/views/news/index.rhtml
	app/views/repositories/diff.rhtml
	config/locales/bg.yml
	config/locales/bs.yml
	config/locales/ca.yml
	config/locales/cs.yml
	config/locales/da.yml
	config/locales/de.yml
	config/locales/el.yml
	config/locales/en-GB.yml
	config/locales/es.yml
	config/locales/eu.yml
	config/locales/fi.yml
	config/locales/fr.yml
	config/locales/gl.yml
	config/locales/he.yml
	config/locales/hr.yml
	config/locales/hu.yml
	config/locales/id.yml
	config/locales/it.yml
	config/locales/ko.yml
	config/locales/lt.yml
	config/locales/lv.yml
	config/locales/mn.yml
	config/locales/nl.yml
	config/locales/no.yml
	config/locales/pl.yml
	config/locales/pt-BR.yml
	config/locales/pt.yml
	config/locales/ro.yml
	config/locales/ru.yml
	config/locales/sk.yml
	config/locales/sl.yml
	config/locales/sr-YU.yml
	config/locales/sr.yml
	config/locales/sv.yml
	config/locales/th.yml
	config/locales/tr.yml
	config/locales/uk.yml
	config/locales/vi.yml
	config/locales/zh-TW.yml
	config/locales/zh.yml
	config/routes.rb
	doc/CHANGELOG
	lib/redmine.rb
	lib/redmine/export/pdf.rb
	lib/redmine/helpers/gantt.rb
	lib/redmine/version.rb
	public/stylesheets/application.css
	test/functional/context_menus_controller_test.rb
	test/functional/issues_controller_test.rb
	test/functional/journals_controller_test.rb
	test/functional/previews_controller_test.rb
	test/functional/users_controller_test.rb
	test/functional/wiki_controller_test.rb
	test/integration/routing_test.rb
	test/unit/issue_test.rb
	test/unit/mailer_test.rb
	test/unit/query_test.rb
2010-10-26 18:20:57 +02:00
Eric Davis 51359704a0 Added a users options to the reminders email
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4167 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-09-20 23:17:51 +00:00
Tim Felgentreff 72e7baafdf fix various tests in mailer, wiki content and issue helper 2010-09-14 14:25:19 +02:00
Tim Felgentreff 4b098d7774 Merge branch 'journals' into 1.0-stable
Conflicts:
	app/controllers/issues_controller.rb
	app/controllers/journals_controller.rb
	app/helpers/journals_helper.rb
	app/views/issues/_history.rhtml
	lib/redmine/activity/fetcher.rb
	test/functional/issues_controller_test.rb
	test/test_helper.rb
2010-09-14 09:32:35 +02:00
Eric Davis acaa223cf8 Merged r3907 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3957 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-19 04:30:23 +00:00
Tim Felgentreff 1f9eda4e0d update tests to work with the new data model, where neccessary 2010-08-05 19:05:04 +02:00
Eric Davis 16969fdbbb Show the number of days in the subject line of Reminder emails.
i18n check needed.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3907 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-08-03 16:01:53 +00:00
Tim Felgentreff ff31875149 move to STI for journals so the journals themselves can be events 2010-07-21 17:57:45 +02:00
Tim Felgentreff 2d282f8deb move (almost) everything over to acts_as_journalized 2010-07-15 18:24:12 +02:00
Jean-Philippe Lang 79b4f68176 Adds an option to enable/disable email notifications during a project copy (#4672).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3608 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-21 11:17:29 +00:00
Jean-Philippe Lang cdb86d5ef7 Fixed: no email notification on new project/version file added (#4966).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3532 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-03-03 21:32:41 +00:00
Jean-Philippe Lang dab0c07fba Fixed: Links in Forum mails should redirect to message, not topic (#4884).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3458 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-20 10:07:53 +00:00
Jean-Philippe Lang df46d704e8 Log email delivery errors.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3356 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 11:41:58 +00:00
Jean-Philippe Lang a0364deb6a Log info when sending an email notification.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3355 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-31 11:00:40 +00:00
Jean-Philippe Lang ff77fb6aa9 Fixed: email notifications may affect language of notices on the UI (#4086).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3307 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-10 14:54:02 +00:00
Jean-Philippe Lang bb477a3a0f Make sure users don't get notified for thing they can not view (#3589).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3169 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-12-13 14:26:54 +00:00
Jean-Philippe Lang de8dcc5b26 Sets proper content type for plain text mails (#3970).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2961 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-24 11:57:01 +00:00
Eric Davis 7b0cb6aba8 Upgraded to Rails 2.3.4 (#3597)
* Ran the Rails upgrade
* Upgraded to Rails Engines 2.3.2
* Added a plugin to let Engines override application views.
* Converted tests to use the new classes:
** ActionController::TestCase for functional
** ActiveSupport::TestCase for units
* Converted ActiveRecord::Error message to a string.
* ActiveRecord grouping returns an ordered hash which doesn't have #sort!
* Updated the I18n storage_units format.
* Added some default initializers from a fresh rails app
* Changed the order of check_box_tags and hidden_field_tags.  The hidden tag
  needs to appear first in Rails 2.3, otherwise it will override any value in
  the check_box_tag.
* Removed the custom handler for when the cookie store is tampered with.
  Rails 2.3 removed the TamperedWithCookie exception and instead Rails will not
  load the data from it when it's been tampered with (e.g. no user login).
* Fixed mail layouts, 2.3 has problems with implicit multipart emails that
  use layouts.  Also removed some custom Redmine mailer code.
* Fixed a bug that occurred in tests where the "required" span tag would be
  added to the :field_status translation.  This resulted in an email string of:

    <li>Status<span class="required"> *</span><span class="required"> *</span>

  Instead of:

    <li>Status: New</li>

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2887 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-09-13 17:14:35 +00:00
Jean-Philippe Lang 85ce903cfa Ability to watch a wiki or a single wiki page (#413).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2765 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-25 19:02:28 +00:00
Jean-Philippe Lang fe8f4e5b87 Fixes code comments.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2756 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 15:32:48 +00:00
Jean-Philippe Lang 9c9dc6e814 Adds email notification on wiki changes (#413). It's disabled by default and can be enabled in application settings.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2749 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-17 09:55:13 +00:00
Jean-Philippe Lang 2a3fe1604a Fixed: Issue status in the notify email's subject is the issue's old status, should be its new status (#3194).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2673 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-19 08:33:56 +00:00
Jean-Philippe Lang 66839c12dd Replaces List-Id header with Precedence and Auto-Submitted headers (#2984, #2879).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2655 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-04-05 12:33:45 +00:00
Eric Davis c2dfffd7f2 Added some RDoc documentation for some models.
Submitted by austenito on Github.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2612 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-21 00:39:53 +00:00
Jean-Philippe Lang 554e569de1 Adds a List-Id header to all emails (#2879).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2565 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-07 15:14:10 +00:00
Eric Davis 4baf32b166 Fixing Plugin and Mailer default_url_options.
Both the plugin hooks and Mailer were setting default_url_options incorrectly
and causing ActionContoller::UrlWritter to cache the settings on the module
(mattr_accessor) causing several url generators to fail in either the plugin
hooks or the Mailer.

* Replaced Mailer's use of the default_url_options accessor with the proper class method
* Replaced Hook's use of the default_url_options accessor with the proper class method on the ViewListener class
* Added a test to reproduce the bugs in the Mailer when a hook is registered (thanks Chaoqun Zou)

  #2542

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2522 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-25 07:25:01 +00:00
Jean-Philippe Lang fe28193e4e Merged Rails 2.2 branch. Redmine now requires Rails 2.2.2.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2493 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-21 11:04:50 +00:00
Jean-Philippe Lang 04c428e059 Send an email to the user when an administrator activates a registered user (#2656).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2484 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-02-20 17:04:47 +00:00
Jean-Philippe Lang dfab202cde Accept replies to forum messages by subject recognition (#1616).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2294 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-21 18:22:30 +00:00
Jean-Philippe Lang 1d783106a3 Adds Message-Id and References headers to email notifications so that issues and messages threads can be displayed by email clients (#1401).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2281 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-18 15:16:31 +00:00
Jean-Philippe Lang 260373aed7 Slight changes to ease Rails 2.2 support.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2234 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-04 17:09:25 +00:00
Jean-Philippe Lang dfc937340d Fixed: email notification for changes I make still occurs when running Repository.fetch_changesets (#1957).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2225 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-03 16:03:12 +00:00
Jean-Philippe Lang 5c97a83a70 Validates sort_key and sort_order params (#2378).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2171 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-24 10:03:13 +00:00
Jean-Philippe Lang 1f89dad23a Adds watchers selection on new issue form (#398). Permission 'add issue watchers' required.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2164 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-12-22 19:21:02 +00:00