Eric Davis cd64d11e17 Merge branch 'master' into unstable ... Conflicts: app/controllers/watchers_controller.rb app/views/issues/_action_menu.rhtml config/locales/pt-BR.yml doc/CHANGELOG.rdoc lib/redmine/export/pdf.rb lib/redmine/wiki_formatting/textile/helper.rb		2011-05-27 12:20:04 -07:00
..
_form.rhtml	disable browser autocomplete on password fields on user edit view. #360	2011-05-05 21:25:34 +02:00
_general.rhtml	Fixed bad markup in users/general partial	2010-10-11 20:34:33 +00:00
_groups.rhtml	Refactor: split UsersController#edit into #edit and #update	2010-09-30 18:22:46 +00:00
_mail_notifications.html.erb	Code cleanup.	2010-12-12 14:25:23 +00:00
_memberships.rhtml	Fixed bad html generated in users/memberships partial (multiple </tbody> tags)	2010-12-12 21:21:57 +00:00
_preferences.html.erb	Warning on leaving a page with unsaved content in textarea (#2910).	2011-04-16 14:46:57 -07:00
edit.rhtml	Refactor: convert UsersController to resource	2010-10-04 15:36:16 +00:00
index.api.rsb	Restores object count and adds offset/limit attributes to API responses for paginated collections (#6140).	2010-12-11 13:13:49 +00:00
index.rhtml	Adds links to reset filters on users and projects list.	2011-04-16 15:41:32 -07:00
new.html.erb	Refactor: rename UsersController#add to #new	2010-09-29 16:00:45 +00:00
show.api.rsb	Makes some attributes optional in API response to get faster/lightweight responses.	2010-12-11 10:19:11 +00:00
show.rhtml	[#163] Add extra escape in mail_to's javascript. Rails CVE-2011-0446	2011-02-26 12:51:22 -08:00