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

..

lib/redmine

Reset the default language for the test, autotest was caught it staying at :no

2009-09-04 03:24:20 +00:00

account_test.rb

Makes AuthSource.authenticate return a hash instead of an array.

2010-02-26 09:13:12 +00:00

admin_test.rb

Refactor: convert UsersController to resource

2010-10-04 15:36:16 +00:00

api_token_login_test.rb

Added an Admin setting to enable/disable the REST web service. (#3920)

2009-12-23 06:27:44 +00:00

application_test.rb

Do not start user session when accessing atom feed with token-based authentication.

2009-06-06 10:20:27 +00:00

disabled_rest_api_test.rb

Added an Admin setting to enable/disable the REST web service. (#3920)

2009-12-23 06:27:44 +00:00

http_basic_login_test.rb

Fixed: API 401 response does not include WWW-Authenticate header (#5322).

2010-04-17 12:45:23 +00:00

http_basic_login_with_api_token_test.rb

Added an Admin setting to enable/disable the REST web service. (#3920)

2009-12-23 06:27:44 +00:00

issues_api_test.rb

Merge branch 'master' into master-journalized

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

issues_test.rb

Refactor: convert many of the custom Issue routes to REST resources.

2010-08-26 16:36:59 +00:00

layout_test.rb

Merged r3951 from trunk.

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

projects_api_test.rb

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

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

projects_test.rb

Converted routing and urls to follow the Rails REST convention.

2009-01-26 01:47:51 +00:00

routing_test.rb

Refactor: convert WikiController#destroy to use HTTP DELETE

2010-10-26 15:59:20 +00:00