rails.git - Mirror of official rails repo with custom fixes.

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge pull request #3724 from marcandre/media_default	Yehuda Katz	2011-11-22	1	-0/+3
\|\ \| \| \| \|	stylesheet_tag default's media is "screen"
\| *	Make explicit the default media when calling stylesheet_tag and change the ↵	Marc-Andre Lafortune	2011-11-22	1	-0/+3
\| \| \| \| \| \| \| \|	default generators.
* \|	Merge pull request #3695 from tobiassvn/partial_path_error	Yehuda Katz	2011-11-19	1	-2/+7
\|\ \ \| \| \| \| \| \|	Meaningful errors for unexpected partial arguments. Fixes #3573
\| * \|	Meaningful errors for unexpected partial arguments. Fixes #3573	Tobias Svensson	2011-11-19	1	-2/+7
\| \| \|
* \| \|	Don't html-escape the :count option to translate if it's a Numeric. Fixes #3685.	Jon Leighton	2011-11-19	1	-1/+3
\|/ /
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-18	1	-1/+2
\|\ \
\| * \|	put back the removed eg	Vijay Dev	2011-11-18	1	-0/+1
\| \| \|
\| * \|	Fix a number_with_delimiter :separator example	Edward Anderson	2011-11-17	1	-1/+1
\| \| \|
* \| \|	_html translation should escape interpolated arguments	lest	2011-11-17	1	-4/+9
\| \| \|
* \| \|	Revert "warn the user values are directly interpolated into _html ↵	Xavier Noria	2011-11-17	1	-2/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	translation strings" Reason: After another round of discussion, it has been decided to let interpolation deal with unsafe strings as it should do. This reverts commit d57d8098fc269a26ea0051a9027a33af1a9a4b2b.
* \| \|	warn the user values are directly interpolated into _html translation strings	Xavier Noria	2011-11-17	1	-0/+2
\| \| \|
* \| \|	Fix impractical I18n lookup in nested fields_for	Alexander Uvarov	2011-11-17	1	-1/+9
\| \| \|
* \| \|	Switch from marshal format to plain text for the encoding conversions dump. ↵	Jon Leighton	2011-11-16	3	-6/+95
\|/ / \| \| \| \| \| \|	This is for windows compatibility. Fixes #3644.
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-13	1	-2/+2
\|\ \
\| * \|	Cosmetic fix in number_to_currency docs	Alexey Vakhov	2011-11-10	1	-2/+2
\| \| \|
* \| \|	Fix and simplify highlight regexp	Alexey Vakhov	2011-11-10	1	-1/+1
\|/ /
* \|	Fix small typo in link_to_function doc	Alexey Vakhov	2011-11-08	1	-1/+1
\| \|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-06	1	-2/+2
\|\ \
\| * \|	Docs cosmetic fixes in Action View form_helper.rb	Alexey Vakhov	2011-11-06	1	-2/+2
\| \| \|
* \| \|	RUBY_ENGINE is not defined on 1.8	Jon Leighton	2011-11-06	1	-1/+1
\| \| \|
* \| \|	Implement a workaround for a bug in ruby-1.9.3p0.	Jon Leighton	2011-11-06	2	-0/+26
\|/ / \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	The bug is that an error would be raised while attempting to convert a template from one encoding to another. Please see http://redmine.ruby-lang.org/issues/5564 for more details. The workaround is to load all conversions into memory ahead of time, and will only happen if the ruby version is exactly 1.9.3p0. The hope is obviously that the underlying problem will be resolved in the next patchlevel release of 1.9.3.
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-11-05	1	-2/+2
\|\ \ \| \|/ \|/\|
\| *	Fix javascript_include_tag examples in documentation	Alexey Vakhov	2011-11-03	1	-2/+2
\| \|
* \|	Remove 'size' attribute from number_field form helper fixes #3454	Waseem Ahmad	2011-11-04	1	-0/+2
\|/ \| \| \| \|	f.number_field generates <input type="number", size="30"../> which is invalid HTML5. See: http://dev.w3.org/html5/spec/Overview.html#number-state
*	Add missing type to number_field_tag documentation	Paul McMahon	2011-10-28	1	-1/+1
\|
*	scumbag 1.8: strings are enumerable :'(	Aaron Patterson	2011-10-26	1	-1/+1
\|
*	properly handle lists of lists. Thanks @adrianpike for reporting!	Aaron Patterson	2011-10-25	1	-1/+6
\|
*	Merge pull request #3314 from macmartine/master	Santiago Pastorino	2011-10-13	1	-1/+1
\|\ \| \| \| \|	Remove user-specified delimiter from start when no area code is present (in number_to_phone)
\| *	remove user-specified delimiter from start when no area code is present (in ↵	Mac Martine	2011-10-12	1	-1/+1
\| \| \| \| \| \| \| \|	number_to_phone)
* \|	Merge pull request #2219 from kommen/fix_fragment_caching_squashed	Santiago Pastorino	2011-10-13	1	-1/+1
\|/ \| \| \|	Fix fragment caching (squashed commits)
*	Merge pull request #3196 from avakhov/patch-am-av-tests-2	José Valim	2011-10-09	1	-1/+6
\|\ \| \| \| \|	Improve tests method for ActionView::TestCase and ActionMailer::TestCase
\| *	normalize arg for ActionView::TestCase tests method	Alexey Vakhov	2011-10-03	1	-1/+6
\| \|
* \|	Fixes an issue when creating a date select with too many options.	Liborio Cannici	2011-10-08	1	-5/+10
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	Inspired by dlt https://github.com/dlt/rails/commit/9e615634745dc81598e7b880d52411338d3a7a93 Closes #239. Conflicts: actionpack/CHANGELOG
* \|	just check to see that the first item in the list is an array	Aaron Patterson	2011-10-07	1	-1/+1
\| \|
* \|	closes #3241 - partial doc fix	Vijay Dev	2011-10-07	2	-3/+3
\| \|
* \|	Merge branch 'master' of github.com:lifo/docrails	Vijay Dev	2011-10-05	1	-1/+1
\|\ \
\| * \|	missed underscore in AV::TestCase helper_method documentation	Alexey Vakhov	2011-10-03	1	-1/+1
\| \| \|
* \| \|	Fix the lame config.action_controller.present? check scattered throughout ↵	José Valim	2011-10-05	1	-13/+3
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	assets_path. Conflicts: actionpack/test/template/sprockets_helper_test.rb
* \| \|	Ensure default_asset_host_protocol is respected, closes #2980.	José Valim	2011-10-05	1	-4/+1
\| \|/ \|/\|
* \|	Make button_to helper support "form" option which is the form attributes.	Wen-Tien Chang	2011-09-29	1	-5/+15
\|/
*	escape options for the stylesheet_link_tag method	Alexey Vakhov	2011-09-25	1	-1/+1
\|
*	Use safe_constantize where possible.	José Valim	2011-09-23	1	-3/+1
\|
*	Using #extract_details in PartialRenderer, too!	Nick Sutterer	2011-09-23	2	-3/+1
\|
*	Allow both sym and array for details options in #render. using ↵	Nick Sutterer	2011-09-23	2	-2/+13
\| \| \| \|	LC#registered_details to extract options.
*	Deprecate passing the template handler in the template name.	José Valim	2011-09-22	2	-2/+7
\| \| \| \| \| \|	For example, calling hello.erb is now deprecated. Since Rails 3.0 passing the handler had no effect whatsover. This commit simply deprecates such cases so we can clean up the code in later releases.
*	Make handlers a registered detail.	José Valim	2011-09-22	1	-6/+3
\|
*	Get rid of update_details in favor of passing details to find_template.	José Valim	2011-09-22	4	-66/+33
\|
*	it is now possible to pass details options (:formats, :details, :locales, ↵	Nick Sutterer	2011-09-22	2	-10/+19
\| \| \| \|	...) to #render, #find_template and friends. this doesn't change anything in global context.
*	No need to recalculate the @details_key after update_details.	José Valim	2011-09-22	1	-3/+2
\|
*	Slightly reorganize lookup context modules in order to better isolate cache ↵	José Valim	2011-09-21	1	-100/+111
\| \| \| \|	responsibilities.