Eric Davis cd64d11e17 Merge branch 'master' into unstable ...

Conflicts:
	app/controllers/watchers_controller.rb
	app/views/issues/_action_menu.rhtml
	config/locales/pt-BR.yml
	doc/CHANGELOG.rdoc
	lib/redmine/export/pdf.rb
	lib/redmine/wiki_formatting/textile/helper.rb

2011-05-27 12:20:04 -07:00

..

chili_project

[#112] Fix tests for jruby

2011-05-22 19:46:31 +02:00

generators

[#324] Rename and update the chiliproject_plugin_controller generator

2011-04-08 09:59:31 -07:00

redmine

Merge branch 'master' into unstable

2011-05-27 12:20:04 -07:00

SVG

Fixes SVG lib for ruby1.9.

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

tasks

Merge branch 'master' into unstable

2011-05-27 12:20:04 -07:00

ar_condition.rb

Activity enhancements:

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

chili_project.rb

Create the ChiliProject namespace

2011-05-11 15:48:36 -07: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

Fixed: line breaks are ignored in quoted text (#6148).

2011-04-16 15:38:57 -07:00

redmine.rb

Merge acts_as_journalized to unstable. #123

2011-04-23 21:25:52 +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