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

..

generators

Add example url and author url to the plugin generator.

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

redmine

Merge branch 'journals' into 1.0-stable

2010-09-14 09:32:35 +02:00

SVG

Fixes SVG lib for ruby1.9.

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

tasks

Merged r3948 from trunk.

2010-08-19 04:34:26 +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 branch 'journals' into 1.0-stable

2010-09-14 09:32:35 +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