aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view
Commit message (Collapse)AuthorAgeFilesLines
...
| * | Merge branch 'master' of git@github.com:rails/railsJeremy Kemper2009-05-185-9/+17
| |\|
| | * Ensure number_to_human_size does not strip zeros from the end [#1763 ↵Travis Briggs2009-05-171-1/+6
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Ensure auto_link does not ignore multiple trailing punctuations [#2504 ↵Lance Ivy2009-05-171-6/+7
| | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
| | * Fix ActionMailer Symbol#to_proc instanceYehuda Katz2009-05-161-1/+1
| | |
| * | Active Support dependenciesJeremy Kemper2009-05-141-0/+1
| | |
* | | Fixed a typoThomas R. Koll2009-05-241-2/+2
| | | | | | | | | | | | Writing "form element" instead of "FORM element"
* | | Merge commit 'mainstream/master'Pratik Naik2009-05-1510-23/+46
|\ \ \ | | |/ | |/| | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_helper.rb
| * | Allow strings to be sent as collection to select.José Valim2009-05-151-0/+2
| | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com>
| * | Cleaning up more render testsYehuda Katz + Carl Lerche2009-05-141-1/+1
| |/
| * Cherry-pick core extensionsJeremy Kemper2009-05-133-4/+9
| |
| * Implemented redirects and partial rendering in new base.Yehuda Katz + Carl Lerche2009-05-122-12/+25
| |
| * Merge branch 'master' into wip_abstract_controllerYehuda Katz + Carl Lerche2009-05-111-1/+1
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/abstract/callbacks.rb actionpack/lib/action_controller/abstract/renderer.rb actionpack/lib/action_controller/base/base.rb actionpack/lib/action_controller/dispatch/dispatcher.rb actionpack/lib/action_controller/routing/route_set.rb actionpack/lib/action_controller/testing/process.rb actionpack/test/abstract_controller/layouts_test.rb actionpack/test/controller/filters_test.rb actionpack/test/controller/helper_test.rb actionpack/test/controller/render_test.rb actionpack/test/new_base/test_helper.rb
| * | Ported ConditionalGet to new BaseYehuda Katz + Carl Lerche2009-05-111-0/+2
| | |
| * | More community code review :)Yehuda Katz2009-05-111-0/+2
| | |
| * | Support implicit and explicit content typesYehuda Katz + Carl Lerche2009-05-011-2/+1
| |/
| * Move generic assertions into ActionDispatchJoshua Peek2009-04-301-1/+1
| |
* | Some spelling changes.Evan Farrar2009-05-074-9/+9
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-04-309-218/+135
|\|
| * Deprecate template, session, assigns, and layout accessors on response ↵Joshua Peek2009-04-283-4/+5
| | | | | | | | object. Instead access them through the controller instance. This mainly affects functional test assertions.
| * Fixes ActionMailer to work with the ActionView refactoringYehuda Katz + Carl Lerche2009-04-271-151/+1
| |
| * Refactor ActionView::TemplateYehuda Katz + Carl Lerche2009-04-278-189/+257
| | | | | | | | | | | | | | | | ActionView::Template is now completely independent from template storage, which allows different back ends such as the database. ActionView::Template's only responsibility is to take in the template source (passed in from ActionView::Path), compile it, and render it.
| * Now that we have a separate internal rails_to_json, use a separate circular ↵Jeremy Kemper2009-04-261-2/+2
| | | | | | | | reference stack instead of sticking it in the options hash
| * Use javascript_object_forJeremy Kemper2009-04-261-1/+1
| |
| * Only Object to_json alias is needed. Prefer nil options.Jeremy Kemper2009-04-261-2/+0
| |
| * Qualify toplevel constant references since we're in a BasicObjectJeremy Kemper2009-04-261-7/+7
| |
* | fixes an example from the previous commitXavier Noria2009-04-271-2/+2
| |
* | adds timestamps in examples of generated asset paths, and documents this bit ↵Xavier Noria2009-04-271-69/+72
| | | | | | | | in a few helpers
* | Merge commit 'mainstream/master'Pratik Naik2009-04-239-75/+127
|\|
| * * Add pluggable JSON backends with support for the JSON gem. [rick]rick2009-04-232-12/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Example: ActiveSupport::JSON.backend = "JSONGem" All internal Rails JSON encoding is now handled by ActiveSupport::JSON.encode(). Use of #to_json is not recommended, as it may clash with other libraries that overwrite it. However, you can recover Rails specific functionality if you really want to use #to_json. gem 'json' ActiveSupport::JSON.backend = "JSONGem" class ActiveRecord::Base alias to_json rails_to_json end
| * Refactor ActionView::PathYehuda Katz + Carl Lerche2009-04-226-63/+111
| | | | | | | | | | | | | | | | * Decouple from ActionController and ActionMailer * Bring back localization support. * Prepare to decouple templates from the filesystem. * Prepare to decouple localization from ActionView * Fix ActionMailer to take advantage of ActionView::Path
| * Fix tests on 1.9Jeremy Kemper2009-04-221-0/+2
| |
* | Merge commit 'mainstream/master'Pratik Naik2009-04-231-0/+1
|\|
| * Opt in to DependenciesJeremy Kemper2009-04-221-0/+1
| |
| * Merge docrailslifo2009-04-172-4/+4
| |
* | Replaced TimeZone references by ActiveSupport::TimeZoneJosé Valim2009-04-181-21/+21
| |
* | Merge commit 'mainstream/master'lifo2009-04-1722-604/+633
|\| | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb railties/guides/source/caching_with_rails.textile
| * Make more Template methods public to make ActionMailer tests passCarl Lerche & Yehuda Katz2009-04-161-8/+8
| |
| * Makes rails-dev-boost work againCarl Lerche & Yehuda Katz2009-04-144-106/+110
| |
| * Move all Templates methods not used by other class into private toCarl Lerche & Yehuda Katz2009-04-141-87/+88
| | | | | | | | define surface area of the class.
| * Resurrecting 1.9 compatibility.Carl Lerche & Yehuda Katz2009-04-131-1/+1
| |
| * Bring abstract_controller up to date with rails/masterCarl Lerche & Yehuda Katz2009-04-1318-156/+563
| |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Resolved all the conflicts since 2.3.0 -> HEAD. Following is a list of commits that could not be applied cleanly or are obviated with the abstract_controller refactor. They all need to be revisited to ensure that fixes made in 2.3 do not reappear in 3.0: 2259ecf368e6a6715966f69216e3ee86bf1a82a7 AR not available * This will be reimplemented with ActionORM or equivalent 06182ea02e92afad579998aa80144588e8865ac3 implicitly rendering a js response should not use the default layout [#1844 state:resolved] * This will be handled generically 893e9eb99504705419ad6edac14d00e71cef5f12 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved] * We will need to reimplement rails-dev-boost on top of the refactor; the changes here are very implementation specific and cannot be cleanly applied. The following commits are implicated: 199e750d46c04970b5e7684998d09405648ecbd4 3942cb406e1d5db0ac00e03153809cc8dc4cc4db f8ea9f85d4f1e3e6f3b5d895bef6b013aa4b0690 e3b166aab37ddc2fbab030b146eb61713b91bf55 ae9f258e03c9fd5088da12c1c6cd216cc89a01f7 44423126c6f6133a1d9cf1d0832b527e8711d40f 0cb020b4d6d838025859bd60fb8151c8e21b8e84 workaround for picking layouts based on wrong view_paths [#1974 state:resolved] * The specifics of this commit no longer apply. Since it is a two-line commit, we will reimplement this change. 8c5cc66a831aadb159f3daaffa4208064c30af0e make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved] * This does not apply at all. It should be trivial to apply the feature to the reimplemented ActionController::Base. 87e8b162463f13bd50d27398f020769460a770e3 fix HTML fallback for explicit templates [#2052 state:resolved] * There were a number of patches related to this that simply compounded each other. Basically none of them apply cleanly, and the underlying issue needs to be revisited. After discussing the underlying problem with Koz, we will defer these fixes for further discussion.
| | * Object names with underscore do the wrong lookup in I18n on error_messages_for.José Valim2009-04-051-1/+1
| | | | | | | | | | | | | | | Signed-off-by: Michael Koziarski <michael@koziarski.com> [#2390 state:committed]
| * | Updated old AC::Base for small changes to AVYehuda Katz and Carl Lerche2009-04-082-2/+3
| | |
| * | In the middle of some refactoring... some fails due to changes in ↵Yehuda Katz and Carl Lerche2009-03-231-0/+9
| | | | | | | | | | | | AbstractController not yet reflected in ActionController tests
| * | Add a bunch of tests for various render :action, layout combinationsYehuda Katz2009-03-231-0/+3
| | |
| * | Working on being able to render :text with layoutsCarl Lerche2009-03-234-5/+19
| | |
| * | AbstractController now supports layouts and renderingYehuda Katz2009-02-271-1/+1
| | |
| * | First, very early, AbstractController code. More to comeYehuda Katz2009-02-241-0/+2
| | |
| * | Merge commit 'rails/3-0-unstable'Yehuda Katz2009-01-3017-238/+337
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: actionpack/lib/action_controller/base.rb actionpack/lib/action_dispatch/http/mime_type.rb actionpack/lib/action_dispatch/http/request.rb actionpack/lib/action_view/base.rb actionpack/lib/action_view/paths.rb actionpack/test/controller/session/cookie_store_test.rb actionpack/test/dispatch/rack_test.rb actionpack/test/dispatch/request_test.rb
| | * | Reorganize ActionController folder structureJoshua Peek2009-01-271-0/+28
| | | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-05 02:17:09 +0000