Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-31 | 39 | -1905/+628 |
|\ | | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb | ||||
| * | Improve missing template error messages a little bit. | José Valim | 2010-01-31 | 3 | -8/+13 |
| | | |||||
| * | Add rel=nofollow on non get remote links | Joshua Peek | 2010-01-30 | 2 | -3/+3 |
| | | |||||
| * | Generate UJS code for :disable_with | Joshua Peek | 2010-01-30 | 3 | -17/+4 |
| | | |||||
| * | updating link_to and button_to to support :remote => true and other options ↵ | Erik St. Martin | 2010-01-30 | 4 | -50/+70 |
| | | | | | | | | | | | | such as :confirm in a unobtrusive manor Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | Include prototype ujs adapter with new apps | Joshua Peek | 2010-01-30 | 2 | -9/+8 |
| | | |||||
| * | Reorg options_for_javascript and array_or_string_for_javascript | Joshua Peek | 2010-01-30 | 3 | -17/+17 |
| | | |||||
| * | Move button_to_function to prototype helper | Joshua Peek | 2010-01-30 | 2 | -33/+33 |
| | | |||||
| * | Unused JAVASCRIPT_PATH const | Joshua Peek | 2010-01-30 | 1 | -4/+0 |
| | | |||||
| * | Move scripty JSG helpers into scriptaculous_helper.rb | Joshua Peek | 2010-01-30 | 2 | -26/+32 |
| | | |||||
| * | Move form_remote_tag and remote_form_for into prototype_legacy_helper | Joshua Peek | 2010-01-30 | 4 | -265/+18 |
| | | |||||
| * | Move button_to_remote and submit_to_remote into prototype_legacy_helper | Joshua Peek | 2010-01-30 | 2 | -56/+0 |
| | | | | | | | | plugin | ||||
| * | Move link_to_function and link_to_remote into prototype_legacy_helper | Joshua Peek | 2010-01-30 | 6 | -348/+82 |
| | | | | | | | | plugin | ||||
| * | Drop AjaxHelper | Joshua Peek | 2010-01-30 | 3 | -183/+0 |
| | | |||||
| * | Move periodically_call_remote into prototype_legacy_helper plugin | Joshua Peek | 2010-01-30 | 2 | -47/+0 |
| | | |||||
| * | Move observe_field and observe_form to prototype_legacy_helper plugin | Joshua Peek | 2010-01-30 | 2 | -191/+35 |
| | | |||||
| * | Revert "Merge branch 'rails/master' into ujs" | Joshua Peek | 2010-01-30 | 13 | -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 Peek | 2010-01-30 | 1 | -1/+1 |
| | | | | | | | | This reverts commit 8a46e1182e3fce36aee5e6cb65737c4e755bbced. | ||||
| * | Revert "fixed tests to also look for rails.js when using ↵ | Joshua Peek | 2010-01-30 | 1 | -7/+7 |
| | | | | | | | | | | | | javascript_include_tag :defaults" This reverts commit 7f181e475080924164b3fa0071ee4898bd66cbb8. | ||||
| * | Deprecation notice for TestResponse#redirected_to | Joshua Peek | 2010-01-30 | 1 | -0/+5 |
| | | |||||
| * | Bring helpers_dir deprecation back. | José Valim | 2010-01-30 | 2 | -11/+12 |
| | | |||||
| * | Fix some backward incompatible behavior on AM. | José Valim | 2010-01-30 | 5 | -29/+32 |
| | | |||||
| * | Deprecate link_to :popup | Joshua Peek | 2010-01-29 | 3 | -59/+8 |
| | | |||||
| * | fixed tests to also look for rails.js when using javascript_include_tag ↵ | Erik St. Martin | 2010-01-29 | 1 | -7/+7 |
| | | | | | | | | :defaults | ||||
| * | Add rails.js driver to default source list | Joshua Peek | 2010-01-29 | 1 | -1/+1 |
| | | |||||
| * | Added :format and :locale options to render. | José Valim | 2010-01-29 | 2 | -2/+50 |
| | | |||||
| * | Fix rendering of layouts. | José Valim | 2010-01-29 | 3 | -9/+5 |
| | | |||||
| * | Get rid of AM warnings in AP test suite. | José Valim | 2010-01-29 | 1 | -2/+2 |
| | | |||||
| * | ActionMailer should depend just on AbstractController. | José Valim | 2010-01-29 | 8 | -175/+167 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-28 | 43 | -1069/+1506 |
|\| | | | | | | | | | Conflicts: railties/lib/rails/railtie.rb | ||||
| * | updated tests + docs, plus minor inconsistency fixes | Stefan Penner | 2010-01-27 | 2 | -138/+272 |
| | | |||||
| * | tests + docs | Stefan Penner | 2010-01-27 | 1 | -62/+90 |
| | | |||||
| * | observe_form now supports :with option as it should | Erik St. Martin | 2010-01-27 | 1 | -0/+10 |
| | | |||||
| * | Added regression tests that discovered the previous issue. | Stefan Penner | 2010-01-27 | 1 | -0/+14 |
| | | |||||
| * | :href should be comming in through html_options and not options | Erik St. Martin | 2010-01-27 | 2 | -2/+2 |
| | | |||||
| * | removing container inline js function of observed elements :function callback | Erik St. Martin | 2010-01-27 | 2 | -7/+10 |
| | | |||||
| * | moving html_safe call into helpers directly as they only work from that level | Erik St. Martin | 2010-01-27 | 1 | -4/+4 |
| | | |||||
| * | periodically_call_remote does not need data-observe=true | Erik St. Martin | 2010-01-27 | 2 | -2/+5 |
| | | |||||
| * | need to tell erb that our <script> tag is html_safe | Erik St. Martin | 2010-01-27 | 1 | -1/+1 |
| | | |||||
| * | test to go with last commit, explicit :href for link_to_remote | Erik St. Martin | 2010-01-27 | 1 | -0/+5 |
| | | |||||
| * | adding :href override to link_to_remote | Erik St. Martin | 2010-01-27 | 1 | -1/+3 |
| | | |||||
| * | adding support for :disable_with to button_to_remote | Erik St. Martin | 2010-01-27 | 1 | -0/+4 |
| | | |||||
| * | fix duplidate data-submit attribute, submit_to_remote should test url | Stephen St. Martin | 2010-01-27 | 2 | -3/+3 |
| | | |||||
| * | remote_form_for now supports :confirm | Erik St. Martin | 2010-01-27 | 1 | -0/+5 |
| | | |||||
| * | account for the fact a few options may be passed as symbols and need to be ↵ | Erik St. Martin | 2010-01-27 | 2 | -4/+17 |
| | | | | | | | | converted to string | ||||
| * | add missing call to set_with_and_condition_attributes for form_remote_tag | Stephen St. Martin | 2010-01-27 | 1 | -0/+1 |
| | | |||||
| * | removing Prototype inline js for attributes for :with and :condition, it now ↵ | Erik St. Martin | 2010-01-27 | 2 | -20/+38 |
| | | | | | | | | is free form js that can be placed there, also moved :submit out into AjaxHelper, updated tests to reflect changes | ||||
| * | refactor params and with into copat module | Stephen St. Martin | 2010-01-27 | 1 | -13/+26 |
| | | |||||
| * | add missing test for :with option to link_to_remote | Stephen St. Martin | 2010-01-27 | 1 | -0/+6 |
| | | |||||
| * | fixing last merge breakage | Erik St. Martin | 2010-01-27 | 2 | -13/+0 |
| | |