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

..

_action_menu.rhtml

Revert part of r3936.

2010-10-15 23:11:05 +00:00

_attributes.rhtml

Refactor: split VersionsController#new into #new and #create

2010-09-16 18:27:33 +00:00

_changesets.rhtml

Merged r3898 from trunk

2010-07-30 19:20:52 +00:00

_edit.rhtml

Merged r3946 from trunk.

2010-08-19 04:34:14 +00:00

_form_custom_fields.rhtml

Fixed: custom fields are not displayed in the same order on issue form and view.

2009-07-29 19:04:27 +00:00

_form_update.rhtml

Adds a Setting to control how an Issue's done_ratio is calculated:

2009-12-11 18:48:34 +00:00

_form.rhtml

Add ids to some sections of the issue form

2010-10-22 18:20:00 +00:00

_history.rhtml

Refactor: move method to model. (references r4057)

2010-09-05 22:57:20 +00:00

_list_simple.rhtml

Merged r3924 from trunk.

2010-08-19 04:32:06 +00:00

_list.rhtml

Hide checkboxes in issues list when printing

2010-09-03 19:59:49 +00:00

_relations.rhtml

Refocus the related issue field after submitting an issue. #6275

2010-09-06 00:48:44 +00:00

_sidebar.rhtml

Merged r4012 from trunk.

2010-08-22 19:49:19 +00:00

bulk_edit.rhtml

Added ability to edit issues from different project through contextual menu (#5332)

2010-10-08 03:09:51 +00:00

destroy.rhtml

Fixed: %0.2f is rendered as plain text in issues/destroy view (#3167).

2009-04-24 17:18:36 +00:00

edit.rhtml

Merged IssuesController #edit and #update into a single actions.

2008-02-09 16:11:18 +00:00

index.rhtml

Fixed: pressing enter in filters should result to an 'apply', not a 'save'. #2285

2010-09-16 21:33:49 +00:00

index.xml.builder

Adds parent issue id in issue REST API (#5304).

2010-04-13 17:51:06 +00:00

new.rhtml

Merged r3946 from trunk.

2010-08-19 04:34:14 +00:00

show.rhtml

Remove the Description label from the issue view and omit the block if empty (#6677).

2010-10-19 19:26:07 +00:00

show.xml.builder

Adds issue relations to individual issue XML (#5305).

2010-05-01 14:07:36 +00:00