aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
* Merge commit 'mainstream/master'Pratik Naik2008-12-0727-7562/+395
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionmailer/lib/action_mailer/base.rb actionpack/lib/action_controller/base.rb actionpack/lib/action_controller/mime_type.rb railties/doc/guides/html/activerecord_validations_callbacks.html railties/doc/guides/html/caching_with_rails.html railties/doc/guides/html/command_line.html railties/doc/guides/html/configuring.html railties/doc/guides/html/creating_plugins.html railties/doc/guides/html/finders.html railties/doc/guides/html/routing_outside_in.html railties/doc/guides/source/activerecord_validations_callbacks.txt railties/doc/guides/source/caching_with_rails.txt railties/doc/guides/source/command_line.txt railties/doc/guides/source/creating_plugins/acts_as_yaffle.txt railties/doc/guides/source/creating_plugins/controllers.txt railties/doc/guides/source/creating_plugins/core_ext.txt railties/doc/guides/source/creating_plugins/helpers.txt railties/doc/guides/source/creating_plugins/index.txt railties/doc/guides/source/creating_plugins/migration_generator.txt railties/doc/guides/source/creating_plugins/models.txt railties/doc/guides/source/creating_plugins/odds_and_ends.txt railties/doc/guides/source/creating_plugins/routes.txt railties/doc/guides/source/finders.txt railties/doc/guides/source/routing_outside_in.txt railties/doc/guides/source/testing_rails_applications.txt
| * Silence server backtrace in rescue templates and log files. Also remove some ↵Joshua Peek2008-12-052-2/+10
| | | | | | | | noise from missing template errors.
| * Set template_format to html inside rjs templates so renders within it ↵Joshua Peek2008-12-042-3/+1
| | | | | | | | default to html.
| * Fix rendering html partials from an rjs templateSam Stephenson2008-12-041-1/+1
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Register bogus template handlers for ActionMailer test fixturesJoshua Peek2008-12-031-1/+1
| |
| * Validate template extensions [#1187 state:resolved]Joshua Peek2008-12-031-8/+6
| |
| * Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2008-12-032-5/+5
| |\
| | * Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵Tekin Suleyman2008-12-011-1/+1
| | | | | | | | | | | | | | | | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed]
| | * allow options to be passed to email address auto generationAndrew Kaspick2008-12-011-4/+4
| | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed]
| * | Unnecessary CGI requireJeremy Kemper2008-12-031-1/+0
| |/
| * Make sure #compute_public_path caching allows to return different results ↵Sven Fuchs2008-11-291-1/+1
| | | | | | | | | | | | for different given sources [#1471 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * fixed template recompile issue with previous commit and add some better ↵Joshua Peek2008-11-283-2/+20
| | | | | | | | tests so we can make sure it doesn't happen again
| * Reinstate "Super lazy load view paths in development mode (no indexing or ↵Joshua Peek2008-11-283-21/+52
| | | | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading."
| * Revert "Super lazy load view paths in development mode (no indexing or ↵David Heinemeier Hansson2008-11-273-52/+21
| | | | | | | | | | | | caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading. This reverts commit 4d910b033379727e5e7355590c50c72fc75e56db.
| * Merge branch 'master' of git@github.com:rails/railsDavid Heinemeier Hansson2008-11-273-21/+52
| |\
| | * Super lazy load view paths in development mode (no indexing or caching at ↵Joshua Peek2008-11-263-21/+52
| | | | | | | | | | | | all). Switch layout finders to use view path api to take advantage of cache.
| * | Added the option to declare an asset_host as an object that responds to call ↵David Heinemeier Hansson2008-11-271-3/+11
| |/ | | | | | | (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [DHH]
| * prototype and scripty helpers require jsonJoshua Peek2008-11-242-0/+2
| |
| * prefer autoloaded html scannerJoshua Peek2008-11-241-1/+0
| |
| * prefer autoloading Mime::TypeJoshua Peek2008-11-241-2/+0
| |
| * Autoload HTML::Document and sanitizersJeremy Kemper2008-11-232-20/+1
| |
| * Use autoload instead of explicit requires for ActionControllerJoshua Peek2008-11-231-2/+0
| |
| * simplify console with helpersJoshua Peek2008-11-231-0/+1
| |
| * Add i18n for number_to_human_size() helper storage units. Translation key is ↵Yaroslav Markin2008-11-232-4/+4
| | | | | | | | | | | | | | | | number.human.storage_units. [#1448 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * A back support for legacy TemplateHandler#render APIJoshua Peek2008-11-232-6/+27
| |
| * use autoload instead of explicit requires for ActionViewJoshua Peek2008-11-236-55/+70
| |
| * Added ActiveSupport::BacktraceCleaner and Rails::BacktraceCleaner for ↵David Heinemeier Hansson2008-11-221-9/+8
| | | | | | | | cutting down on backtrace noise (inspired by the Thoughtbot Quiet Backtrace plugin) [DHH]
| * need to make sure the asset type is cached with it in Cache.. name is ↵Aaron Batalion2008-11-191-2/+2
| | | | | | | | | | | | sufficient, not self Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Fixed asset host to not cache objects [#1419 state:resolved]Aaron Batalion2008-11-191-29/+35
| | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Changed the default of ActionView#render to assume partials instead of files ↵David Heinemeier Hansson2008-11-192-7/+48
| | | | | | | | when not given an options hash [DHH]
| * Fix rendering html partial via inline render when with :js format [#1399 ↵Luke Melia2008-11-181-1/+2
| | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Register 'checked' as an HTML boolean attribute.Hongli Lai (Phusion)2008-11-181-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This way, 'tag :foo, :type => "checkbox", :checked => false' would output the expected <input type="checkbox" /> instead of the old <input type="checkbox" checked="false" /> The latter would result in a checkbox that's initially checked. Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
| * Remove duplicate distribution of prototype and scriptaculous.Michael Koziarski2008-11-184-7384/+0
| | | | | | | | This was previously needed by define_javascript_functions which has been removed for a while.
| * Remove mention of long-dead define_javascript_functionsMichael Koziarski2008-11-181-3/+0
| |
| * Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2Thomas Fuchs2008-11-184-520/+628
| |
| * use :en as a default locale (in favor of :en-US)Sven Fuchs2008-11-182-2/+2
| | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
| * Prevent assert_template failures when a render :inline is called before ↵Luke Melia2008-11-171-1/+3
| | | | | | | | | | | | rendering a file-based template [#1383 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Fixed RedCloth and BlueCloth shouldn't preload. Instead just assume that ↵David Heinemeier Hansson2008-11-171-81/+69
| | | | | | | | they're available if you want to use textilize and markdown and let autoload require them [DHH]
| * Merge branch 'master' into testingJeremy Kemper2008-11-152-30/+30
| |\
| | * auto_link helper: add intelligent ending closing bracket handling. add new ↵Mislav Marohnić2008-11-151-9/+13
| | | | | | | | | | | | | | | | | | | | | tests and reorder new ones for readability Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1353 state:committed]
| | * refactor autolink helper. change tests to expect HTML-escaped URLsMislav Marohnić2008-11-151-26/+20
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Merge branch 'master' into testingJeremy Kemper2008-11-071-2/+2
| |\ \
| * | | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| | | |
| * | | Move controller assertions from base TestCase to AC:: and AV::TestCaseJeremy Kemper2008-11-071-1/+3
| | | |
* | | | Tiny doc example change for escape_once()Vincent Woo2008-11-261-1/+1
| | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* | | | Fix markup for cattr_accessors in Action View and Action Mailer to work ↵Mike Gunderloy2008-11-162-2/+8
| |_|/ |/| | | | | | | | better with RDoc 2+.
* | | Tag helper should output an attribute with the value 'false' instead of ↵Hongli Lai (Phusion)2008-11-131-4/+6
| | | | | | | | | | | | omitting the attribute, if the associated option is false but not nil.
* | | Check whether last arg is a Hash instead of duck-typing against []Jeremy Kemper2008-11-071-4/+9
| |/ |/|
* | auto_link view helper was failing on URLs with colons after a query paramRich Manalang2008-11-071-2/+2
|/ | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1341 state:committed]
* Fixed that FormTagHelper generates illegal html if name contains e.g. square ↵Vladimir Dobriakov2008-11-041-4/+10
| | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>