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

..

activity

Merge branch 'journals' into 1.0-stable

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

core_ext

Defines String#to_a (Object#to_a removed in ruby1.9).

2009-10-10 15:09:19 +00:00

default_data

Rename code and locale typo: Developper. #5751

2010-06-30 01:55:44 +00:00

export

Merge branch 'master' into master-journalized

2010-10-26 18:20:57 +02:00

helpers

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

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

scm

Support leading and trailing spaces in filenames or directories in the git adapter. #6499

2010-09-26 21:54:52 +00:00

views

Set a default scope for 'My page' block names translations (#3057).

2009-04-05 13:33:54 +00:00

wiki_formatting

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

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

about.rb

Add plugins information to script/about (#3387).

2009-05-25 19:10:26 +00:00

access_control.rb

Fixed: cross-project issue list should not show issues of projects for which the issue tracking module was disabled.

2008-09-25 18:51:03 +00:00

access_keys.rb

Added a 'New issue' link in the main menu (accesskey 7).

2008-01-20 13:07:19 +00:00

activity.rb

Adds #activity_provider shortcut method to the plugin API.

2008-07-27 18:38:31 +00:00

core_ext.rb

Estimated time recognizes improved time formats (#1092).

2008-04-26 11:59:51 +00:00

custom_field_format.rb

Let custom field formats control how they are edited.

2010-04-16 15:34:05 +00:00

hook.rb

Fixing Plugin and Mailer default_url_options.

2009-02-25 07:25:01 +00:00

i18n.rb

Workaround for i18n 0.4.x with the old style syntax. #6428 #5608

2010-09-26 17:13:52 +00:00

imap.rb

IMAP: add options to move received emails.

2008-12-31 14:56:30 +00:00

info.rb

Added Redmine::Info.issue to get links to specific issue numbers.

2009-05-30 23:00:22 +00:00

menu_manager.rb

Hide the main menu div if there isn't any items for it. #3259

2010-03-04 06:01:05 +00:00

mime_type.rb

Auto-detect attachment content type when blank (#3782).

2009-12-29 13:28:30 +00:00

notifiable.rb

Changed the notifications to use a hierarchy UI

2010-09-28 21:09:06 +00:00

platform.rb

Fixes platform determination under JRuby (#1804).

2008-08-25 11:01:37 +00:00

plugin.rb

Add Redmine::Plugin.installed?(:name) method to check if a plugin is installed

2010-10-25 23:32:01 +00:00

pop3.rb

Adds a rake task to receive emails from a POP3 server (#2420).

2010-01-17 13:53:13 +00:00

search.rb

Makes search providers extensible (#3936).

2010-02-17 20:05:51 +00:00

syntax_highlighting.rb

Fixes diff highlighting (#5199).

2010-03-28 11:30:48 +00:00

themes.rb

Fixes theme discovery under JRuby on Rails war structure (#632, #5404).

2010-04-30 12:44:19 +00:00

unified_diff.rb

Fixes diff parser for when lines starting with multiple dashes are removed (#4186).

2009-11-11 13:25:53 +00:00

utils.rb

Slight changes to ease Rails 2.2 support.

2009-01-04 17:09:25 +00:00

version.rb

Merge branch 'master' into master-journalized

2010-10-26 18:20:57 +02:00

wiki_formatting.rb

Fixed: Deselecting textile text formatting causes interning empty string errors (#4867).

2010-02-17 20:47:50 +00:00