aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-026-110/+52
|\ | | | | | | | | | | | | | | Conflicts: activemodel/README activemodel/lib/active_model/errors.rb activemodel/lib/active_model/serialization.rb railties/guides/source/3_0_release_notes.textile
| * Make rdoc match current APISam Ruby2010-02-021-105/+47
| | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com>
| * Resolve view paths correctly on CygWinSam Ruby2010-02-021-1/+1
| | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com>
| * Merge branch 'master' of git://github.com/rails/railsMikel Lindsaar2010-02-0246-266/+193
| |\
| * | Updating copyright dates on all licensesMikel Lindsaar2010-02-014-4/+4
| | |
* | | Merge remote branch 'mainstream/master'Pratik Naik2010-02-0157-349/+359
|\ \ \ | | |/ | |/|
| * | Merge branch 'master' of gitproxy:rails/railsJosé Valim2010-02-0114-42/+74
| |\ \
| | * | Convert to class_attributeJeremy Kemper2010-02-0114-42/+74
| | | |
| * | | Deprecate AC configuration values which were moved to Rack.José Valim2010-02-011-6/+22
| |/ /
| * | Add support for compile-time <%= raw %>Yehuda Katz2010-01-312-23/+39
| | |
| * | Deleted all references to ActionView::SafeBuffer in favor of ↵Santiago Pastorino2010-01-314-45/+2
| | | | | | | | | | | | | | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | action_view/safe_buffer is no longer validSantiago Pastorino2010-01-311-1/+0
| | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | action_view is requiring the deleted action_view/erb/util.rb fileSantiago Pastorino2010-01-311-1/+0
| | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local>
| * | For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-3128-141/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Instead, all Strings are always not html_safe?. Instead, you can get a SafeBuffer from a String by calling #html_safe, which will SafeBuffer.new(self). * Additionally, instead of doing concat("</form>".html_safe), you can do safe_concat("</form>"), which will skip both the flag set, and the flag check. * For the first pass, I converted virtually all #html_safe!s to #html_safe, and the tests pass. A further optimization would be to try to use #safe_concat as much as possible, reducing the performance impact if we know up front that a String is safe.
| * | Get rails tests running on bundler 0.9Carl Lerche2010-01-311-10/+1
| |/
| * UJS documentation.Stefan Penner2010-01-313-33/+78
| |
| * data-remote needs to be on the form and not the submit when using button_to ↵Erik St. Martin2010-01-312-1/+10
| | | | | | | | :remote=>true
| * add :remote option to form_tagStephen St. Martin2010-01-312-0/+7
| |
| * form_for should pass :remote to form_tag through html_optionsStephen St. Martin2010-01-312-0/+21
| |
| * Require ac/test_case from AV::TestCaseJoshua Peek2010-01-311-0/+2
| |
| * deOMGifying Railties, Active Support, and Action PackMikel Lindsaar2010-01-3111-49/+48
| |
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-3139-1905/+628
|\| | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb
| * Improve missing template error messages a little bit.José Valim2010-01-313-8/+13
| |
| * Add rel=nofollow on non get remote linksJoshua Peek2010-01-302-3/+3
| |
| * Generate UJS code for :disable_withJoshua Peek2010-01-303-17/+4
| |
| * updating link_to and button_to to support :remote => true and other options ↵Erik St. Martin2010-01-304-50/+70
| | | | | | | | | | | | such as :confirm in a unobtrusive manor Signed-off-by: Joshua Peek <josh@joshpeek.com>
| * Include prototype ujs adapter with new appsJoshua Peek2010-01-302-9/+8
| |
| * Reorg options_for_javascript and array_or_string_for_javascriptJoshua Peek2010-01-303-17/+17
| |
| * Move button_to_function to prototype helperJoshua Peek2010-01-302-33/+33
| |
| * Unused JAVASCRIPT_PATH constJoshua Peek2010-01-301-4/+0
| |
| * Move scripty JSG helpers into scriptaculous_helper.rbJoshua Peek2010-01-302-26/+32
| |
| * Move form_remote_tag and remote_form_for into prototype_legacy_helperJoshua Peek2010-01-304-265/+18
| |
| * Move button_to_remote and submit_to_remote into prototype_legacy_helperJoshua Peek2010-01-302-56/+0
| | | | | | | | plugin
| * Move link_to_function and link_to_remote into prototype_legacy_helperJoshua Peek2010-01-306-348/+82
| | | | | | | | plugin
| * Drop AjaxHelperJoshua Peek2010-01-303-183/+0
| |
| * Move periodically_call_remote into prototype_legacy_helper pluginJoshua Peek2010-01-302-47/+0
| |
| * Move observe_field and observe_form to prototype_legacy_helper pluginJoshua Peek2010-01-302-191/+35
| |
| * Revert "Merge branch 'rails/master' into ujs"Joshua Peek2010-01-3013-1241/+912
| | | | | | | | | | | | | | | | | | | | | | 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
| * Revert "Add rails.js driver to default source list"Joshua Peek2010-01-301-1/+1
| | | | | | | | This reverts commit 8a46e1182e3fce36aee5e6cb65737c4e755bbced.
| * Revert "fixed tests to also look for rails.js when using ↵Joshua Peek2010-01-301-7/+7
| | | | | | | | | | | | javascript_include_tag :defaults" This reverts commit 7f181e475080924164b3fa0071ee4898bd66cbb8.
| * Deprecation notice for TestResponse#redirected_toJoshua Peek2010-01-301-0/+5
| |
| * Bring helpers_dir deprecation back.José Valim2010-01-302-11/+12
| |
| * Fix some backward incompatible behavior on AM.José Valim2010-01-305-29/+32
| |
| * Deprecate link_to :popupJoshua Peek2010-01-293-59/+8
| |
| * fixed tests to also look for rails.js when using javascript_include_tag ↵Erik St. Martin2010-01-291-7/+7
| | | | | | | | :defaults
| * Add rails.js driver to default source listJoshua Peek2010-01-291-1/+1
| |
| * Added :format and :locale options to render.José Valim2010-01-292-2/+50
| |
| * Fix rendering of layouts.José Valim2010-01-293-9/+5
| |
| * Get rid of AM warnings in AP test suite.José Valim2010-01-291-2/+2
| |
| * ActionMailer should depend just on AbstractController.José Valim2010-01-298-175/+167
| |