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

..

account

Adds hooks on login view (#4978).

2010-03-03 20:21:05 +00:00

admin

Merged r3924 from trunk.

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

attachments

Merged r3879 from trunk.

2010-07-25 10:35:35 +00:00

auth_sources

Refactor AuthSourcesController to support non-LDAP sources. #1131

2010-05-23 03:16:31 +00:00

auto_completes

Merged r3945 from trunk.

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

boards

Slight forum styles changes.

2010-02-14 11:52:12 +00:00

calendars

Added missing labels to the Issue Calendar.

2010-05-24 18:07:43 +00:00

common

Display the correct ISO week number on the project calendar.

2010-06-19 22:52:15 +00:00

context_menus

Merged r4006 from trunk.

2010-08-22 19:48:45 +00:00

custom_fields

Replace the hardcoded CustomField::FIELD_FORMATS with a class.

2010-04-16 15:33:49 +00:00

documents

Fixed: code syntax highlighting not working in Document page (#3740).

2010-03-18 20:06:16 +00:00

enumerations

Adds missing thead tags (#5440).

2010-05-09 11:19:15 +00:00

gantts

Refactor: extract gantt zoom links to a helper.

2010-05-26 22:48:17 +00:00

groups

Adds missing thead tags (#5440).

2010-05-09 11:19:15 +00:00

issue_categories

Moves ProjectsController#add_issue_category to IssueCategoriesController#new.

2010-03-06 18:43:00 +00:00

issue_moves

Merged r3936 from trunk.

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

issue_relations

Application layout refactored.

2007-09-22 13:17:49 +00:00

issue_statuses

Adds an helper for displaying the 'checked' image.

2010-03-17 20:46:22 +00:00

issues

Merge branch 'journals' into 1.0-stable

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

layouts

Merged r4005 from trunk.

2010-08-22 19:48:38 +00:00

ldap_auth_sources

Refactor AuthSourcesController to support non-LDAP sources. #1131

2010-05-23 03:16:31 +00:00

mailer

update tests to work with the new data model, where neccessary

2010-08-05 19:05:04 +02:00

members

User groups branch merged.

2009-09-12 08:36:46 +00:00

messages

Merged r3877 from trunk.

2010-07-25 10:02:55 +00:00

my

Fixed HTML validation errors

2010-06-19 16:50:13 +00:00

news

Merged r3924 from trunk.

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

previews

Merged r3946 from trunk.

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

projects

Merged r4009 from trunk.

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

queries

Added missing labels to the Issue Calendar.

2010-05-24 18:07:43 +00:00

reports

Added two hooks to the issues report. #5233

2010-06-20 03:37:42 +00:00

repositories

Merged r3939 from trunk.

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

roles

Refactor: Merged RolesController#list and #index

2010-02-15 16:41:16 +00:00

search

Adds missing native eol properties.

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

settings

Merged r3859 from trunk.

2010-07-24 00:23:50 +00:00

timelog

Don't reveal issue subjects if user is only allowed to view spent time (#3187).

2009-11-14 14:10:09 +00:00

trackers

Refactor: Merged TrackersController#list and #index

2010-02-15 16:41:27 +00:00

users

Merged r3924 from trunk.

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

versions

Merged r3865 and r3866 from trunk.

2010-07-25 09:34:04 +00:00

watchers

Move issue watchers to the sidebar.

2010-03-13 17:45:41 +00:00

welcome

Merged r3924 from trunk.

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

wiki

Minor bug fixes to journalized versions

2010-08-10 16:18:26 +02:00

wikis

Added project module concept.

2007-09-14 11:34:08 +00:00

workflows

Add "Check/Unckeck all" buttons to rows and columns on workflow edit screen (#3201).

2010-04-27 17:54:27 +00:00