Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into i18n-merge | Jeremy Kemper | 2008-07-17 | 15 | -77/+153 |
|\ | | | | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/form_options_helper.rb activerecord/lib/active_record/validations.rb | ||||
| * | Resolved conflict | David Heinemeier Hansson | 2008-07-16 | 31 | -928/+826 |
| |\ | |||||
| | * | Fixed template recompile logic [#630 state:resolved] | Stefan Kaes | 2008-07-16 | 1 | -22/+31 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| | * | Merge with docrails. | Pratik Naik | 2008-07-16 | 12 | -30/+85 |
| | | | |||||
| | * | Removed config.action_view.cache_template_loading, use config.cache_classes ↵ | Joshua Peek | 2008-07-15 | 3 | -8/+17 |
| | | | | | | | | | | | | instead | ||||
| | * | JavaScriptGenerator should only sets output_buffer for the duration of the ↵ | Jeremy Kemper | 2008-07-15 | 2 | -10/+12 |
| | | | | | | | | | | | | update block | ||||
| * | | Fixed that AssetTagHelper#compute_public_path shouldn't cache the asset_host ↵ | David Heinemeier Hansson | 2008-07-16 | 1 | -11/+14 |
| | | | | | | | | | | | | along with the source or per-request proc's won't run [DHH] | ||||
* | | | moving country helpers from form_options_helper to form_country_helper again | Sven Fuchs | 2008-07-16 | 2 | -81/+14 |
| | | | |||||
* | | | fixing another timezone dependent test | Sven Fuchs | 2008-07-16 | 1 | -1/+1 |
| | | | |||||
* | | | merge forward to current rails/master | Sven Fuchs | 2008-07-16 | 28 | -993/+866 |
|\ \ \ | | |/ | |/| | |||||
| * | | Get buffer for fragment cache from template's @output_buffer | Joshua Peek | 2008-07-15 | 6 | -215/+190 |
| | | | |||||
| * | | Ruby 1.9 compat: only eval with block.binding in 1.9, uses more memory than ↵ | Jeremy Kemper | 2008-07-15 | 1 | -6/+12 |
| | | | | | | | | | | | | eval with block | ||||
| * | | Ruby 1.9 compat: call Proc#binding explicitly. [#623 state:resolved] | 松田 明 | 2008-07-15 | 1 | -1/+1 |
| | | | |||||
| * | | memorize typo | Joshua Peek | 2008-07-14 | 3 | -10/+10 |
| | | | |||||
| * | | Include Memoizable in ActionView::Template | Joshua Peek | 2008-07-14 | 3 | -43/+27 |
| | | | |||||
| * | | Use sub instead of gsub | Tarmo Tänav | 2008-07-14 | 1 | -1/+1 |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | ||||
| * | | Eager load Partial variable_name and counter_name. Tidy up ↵ | Joshua Peek | 2008-07-14 | 4 | -45/+49 |
| | | | | | | | | | | | | render_partial_collection. | ||||
| * | | Move dead recompile_template? also | Jeremy Kemper | 2008-07-14 | 2 | -17/+2 |
| | | | |||||
| * | | Remove dead code from merge | Jeremy Kemper | 2008-07-14 | 1 | -30/+0 |
| | | | |||||
| * | | Fix bad merge | Jeremy Kemper | 2008-07-14 | 1 | -2/+2 |
| | | | |||||
| * | | Use instance_method(...) to check whether the method exists | Jeremy Kemper | 2008-07-14 | 1 | -2/+44 |
| | | | |||||
| * | | Ensure :index works with fields_for select methods. [#518 state:resolved] | rsl | 2008-07-14 | 1 | -4/+4 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Check first render format and extension. Fixes failing ActionMailer test. | Joshua Peek | 2008-07-13 | 1 | -1/+1 |
| | | | |||||
| * | | Made ActionView::Base#first_render a little more private. And added ↵ | Joshua Peek | 2008-07-13 | 3 | -7/+6 |
| | | | | | | | | | | | | _last_render to track the most recent render. Will fix #609 as a side effect. [#609 state:resolved] | ||||
| * | | Set config.action_view.warn_cache_misses = true to receive a warning if you ↵ | Joshua Peek | 2008-07-12 | 2 | -3/+32 |
| | | | | | | | | | | | | perform an action that results in an expensive disk operation that could be cached | ||||
| * | | Refactor template preloading. New abstractions include Renderable mixins and ↵ | Joshua Peek | 2008-07-12 | 12 | -447/+338 |
| | | | | | | | | | | | | a refactored Template class. | ||||
| * | | Ensure mail_to label is obfuscated for javascript encoding. [#294 ↵ | Johan Sørensen | 2008-07-12 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Changed ActionView::TemplateHandler#render API method signature to ↵ | Joshua Peek | 2008-07-11 | 4 | -6/+6 |
| | | | | | | | | | | | | render(template, local_assigns = {}) | ||||
| * | | Whitespace | Michael Koziarski | 2008-07-11 | 1 | -2/+1 |
| | | | |||||
| * | | Check for response in builder template since ActionMailer does not have one | Joshua Peek | 2008-07-11 | 1 | -1/+2 |
| | | | |||||
| * | | Put a newline rather than a semicolon at the end of RJS source to avoid ↵ | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | parse errors with embedded heredocs | ||||
| * | | Use ActionController::Base.logger to report template compilation errors ↵ | Jeremy Kemper | 2008-07-09 | 1 | -4/+4 |
| | | | | | | | | | | | | since there is no AV::Base.logger | ||||
| * | | Rendering default template for missing actions works with non-word ↵ | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | | | | | | | | | | characters in action name | ||||
| * | | Pass caller to concat deprecation warning | Jeremy Kemper | 2008-07-09 | 1 | -1/+1 |
| | | | |||||
| * | | Changed PrototypeHelper#submit_to_remote to PrototypeHelper#button_to_remote ↵ | David Heinemeier Hansson | 2008-07-09 | 1 | -3/+6 |
| | | | | | | | | | | | | to stay consistent with link_to_remote (submit_to_remote still works as an alias) (clemens) [#8994 status:closed] | ||||
| * | | Ensure url_for(nil) falls back to url_for({}). [#472 state:resolved] | Cheah Chu Yeow | 2008-07-09 | 1 | -4/+2 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Add :recursive option to javascript_include_tag and stylesheet_link_tag to ↵ | Damian Janowski | 2008-07-08 | 1 | -14/+42 |
| | | | | | | | | | | | | | | | | | | be used along with :all. [#480 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | ||||
| * | | Disable the Accept header by default | Michael Koziarski | 2008-07-07 | 1 | -7/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | The accept header is poorly implemented by browsers and causes strange errors when used on public sites where crawlers make requests too. You should use formatted urls (e.g. /people/1.xml) to support API clients. Alternatively to re-enable it you need to set: config.action_controller.use_accept_header = true A special case remains for ajax requests which will have a javascript format for the base resource (/people/1) if the X-Requested-With header is present. This lets ajax pages still use format.js despite there being no params[:format] | ||||
| * | | Added local assign keys to compiled method name so two threads evaluating ↵ | Joshua Peek | 2008-07-06 | 3 | -26/+9 |
| | | | | | | | | | | | | the same template with different locals don't step on top of each other | ||||
| * | | Synchronize template compiling | Joshua Peek | 2008-07-06 | 1 | -31/+34 |
| | | | |||||
| * | | Lookup compiled methods in CompiledTemplates instance methods set instead of ↵ | Joshua Peek | 2008-07-05 | 5 | -50/+30 |
| | | | | | | | | | | | | using a "methods_names" hash | ||||
| * | | Do not stat template files in production mode before rendering. You will no ↵ | Joshua Peek | 2008-07-05 | 2 | -29/+16 |
| | | | | | | | | | | | | longer be able to modify templates in production mode without restarting the server | ||||
| * | | Use the inline template's hash as a method key instead of relying on a counter | Joshua Peek | 2008-07-05 | 1 | -7/+2 |
| | | | |||||
| * | | Removed unused template_args variable | Joshua Peek | 2008-07-05 | 1 | -2/+0 |
| | | | |||||
| * | | Deprecated TemplateHandler line offset | Joshua Peek | 2008-07-05 | 4 | -74/+55 |
| | | | |||||
| * | | Ensure all complied method names are cleaned up in the error backtrace | Joshua Peek | 2008-07-05 | 1 | -1/+1 |
| | | | |||||
| * | | Moved complied method name logic into Renderable | Joshua Peek | 2008-07-05 | 4 | -23/+24 |
| | | | |||||
| * | | Renamed Renderer to Renderable | Joshua Peek | 2008-07-05 | 3 | -3/+3 |
| | | | |||||
| * | | Revert "Moved TemplateHandlers to Base" | Joshua Peek | 2008-07-03 | 4 | -9/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | This reverts commit 42d215a925a228778e43f7040f03ad8f3eb5341c. Conflicts: actionpack/lib/action_view/inline_template.rb actionpack/lib/action_view/template.rb | ||||
| * | | Allow date helpers to ignore date hidden field tags. [#503 state:resolved] | miloops | 2008-07-04 | 1 | -2/+5 |
| | | | | | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> |