Tim Felgentreff 19c7dc0094 Merge remote branch 'edavis/master' into master-journalized ...

Conflicts:
	app/controllers/application_controller.rb
	app/controllers/wiki_controller.rb
	app/helpers/issues_helper.rb
	app/models/time_entry.rb
	app/models/wiki_content.rb
	app/views/wiki/edit.rhtml
	config/locales/ja.yml
	test/functional/wiki_controller_test.rb

2010-10-26 18:28:39 +02:00

..

generators

Add example url and author url to the plugin generator.

2010-06-17 19:02:13 +00:00

redmine

Merge remote branch 'edavis/master' into master-journalized

2010-10-26 18:28:39 +02:00

SVG

Fixes SVG lib for ruby1.9.

2009-11-07 10:40:54 +00:00

tasks

Add rake task to send test email. (#6511)

2010-10-15 22:50:33 +00:00

ar_condition.rb

Activity enhancements:

2008-03-11 19:33:38 +00:00

diff.rb

Added branch and tag support to the git repository viewer. (#1406)

2009-08-15 22:41:40 +00:00

faster_csv.rb

Use FasterCSV or ruby1.9 CSV instead of ruby1.8 builtin CSV.

2009-11-04 13:22:26 +00:00

redcloth3.rb

Fixes some textile issues with JRuby (#5404).

2010-04-30 17:50:34 +00:00

redmine.rb

Merge remote branch 'edavis/master' into master-journalized

2010-10-26 18:28:39 +02:00

tabular_form_builder.rb

Exclude fields_for in the TabularFormBuilder, it has a different method

2010-06-20 19:03:09 +00:00