Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge commit 'mainstream/master' | Pratik Naik | 2008-12-07 | 27 | -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 Peek | 2008-12-05 | 2 | -2/+10 |
| | | | | | | | | noise from missing template errors. | ||||
| * | Set template_format to html inside rjs templates so renders within it ↵ | Joshua Peek | 2008-12-04 | 2 | -3/+1 |
| | | | | | | | | default to html. | ||||
| * | Fix rendering html partials from an rjs template | Sam Stephenson | 2008-12-04 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Register bogus template handlers for ActionMailer test fixtures | Joshua Peek | 2008-12-03 | 1 | -1/+1 |
| | | |||||
| * | Validate template extensions [#1187 state:resolved] | Joshua Peek | 2008-12-03 | 1 | -8/+6 |
| | | |||||
| * | Merge branch 'master' of git@github.com:rails/rails | Jeremy Kemper | 2008-12-03 | 2 | -5/+5 |
| |\ | |||||
| | * | Ensure ActionMailer doesn't blow up when a two argument proc is set for the ↵ | Tekin Suleyman | 2008-12-01 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | asset host Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1394 state:committed] | ||||
| | * | allow options to be passed to email address auto generation | Andrew Kaspick | 2008-12-01 | 1 | -4/+4 |
| | | | | | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#1418 state:committed] | ||||
| * | | Unnecessary CGI require | Jeremy Kemper | 2008-12-03 | 1 | -1/+0 |
| |/ | |||||
| * | Make sure #compute_public_path caching allows to return different results ↵ | Sven Fuchs | 2008-11-29 | 1 | -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 Peek | 2008-11-28 | 3 | -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 Peek | 2008-11-28 | 3 | -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 Hansson | 2008-11-27 | 3 | -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/rails | David Heinemeier Hansson | 2008-11-27 | 3 | -21/+52 |
| |\ | |||||
| | * | Super lazy load view paths in development mode (no indexing or caching at ↵ | Joshua Peek | 2008-11-26 | 3 | -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 Hansson | 2008-11-27 | 1 | -3/+11 |
| |/ | | | | | | | (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [DHH] | ||||
| * | prototype and scripty helpers require json | Joshua Peek | 2008-11-24 | 2 | -0/+2 |
| | | |||||
| * | prefer autoloaded html scanner | Joshua Peek | 2008-11-24 | 1 | -1/+0 |
| | | |||||
| * | prefer autoloading Mime::Type | Joshua Peek | 2008-11-24 | 1 | -2/+0 |
| | | |||||
| * | Autoload HTML::Document and sanitizers | Jeremy Kemper | 2008-11-23 | 2 | -20/+1 |
| | | |||||
| * | Use autoload instead of explicit requires for ActionController | Joshua Peek | 2008-11-23 | 1 | -2/+0 |
| | | |||||
| * | simplify console with helpers | Joshua Peek | 2008-11-23 | 1 | -0/+1 |
| | | |||||
| * | Add i18n for number_to_human_size() helper storage units. Translation key is ↵ | Yaroslav Markin | 2008-11-23 | 2 | -4/+4 |
| | | | | | | | | | | | | | | | | number.human.storage_units. [#1448 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | A back support for legacy TemplateHandler#render API | Joshua Peek | 2008-11-23 | 2 | -6/+27 |
| | | |||||
| * | use autoload instead of explicit requires for ActionView | Joshua Peek | 2008-11-23 | 6 | -55/+70 |
| | | |||||
| * | Added ActiveSupport::BacktraceCleaner and Rails::BacktraceCleaner for ↵ | David Heinemeier Hansson | 2008-11-22 | 1 | -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 Batalion | 2008-11-19 | 1 | -2/+2 |
| | | | | | | | | | | | | sufficient, not self Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net> | ||||
| * | Fixed asset host to not cache objects [#1419 state:resolved] | Aaron Batalion | 2008-11-19 | 1 | -29/+35 |
| | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Changed the default of ActionView#render to assume partials instead of files ↵ | David Heinemeier Hansson | 2008-11-19 | 2 | -7/+48 |
| | | | | | | | | when not given an options hash [DHH] | ||||
| * | Fix rendering html partial via inline render when with :js format [#1399 ↵ | Luke Melia | 2008-11-18 | 1 | -1/+2 |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Register 'checked' as an HTML boolean attribute. | Hongli Lai (Phusion) | 2008-11-18 | 1 | -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 Koziarski | 2008-11-18 | 4 | -7384/+0 |
| | | | | | | | | This was previously needed by define_javascript_functions which has been removed for a while. | ||||
| * | Remove mention of long-dead define_javascript_functions | Michael Koziarski | 2008-11-18 | 1 | -3/+0 |
| | | |||||
| * | Update Prototype to 1.6.0.3 and update script.aculo.us to 1.8.2 | Thomas Fuchs | 2008-11-18 | 4 | -520/+628 |
| | | |||||
| * | use :en as a default locale (in favor of :en-US) | Sven Fuchs | 2008-11-18 | 2 | -2/+2 |
| | | | | | | | | Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> | ||||
| * | Prevent assert_template failures when a render :inline is called before ↵ | Luke Melia | 2008-11-17 | 1 | -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 Hansson | 2008-11-17 | 1 | -81/+69 |
| | | | | | | | | they're available if you want to use textilize and markdown and let autoload require them [DHH] | ||||
| * | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-15 | 2 | -30/+30 |
| |\ | |||||
| | * | auto_link helper: add intelligent ending closing bracket handling. add new ↵ | Mislav Marohnić | 2008-11-15 | 1 | -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 URLs | Mislav Marohnić | 2008-11-15 | 1 | -26/+20 |
| | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> | ||||
| * | | Merge branch 'master' into testing | Jeremy Kemper | 2008-11-07 | 1 | -2/+2 |
| |\ \ | |||||
| * | | | Check whether last arg is a Hash instead of duck-typing against [] | Jeremy Kemper | 2008-11-07 | 1 | -4/+9 |
| | | | | |||||
| * | | | Move controller assertions from base TestCase to AC:: and AV::TestCase | Jeremy Kemper | 2008-11-07 | 1 | -1/+3 |
| | | | | |||||
* | | | | Tiny doc example change for escape_once() | Vincent Woo | 2008-11-26 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
* | | | | Fix markup for cattr_accessors in Action View and Action Mailer to work ↵ | Mike Gunderloy | 2008-11-16 | 2 | -2/+8 |
| |_|/ |/| | | | | | | | | better with RDoc 2+. | ||||
* | | | Tag helper should output an attribute with the value 'false' instead of ↵ | Hongli Lai (Phusion) | 2008-11-13 | 1 | -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 Kemper | 2008-11-07 | 1 | -4/+9 |
| |/ |/| | |||||
* | | auto_link view helper was failing on URLs with colons after a query param | Rich Manalang | 2008-11-07 | 1 | -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 Dobriakov | 2008-11-04 | 1 | -4/+10 |
| | | | | | | brackets [#1238 state:committed] Signed-off-by: David Heinemeier Hansson <david@loudthinking.com> |