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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' into docrails	wycats	2010-03-26	1	-1/+87
\|\
\| *	Remove some 1.9 warnings (resulting in some fixed bugs). Remaining AM ↵	wycats	2010-03-17	1	-1/+0
\| \| \| \| \| \| \| \|	warnings are in dependencies.
\| *	link_to_function is here to stay	Joshua Peek	2010-03-16	1	-0/+87
\| \|
* \|	Merge remote branch 'mainstream/master'	Pratik Naik	2010-03-12	1	-8/+2
\|\\| \| \| \| \| \| \| \| \| \| \| \| \|	Conflicts: activerecord/lib/active_record/base.rb railties/lib/rails/configuration.rb railties/lib/rails/log_subscriber.rb
\| *	Deprecate block_called_from_erb? pending a solution for getting it into apps	Carlhuda	2010-03-09	1	-7/+1
\| \|
\| *	content_tag should escape its input	Bruno Michel	2010-02-14	1	-1/+1
\| \| \| \| \| \| \| \|	Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
* \|	Updated documentation for block helpers in javascript_helper.rb	Jeroen van Dijk	2010-03-12	1	-1/+1
\|/
*	More html_safe strings now use the safe_concat method	Santiago Pastorino and José Ignacio Costa	2010-02-05	1	-1/+1
\| \| \| \| \| \|	[#3856 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
*	Reorg options_for_javascript and array_or_string_for_javascript	Joshua Peek	2010-01-30	1	-17/+0
\|
*	Move button_to_function to prototype helper	Joshua Peek	2010-01-30	1	-33/+0
\|
*	Unused JAVASCRIPT_PATH const	Joshua Peek	2010-01-30	1	-4/+0
\|
*	Move link_to_function and link_to_remote into prototype_legacy_helper	Joshua Peek	2010-01-30	1	-54/+0
\| \| \| \|	plugin
*	Revert "Merge branch 'rails/master' into ujs"	Joshua Peek	2010-01-30	1	-49/+14
\| \| \| \| \| \| \| \| \| \| \|	This reverts commit 3aa1ea1ae4baa4a03d03644e798eeb98a4745785, reversing changes made to 2c12a71378d2146c822acb389b00b866f6420ff5. Conflicts: actionpack/lib/action_view/helpers/javascript_helper.rb actionpack/lib/action_view/helpers/url_helper.rb actionpack/test/template/url_helper_test.rb
*	Deprecate link_to :popup	Joshua Peek	2010-01-29	1	-13/+6
\|
*	fixing last merge breakage	Erik St. Martin	2010-01-27	1	-3/+0
\|
*	making non remote versions of link_to, button_to, submit_tag and ↵	Erik St. Martin	2010-01-27	1	-0/+3
\| \| \| \|	image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
*	modified helper that adds attributes for :method to include rel='nofollow' ↵	Erik St. Martin	2010-01-27	1	-0/+1
\| \| \| \|	if :method => :delete, same as its remote_ equivalent
*	making non remote versions of link_to, button_to, submit_tag and ↵	Erik St. Martin	2010-01-27	1	-0/+41
\| \| \| \|	image_submit_tag output data attributes for things like :confirm, :method, :popup, and :disable_with
*	restructure compatibility module so it is no longer a child	Stephen St. Martin	2010-01-27	1	-1/+1
\|
*	javascript_helper now correctly pulls in ajax_helper instead of ↵	Erik St. Martin	2010-01-27	1	-1/+1
\| \| \| \|	prototype_helper. prototype_helper is pulled in by ajax_helper for reverse compatibility
*	Remove mention of long-dead define_javascript_functions	Michael Koziarski	2008-11-18	1	-3/+0
\|
*	Merge with docrails.	Pratik Naik	2008-07-16	1	-2/+19
\|
*	Remove old method of including javascripts define_javascript_functions.	Michael Koziarski	2008-07-03	1	-26/+0
\| \| \| \|	javascript_include_tag and friends do a much better job.
*	Remove strange alias for JavaScriptHelper	Michael Koziarski	2008-07-03	1	-2/+0
\|
*	link_to_function and button_to_function shouldn't modify their options hashes	Jeremy Kemper	2008-06-23	1	-2/+2
\|
*	Performance: javascript helper tweaks to speed up escaping and reduce object ↵	Jeremy Kemper	2008-06-21	1	-58/+71
\| \| \| \|	allocations when building options strings
*	Use output_buffer reader and writer methods exclusively instead of hitting ↵	Jeremy Kemper	2008-06-08	1	-5/+0
\| \| \| \|	the instance variable so others can override the methods.
*	javascript_tag should only concat when block_given?	Jeremy Kemper	2008-06-06	1	-7/+10
\|
*	Don't pass block binding to concat	Jeremy Kemper	2008-06-02	1	-7/+1
\|
*	Try replacing _erbout with @output_buffer	Jeremy Kemper	2008-06-02	1	-1/+1
\|
*	Fixed spelling errors (closes #9706) [tarmo/rmm5t]	David Heinemeier Hansson	2007-09-28	1	-1/+1
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Fixed JavaScriptHelper#escape_javascript to also escape closing tags (closes ↵	David Heinemeier Hansson	2007-09-22	1	-1/+1
\| \| \| \| \| \|	#8023) [rubyruy] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7567 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added block-acceptance to JavaScriptHelper#javascript_tag (closes #7527) ↵	David Heinemeier Hansson	2007-09-15	1	-4/+28
\| \| \| \| \| \|	[BobSilva/tarmo/rmm5t] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7485 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Refactored in use of extract_options! (closes #9079) [josh]	David Heinemeier Hansson	2007-07-24	1	-2/+2
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7220 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Prefer MIME constants to strings. Closes #7707.	Jeremy Kemper	2007-03-06	1	-2/+2
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6350 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Use a consistent load path to avoid double requires. Fix some scattered Ruby ↵	Jeremy Kemper	2007-01-28	1	-2/+2
\| \| \| \| \| \|	warnings. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6057 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added an html_options hash parameter to javascript_tag() and ↵	David Heinemeier Hansson	2006-10-09	1	-2/+5
\| \| \| \| \| \|	update_page_tag() helpers #6311 [tzaharia] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5245 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Fixed escaping of backslashes in JavaScriptHelper#escape_javascript (closes ↵	David Heinemeier Hansson	2006-10-09	1	-1/+1
\| \| \| \| \| \|	#6302) [sven@c3d2.de] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5242 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Docfix (closes #6356)	David Heinemeier Hansson	2006-10-09	1	-1/+9
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5238 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Fixed JavaScriptHelper#link_to_function and ↵	David Heinemeier Hansson	2006-09-06	1	-2/+11
\| \| \| \| \| \|	JavaScriptHelper#button_to_function to have the script argument be optional [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@5039 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Docs for js linkers (closes #5948)	David Heinemeier Hansson	2006-09-02	1	-1/+22
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4904 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Change link_to_function and button_to_function to (optionally) take an ↵	Sam Stephenson	2006-04-19	1	-5/+25
\| \| \| \| \| \|	update_page block instead of a JavaScript string. Closes #4804. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4235 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Dont repeat the button_to method	David Heinemeier Hansson	2006-01-16	1	-14/+0
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3425 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added assignment of the Autocompleter object created by ↵	David Heinemeier Hansson	2006-01-03	1	-0/+14
\| \| \| \| \| \|	JavaScriptMacroHelper#auto_complete_field to a local javascript variables [DHH] Added :on option for PrototypeHelper#observe_field that allows you to specify a different callback hook to have the observer trigger on [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3378 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added JavaScriptHelper#button_to_function that works just like ↵	David Heinemeier Hansson	2005-12-31	1	-0/+14
\| \| \| \| \| \|	JavaScriptHelper#link_to_function but uses a button instead of a href [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3367 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added that JavaScriptHelper#link_to_function will honor existing :onclick ↵	David Heinemeier Hansson	2005-12-31	1	-1/+1
\| \| \| \| \| \|	definitions when adding the function call [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3365 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added that JavaScriptHelper#link_to_function will honor existing :onclick ↵	David Heinemeier Hansson	2005-12-31	1	-1/+5
\| \| \| \| \| \|	definitions when adding the function call [DHH] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3364 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Refactored JavaScriptHelper into PrototypeHelper and ScriptaculousHelper. ↵	Sam Stephenson	2005-11-14	1	-449/+35
\| \| \| \| \| \|	Added PrototypeHelper::JavaScriptGenerator and PrototypeHelper#update_page for easily modifying multiple elements in an Ajax response. git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3036 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Added support for the queue option on visual_effect	Thomas Fuchs	2005-10-29	1	-0/+1
\| \| \| \|	git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2807 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
*	Updated and clarified documentation for JavaScriptHelper to be more concise ↵	Thomas Fuchs	2005-10-15	1	-6/+24
\| \| \| \| \| \|	about the various options for including the JavaScript libs git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2608 5ecf4fe2-1ee6-0310-87b1-e25e094e27de