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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' into sprockets	Joshua Peek	2011-04-12	8	-17/+22
\|\
\| *	Merge branch 'master' of git://github.com/lifo/docrails	Xavier Noria	2011-04-12	1	-1/+4
\| \|\
\| \| *	Merge branch 'master' of github.com:lifo/docrails	Ryan Bigg	2011-04-05	6	-10/+10
\| \| \|\
\| \| * \|	Correct documentation on url_for. It doesn't call to_s, but rather to_param	Ryan Bigg	2011-04-05	1	-1/+4
\| * \| \|	Make csrf_meta_tags use the tag helper	James Robinson	2011-04-08	1	-4/+6
\| * \| \|	do not return html safe strings from auto_link	Aaron Patterson	2011-04-05	1	-2/+2
\| \| \|/ \| \|/\|
\| * \|	s/ERb/ERB/g	Akira Matsuda	2011-04-03	6	-10/+10
\| \|/
* \|	Merge branch 'master' into sprockets	Joshua Peek	2011-03-30	3	-4/+20
\|\\|
\| *	fixes a couple of regexps, the suite showed warnings about them	Xavier Noria	2011-03-27	1	-2/+2
\| *	Fix alias_method, add test	David Heinemeier Hansson	2011-03-27	1	-1/+1
\| *	Allow FormHelper#form_for to specify the :method as a direct option instead o...	David Heinemeier Hansson	2011-03-26	1	-2/+13
\| *	Make JavaScriptHelper#j() an alias for JavaScriptHelper#escape_javascript() -...	David Heinemeier Hansson	2011-03-26	1	-0/+5
* \|	Seperate asset directories	Joshua Peek	2011-03-29	1	-1/+3
* \|	Change back to /assets prefix	Joshua Peek	2011-03-29	1	-2/+2
* \|	Only add fingerprints if perform_caching is on	Joshua Peek	2011-03-29	1	-1/+1
* \|	Use sprockets helpers if config.use_sprockets is set	Joshua Peek	2011-03-29	2	-6/+22
* \|	Tests for SprocketsHelper	Joshua Peek	2011-03-29	1	-5/+11
* \|	Update sprockets path generation method	Joshua Peek	2011-03-28	1	-1/+1
* \|	Add SprocketsHelper	Joshua Peek	2011-03-28	2	-0/+79
* \|	Remove sprockets exception from main asset helpers	Joshua Peek	2011-03-28	2	-20/+0
* \|	Add sprockets md5s to asset tags	Joshua Peek	2011-03-22	2	-0/+20
\|/
*	Improved resolver docs a bit	José Valim	2011-03-19	1	-2/+10
*	[action_view] docs for FileSystemResolver	Chris Kowalik	2011-03-20	1	-2/+30
*	[action_view] added custom patterns to template resolver	Chris Kowalik	2011-03-20	2	-24/+55
*	fixes an issue with number_to_human when converting values which are less tha...	Josh Kalderimis	2011-03-16	1	-1/+1
*	Add additional text to NotImplementedErrors [#6328 state:resolved]	Mike Gehard	2011-03-12	1	-1/+1
*	Filter params that return nil for to_param and allow through false values	Andrew White	2011-03-09	1	-1/+0
*	test/unit in ruby trunk adds a new instance variable. YAY!	Aaron Patterson	2011-03-08	1	-0/+1
*	more "SSL everywhere" for GitHub URLs	Akira Matsuda	2011-03-07	1	-1/+1
*	fix typos	Akira Matsuda	2011-03-07	1	-2/+2
*	Allow model to be inherited from Hash [#6487 state:resolved]	Alexander Uvarov	2011-03-06	1	-3/+4
*	Action Pack typos.	R.T. Lechow	2011-03-05	6	-9/+9
*	Add an option to FormBuilder to omit hidden field with id	Alexander Uvarov	2011-03-04	1	-2/+22
*	javascript_include_tag shouldn't raise if you register an expansion key with ...	Santiago Pastorino	2011-02-28	2	-2/+2
*	merges docrails	Xavier Noria	2011-02-18	2	-1/+8
\|\
\| *	Fix Typos: remove several occurences of the the	Nicholas Rowe	2011-02-17	1	-1/+1
\| *	Added RDoc info for accepted options for simple_format in TextHelper.	Steve Schwartz	2011-02-15	1	-0/+7
* \|	Add Date#rfc3339 and Date#iso8601 to AS	Santiago Pastorino	2011-02-13	1	-0/+1
* \|	Allow for the format of time_tag in AP to be changed via an option argument.	Josh Kalderimis	2011-02-12	1	-3/+5
* \|	Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved]	Sjoerd Andringa	2011-02-12	2	-1/+20
* \|	Applied changes to stylesheet_link_tag from javascript_include_tag which corr...	Josh Kalderimis	2011-02-13	2	-14/+15
* \|	This corrects two issues with javascript_include_tag, the order at which they...	Josh Kalderimis	2011-02-13	1	-4/+23
* \|	Add block support to button_tag helper	Tom Stuart	2011-02-12	1	-4/+9
* \|	Make type="submit" the default for button_tag helper	Tom Stuart	2011-02-12	1	-6/+4
* \|	Removed Array#safe_join in AS core_ext and moved it to a view helper with the...	Josh Kalderimis	2011-02-10	3	-20/+40
* \|	Revert "Removed Array#safe_join in AS core_ext and moved it to a view helper ...	José Valim	2011-02-10	3	-42/+20
* \|	Removed Array#safe_join in AS core_ext and moved it to a view helper with the...	Josh Kalderimis	2011-02-10	3	-20/+42
* \|	reduce string append funcalls	Aaron Patterson	2011-02-08	1	-3/+3
* \|	Use Mime::Type references.	José Valim	2011-02-08	2	-3/+3
* \|	Ensure render is case sensitive even on systems with case-insensitive filesys...	José Valim	2011-02-08	1	-3/+12