Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-04 | 5 | -24/+10 |
|\ | | | | | | | | | Conflicts: railties/guides/source/3_0_release_notes.textile | ||||
| * | Move to 3.0.0.beta | David Heinemeier Hansson | 2010-02-03 | 1 | -1/+1 |
| | | |||||
| * | Add method and path to AC notifications. | José Valim | 2010-02-03 | 1 | -1/+3 |
| | | |||||
| * | Routing Mapper with % interpolation on Ruby 1.9.1 fixed [#3837 status:resolved] | Santiago Pastorino and José Ignacio Costa | 2010-02-02 | 1 | -2/+1 |
| | | | | | | | | Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
| * | Configuration values should be on AV::Base. | José Valim | 2010-02-02 | 1 | -17/+4 |
| | | |||||
| * | Modify the behavior of `radio_button_tag` to use `sanitize_to_id` for ↵ | Prem Sichanugrist | 2010-02-02 | 1 | -3/+1 |
| | | | | | | | | | | | | consistency [#1792 status:resolved] Signed-off-by: José Valim <jose.valim@gmail.com> | ||||
* | | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 5 | -109/+51 |
|\| | | | | | | | | | | | | | | | 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 API | Sam Ruby | 2010-02-02 | 1 | -105/+47 |
| | | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> | ||||
| * | Resolve view paths correctly on CygWin | Sam Ruby | 2010-02-02 | 1 | -1/+1 |
| | | | | | | | | Signed-off-by: Mikel Lindsaar <raasdnil@gmail.com> | ||||
| * | Merge branch 'master' of git://github.com/rails/rails | Mikel Lindsaar | 2010-02-02 | 36 | -182/+147 |
| |\ | |||||
| * | | Updating copyright dates on all licenses | Mikel Lindsaar | 2010-02-01 | 3 | -3/+3 |
| | | | |||||
* | | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-02-01 | 37 | -219/+235 |
|\ \ \ | | |/ | |/| | |||||
| * | | Merge branch 'master' of gitproxy:rails/rails | José Valim | 2010-02-01 | 13 | -40/+72 |
| |\ \ | |||||
| | * | | Convert to class_attribute | Jeremy Kemper | 2010-02-01 | 13 | -40/+72 |
| | | | | |||||
| * | | | Deprecate AC configuration values which were moved to Rack. | José Valim | 2010-02-01 | 1 | -6/+22 |
| |/ / | |||||
| * | | Add support for compile-time <%= raw %> | Yehuda Katz | 2010-01-31 | 1 | -1/+5 |
| | | | |||||
| * | | Deleted all references to ActionView::SafeBuffer in favor of ↵ | Santiago Pastorino | 2010-01-31 | 3 | -4/+2 |
| | | | | | | | | | | | | | | | | | | ActiveSupport::SafeBuffer Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | action_view/safe_buffer is no longer valid | Santiago Pastorino | 2010-01-31 | 1 | -1/+0 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | action_view is requiring the deleted action_view/erb/util.rb file | Santiago Pastorino | 2010-01-31 | 1 | -1/+0 |
| | | | | | | | | | | | | Signed-off-by: Yehuda Katz <wycats@Yehuda-Katz.local> | ||||
| * | | For performance reasons, you can no longer call html_safe! on Strings. ↵ | Yehuda Katz | 2010-01-31 | 21 | -131/+48 |
| |/ | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | UJS documentation. | Stefan Penner | 2010-01-31 | 3 | -33/+78 |
| | | |||||
| * | data-remote needs to be on the form and not the submit when using button_to ↵ | Erik St. Martin | 2010-01-31 | 1 | -1/+3 |
| | | | | | | | | :remote=>true | ||||
| * | add :remote option to form_tag | Stephen St. Martin | 2010-01-31 | 1 | -0/+1 |
| | | |||||
| * | form_for should pass :remote to form_tag through html_options | Stephen St. Martin | 2010-01-31 | 1 | -0/+2 |
| | | |||||
| * | Require ac/test_case from AV::TestCase | Joshua Peek | 2010-01-31 | 1 | -0/+2 |
| | | |||||
| * | deOMGifying Railties, Active Support, and Action Pack | Mikel Lindsaar | 2010-01-31 | 2 | -3/+2 |
| | | |||||
* | | Merge remote branch 'mainstream/master' | Pratik Naik | 2010-01-31 | 25 | -1254/+493 |
|\| | | | | | | | | | Conflicts: activemodel/lib/active_model/state_machine.rb | ||||
| * | Improve missing template error messages a little bit. | José Valim | 2010-01-31 | 2 | -7/+12 |
| | | |||||
| * | Add rel=nofollow on non get remote links | Joshua Peek | 2010-01-30 | 1 | -1/+1 |
| | | |||||
| * | Generate UJS code for :disable_with | Joshua Peek | 2010-01-30 | 2 | -14/+1 |
| | | |||||
| * | updating link_to and button_to to support :remote => true and other options ↵ | Erik St. Martin | 2010-01-30 | 2 | -38/+51 |
| | | | | | | | | | | | | 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 | 1 | -1/+1 |
| | | |||||
| * | 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 | 1 | -109/+0 |
| | | |||||
| * | Move button_to_remote and submit_to_remote into prototype_legacy_helper | Joshua Peek | 2010-01-30 | 1 | -38/+0 |
| | | | | | | | | plugin | ||||
| * | Move link_to_function and link_to_remote into prototype_legacy_helper | Joshua Peek | 2010-01-30 | 3 | -248/+48 |
| | | | | | | | | plugin | ||||
| * | Drop AjaxHelper | Joshua Peek | 2010-01-30 | 2 | -69/+0 |
| | | |||||
| * | Move periodically_call_remote into prototype_legacy_helper plugin | Joshua Peek | 2010-01-30 | 1 | -35/+0 |
| | | |||||
| * | Move observe_field and observe_form to prototype_legacy_helper plugin | Joshua Peek | 2010-01-30 | 1 | -154/+35 |
| | | |||||
| * | Revert "Merge branch 'rails/master' into ujs" | Joshua Peek | 2010-01-30 | 7 | -770/+586 |
| | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | Deprecation notice for TestResponse#redirected_to | Joshua Peek | 2010-01-30 | 1 | -0/+5 |
| | | |||||
| * | Bring helpers_dir deprecation back. | José Valim | 2010-01-30 | 1 | -0/+2 |
| | | |||||
| * | Fix some backward incompatible behavior on AM. | José Valim | 2010-01-30 | 5 | -29/+32 |
| | | |||||
| * | Deprecate link_to :popup | Joshua Peek | 2010-01-29 | 2 | -29/+8 |
| | | |||||
| * | 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 | 1 | -1/+10 |
| | |