aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
Commit message (Expand)AuthorAgeFilesLines
* Merge remote branch 'mainstream/master'Pratik Naik2010-01-3139-1905/+628
|\
| * 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 s...Erik St. Martin2010-01-304-50/+70
| * 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
| * Move link_to_function and link_to_remote into prototype_legacy_helperJoshua Peek2010-01-306-348/+82
| * 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
| * Revert "Add rails.js driver to default source list"Joshua Peek2010-01-301-1/+1
| * Revert "fixed tests to also look for rails.js when using javascript_include_t...Joshua Peek2010-01-301-7/+7
| * 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 :defa...Erik St. Martin2010-01-291-7/+7
| * 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
* | Merge remote branch 'mainstream/master'Pratik Naik2010-01-2843-1069/+1506
|\|
| * updated tests + docs, plus minor inconsistency fixesStefan Penner2010-01-272-138/+272
| * tests + docsStefan Penner2010-01-271-62/+90
| * observe_form now supports :with option as it shouldErik St. Martin2010-01-271-0/+10
| * Added regression tests that discovered the previous issue. Stefan Penner2010-01-271-0/+14
| * :href should be comming in through html_options and not optionsErik St. Martin2010-01-272-2/+2
| * removing container inline js function of observed elements :function callbackErik St. Martin2010-01-272-7/+10
| * moving html_safe call into helpers directly as they only work from that levelErik St. Martin2010-01-271-4/+4
| * periodically_call_remote does not need data-observe=trueErik St. Martin2010-01-272-2/+5
| * need to tell erb that our <script> tag is html_safeErik St. Martin2010-01-271-1/+1
| * test to go with last commit, explicit :href for link_to_remoteErik St. Martin2010-01-271-0/+5
| * adding :href override to link_to_remoteErik St. Martin2010-01-271-1/+3
| * adding support for :disable_with to button_to_remoteErik St. Martin2010-01-271-0/+4
| * fix duplidate data-submit attribute, submit_to_remote should test urlStephen St. Martin2010-01-272-3/+3
| * remote_form_for now supports :confirmErik St. Martin2010-01-271-0/+5
| * account for the fact a few options may be passed as symbols and need to be co...Erik St. Martin2010-01-272-4/+17
| * add missing call to set_with_and_condition_attributes for form_remote_tagStephen St. Martin2010-01-271-0/+1
| * removing Prototype inline js for attributes for :with and :condition, it now ...Erik St. Martin2010-01-272-20/+38
| * refactor params and with into copat moduleStephen St. Martin2010-01-271-13/+26
| * add missing test for :with option to link_to_remoteStephen St. Martin2010-01-271-0/+6
| * fixing last merge breakageErik St. Martin2010-01-272-13/+0