0c87f611e9
Merge branch 'master' into unstable
...
Conflicts:
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/fa.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/ja.yml
config/locales/ko.yml
config/locales/lt.yml
config/locales/lv.yml
config/locales/mk.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
db/migrate/20100217010520_add_custom_filter_to_auth_sources.rb
lib/chili_project/version.rb
2012-01-04 16:41:10 +01:00
e95b4992e4
Update copyright for 2012
...
We programmers have a nice new years tradition: We revisit all of our
projects and add 1 to a small number near a "(c)".
-- Volker Dusch
https://twitter.com/__edorian/status/153801913442373633
2012-01-03 20:36:40 +01:00
8100ce0ce5
Optimize: Remove per-language assertions for Mailer tests
...
I can't find any real reason they are needed at all and were taking
a lot of time to run. Results for the test class
Before: 56 seconds
After: 23 seconds
2011-12-28 12:20:45 -08:00
260e8b84f8
[ #674 ] Convert outbound mail to be sent per-recipient
...
Instead of a single email that is sent out with all the recipients as CC/BCC,
each recipient will be delivered their own email. This will let emails to be
customized per user based on their permissions, without exposing private data.
2011-12-26 16:58:43 -08:00
91070236db
Set source encoding to UTF-8
2011-10-29 14:48:03 +02:00
f0d271bee3
Fix failing tests because of missing journal fixtures and indeterministic behaviour of .find(:first)
2011-07-25 21:22:13 +02:00
4a3e32b0f4
[ #514 ] Fix forum notifications, only one email per created Message
2011-07-08 14:49:39 -07:00
07185fb169
[ #436 ] Remove trailing whitespace
2011-05-30 20:52:25 +02:00
99507a0391
[ #197 ] Upgrade the copyright in the code files
2011-05-29 13:11:52 -07:00
b1ed5e4c7d
Merge acts_as_journalized to unstable. #123
2011-04-23 21:25:52 +02:00
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
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
70e10ab4bd
Merge the master-journalized branch from https://github.com/finnlabs/redmine/
2011-04-14 16:28:10 +02:00
17f86d964f
Use absolute paths in test/**/* requires for Ruby 1.9.2 compatibility. #4050
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4509 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-12 23:24:34 +00:00
8524d505c5
Add tests for wiki edit notifications ( #7024 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4479 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-12-07 22:07:55 +00:00
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
7e359d3d7e
Add a Email Header setting. Useful for adding delimiters to every email.
...
#2852 #6628
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@4362 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-11-02 19:00:36 +00:00
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
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
9cd55d8dd4
more test fixes
2010-09-14 18:07:38 +02:00
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
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
cbfbd662bb
fix changed method name
2010-08-06 14:57:11 +02:00
1f9eda4e0d
update tests to work with the new data model, where neccessary
2010-08-05 19:05:04 +02:00
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
554c047d80
Fixes random test failure.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3707 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-04-30 11:27:08 +00:00
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
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
ae55978515
Adds a test for not sending email without recipient ( #4920 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3518 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-28 17:18:21 +00:00
6e68921590
Cleanup.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3459 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-20 10:11:19 +00:00
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
b733accfe3
Adds a test for emission address with phrase ( #4855 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3443 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-02-17 19:08:04 +00:00
d55e1ec5b0
Adds unit test for #3645 .
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3327 e93f8b46-1217-0410-a6f0-8f06a7374b81
2010-01-17 11:48:46 +00:00
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
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
b2e4d8ad3f
Fixed some tests that where looking for specific issue urls but weren't matching
...
the css classes for the link.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3049 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-11-14 19:40:56 +00:00
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
9cd662f8dc
Fixes some test failures due to Array#to_s behaviour in ruby1.9.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2913 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-10-10 15:14:08 +00:00
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
7dccf9fda6
Allows multiple roles on the same project ( #706 ). Prerequisite for user groups feature.
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2726 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-05-10 10:54:31 +00:00
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
e67fbdc315
Test that account activation email contains the appropriate link ( #2825 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2561 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-03-07 12:45:46 +00:00
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
765f7abc60
Converted routing and urls to follow the Rails REST convention.
...
Patch supplied by commits from Gerrit Kaiser on Github. Existing routes will
still work (backwards compatible) but any new urls will be generated using the
new routing rules.
Changes listed below:
* made the URLs for some project tabs and project settings follow the new rails RESTful conventions of /collection/:id/subcollection/:sub_id
* prettier URL for project roadmap
* more nice project URLs
* use GET for filtering form
* prettified URLs used on issues tab
* custom route for activity atom feeds
* prettier repository urls
* fixed broken route definition
* fixed failing tests for issuecontroller that were hardcoding the url string
* more RESTful routes for boards and messages
* RESTful routes for wiki pages
* RESTful routes for documents
* moved old routes that are retained for compatibility to the bottom and grouped them together
* added RESTful URIs for issues
* RESTfulness for the news section
* fixed route order
* changed hardcoded URLs in tests
* fixed badly written tests
* fixed forgotten parameter in routes
* changed hardcoded URLS to new scheme
* changed project add url to the standard POST to collection
* create new issue by POSTing to collection
* changed hardcoded URLs in integrations tests
* made project add form work again
* restful routes for project deletion
* prettier routes for project (un)archival
* made routes table more readable
* fixed note quoting
* user routing
* fixed bug
* always sort by GET
* Fixed: cross-project issue list should not show issues of projects for which the issue tracking module was disabled.
* prettified URLs used on issues tab
* urls for time log
* fixed reply routing
* eliminate revision query paremeter for diff and entry actions
* fixed test failures with hard-coded urls
* ensure ajax links always use get
* refactored ajax link generation into separate method
#1901
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@2317 e93f8b46-1217-0410-a6f0-8f06a7374b81
2009-01-26 01:47:51 +00:00
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
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
077723c90a
Do not use @:skip_relative_url_root@ to generate urls in Mailer ( #2122 ).
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1992 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-11-08 13:25:45 +00:00
a4b07a36ed
add plain text option for mail #2029
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1932 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-10-15 23:50:33 +00:00
1894bef48a
bugfix to two failed tests
...
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@1931 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-10-15 22:30:57 +00:00
7c1c2e1ba2
Fixes test broken by r1549.
...
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1551 e93f8b46-1217-0410-a6f0-8f06a7374b81
2008-06-15 14:39:52 +00:00
Holger Just
Eric Davis
Felix Schäfer
Jean-Philippe Lang
Jean-Baptiste Barth
Tim Felgentreff
Nicolas Chuche