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

..

application_helper_test.rb

Fixed: auto links ending with right angle bracket shouldn't include the bracket in the URL. #5652

2010-10-23 22:35:02 +00:00

custom_fields_helper_test.rb

Fixed: Undefined Method (l_YesNo) Being Called (#2867).

2009-03-01 10:00:52 +00:00

issue_moves_helper_test.rb

Merged r3936 from trunk.

2010-08-19 04:33:18 +00:00

issues_helper_test.rb

change issue specific journal query and show_details for journal helper

2010-09-15 12:56:33 +02:00

projects_helper_test.rb

Fixed: Bulk edit of issues throws 500 if no versions are defined on the project (#4366).

2009-12-09 09:22:16 +00:00

search_helper_test.rb

Sets file encoding to utf-8 for ruby 1.9.

2009-10-10 15:00:28 +00:00

sort_helper_test.rb

Adds missing native eol properties.

2009-09-20 14:06:57 +00:00

timelog_helper_test.rb

Changed the Timelogs to use both the Systemwide and Project specific TimeEntryActivities

2009-10-21 22:34:39 +00:00