Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | Merge branch 'master' into sprockets | Joshua Peek | 2011-03-30 | 3 | -4/+22 | |
|\| | | | | | | | | | Conflicts: railties/lib/rails/application/configuration.rb | |||||
| * | Remove 'warning: ambiguous first argument' when running ActionPack tests | Sebastian Martinez | 2011-03-29 | 1 | -2/+2 | |
| | | | | | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
| * | Fix alias_method, add test | David Heinemeier Hansson | 2011-03-27 | 1 | -0/+1 | |
| | | ||||||
| * | Allow FormHelper#form_for to specify the :method as a direct option instead ↵ | David Heinemeier Hansson | 2011-03-26 | 1 | -2/+19 | |
| | | | | | | | | of through the :html hash [DHH] | |||||
* | | Seperate asset directories | Joshua Peek | 2011-03-29 | 1 | -15/+18 | |
| | | ||||||
* | | Tests for SprocketsHelper | Joshua Peek | 2011-03-29 | 1 | -0/+93 | |
|/ | ||||||
* | SJIS is an alias to Windows-31J in ruby trunk. Use SHIFT_JIS for this test | Aaron Patterson | 2011-03-21 | 1 | -2/+2 | |
| | ||||||
* | [action_view] added custom patterns to template resolver | Chris Kowalik | 2011-03-20 | 1 | -0/+31 | |
| | ||||||
* | fixes an issue with number_to_human when converting values which are less ↵ | Josh Kalderimis | 2011-03-16 | 1 | -1/+3 | |
| | | | | | | than 1 but greater than -1 [#6576 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | added failing test for fields_for with a record object that inherits from Hash | Diego Carrion | 2011-03-06 | 1 | -0/+19 | |
| | | | | Signed-off-by: Andrew White <andyw@pixeltrix.co.uk> | |||||
* | Action Pack typos. | R.T. Lechow | 2011-03-05 | 1 | -1/+1 | |
| | ||||||
* | Add an option to FormBuilder to omit hidden field with id | Alexander Uvarov | 2011-03-04 | 1 | -0/+135 | |
| | | | | | | [#4551 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | use a subclass of AS::TZ for testing html output | Aaron Patterson | 2011-02-28 | 1 | -4/+11 | |
| | ||||||
* | updated Time, Date and DateTime current methods in AS to use Time.zone and ↵ | Josh Kalderimis | 2011-02-28 | 1 | -2/+2 | |
| | | | | | | not Time.zone_default. [#6410 state:committed] | |||||
* | javascript_include_tag shouldn't raise if you register an expansion key with ↵ | Santiago Pastorino | 2011-02-28 | 1 | -2/+10 | |
| | | | | nil value | |||||
* | Add tests for register expansion methods with key = [] | Santiago Pastorino | 2011-02-28 | 1 | -2/+12 | |
| | ||||||
* | Allow for the format of time_tag in AP to be changed via an option argument. | Josh Kalderimis | 2011-02-12 | 1 | -5/+11 | |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved] | Sjoerd Andringa | 2011-02-12 | 1 | -1/+21 | |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Applied changes to stylesheet_link_tag from javascript_include_tag which ↵ | Josh Kalderimis | 2011-02-13 | 1 | -0/+23 | |
| | | | | corrects issues with ordering and duplicates. | |||||
* | This corrects two issues with javascript_include_tag, the order at which ↵ | Josh Kalderimis | 2011-02-13 | 1 | -1/+24 | |
| | | | | | | | | they are expanded, and removing duplicates. When individual js assets are specified, they will override the order of the same asset specified in an expansion. [#5938 state:resolved] | |||||
* | Remove duplicated action pack tests added to fix issue with fields_for, ↵ | Carlos Antonio da Silva | 2011-02-12 | 1 | -42/+0 | |
| | | | | | | nested attributes and erb Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Add block support to button_tag helper | Tom Stuart | 2011-02-12 | 1 | -0/+9 | |
| | | | | | | | | | | | | | | | | | | | As per the HTML 4.01 spec: Buttons created with the BUTTON element function just like buttons created with the INPUT element, but they offer richer rendering possibilities: the BUTTON element may have content. For example, a BUTTON element that contains an image functions like and may resemble an INPUT element whose type is set to "image", but the BUTTON element type allows content. Since rich content is the main purpose of the <button> element, it makes sense for the button_tag helper to accept a block. http://www.w3.org/TR/html401/interact/forms.html#edef-BUTTON http://dev.w3.org/html5/spec/the-button-element.html#the-button-element Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com> | |||||
* | Make type="submit" the default for button_tag helper | Tom Stuart | 2011-02-12 | 1 | -1/+8 | |
| | | | | | | | | | | | | "submit" is the default value of the <button> element's type attribute according to the HTML 4.01 and the HTML5 draft specs, so if button_tag is going to have a default, type="submit" is a more sensible choice than type="button". http://www.w3.org/TR/html401/interact/forms.html#adef-type-BUTTON http://dev.w3.org/html5/spec/the-button-element.html#attr-button-type Signed-off-by: Santiago Pastorino and Emilio Tagua <santiago+emilioe@wyeworks.com> | |||||
* | Removed Array#safe_join in AS core_ext and moved it to a view helper with ↵ | Josh Kalderimis | 2011-02-10 | 2 | -21/+30 | |
| | | | | | | the same same. This also changes how safe_join works, if items or the separator are not html_safe they are html_escape'd, a html_safe string is always returned. Signed-off-by: José Valim <jose.valim@gmail.com> | |||||
* | Revert "Removed Array#safe_join in AS core_ext and moved it to a view helper ↵ | José Valim | 2011-02-10 | 2 | -55/+21 | |
| | | | | | | | | with the same same." Applied the wrong version. This reverts commit 98c0c5db50a7679b3d58769ac22cb0a27a62c930. | |||||
* | Removed Array#safe_join in AS core_ext and moved it to a view helper with ↵ | Josh Kalderimis | 2011-02-10 | 2 | -21/+55 | |
| | | | | the same same. | |||||
* | Use Mime::Type references. | José Valim | 2011-02-08 | 1 | -1/+1 | |
| | ||||||
* | Be sure to javascript_escape the email address to prevent apostrophes ↵ | Michael Koziarski | 2011-02-08 | 1 | -4/+5 | |
| | | | | | | inadvertently causing javascript errors. This fixes CVE-2011-0446 | |||||
* | Add tests showing the LH issue #6381: fields_for with inline blocks and ↵ | Carlos Antonio da Silva | 2011-02-08 | 1 | -1/+85 | |
| | | | | | | nested attributes already persisted Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | removing generation of id in submit helper | Franco Brusatti | 2011-02-03 | 1 | -6/+6 | |
| | | | | | | [#6369 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Add a test for 'render :layout' | Anton Astashov | 2011-02-03 | 1 | -0/+5 | |
| | | | | | | | | | To make sure it will show block contents if it is placed after 'render :partial' [#5557 state:resolved] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | add test to check class is being escaped in form_class | Santiago Pastorino | 2011-02-01 | 1 | -0/+4 | |
| | ||||||
* | Allow customization of form class for button_to | Andrei Bocan | 2011-02-01 | 1 | -0/+4 | |
| | | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | auto_link: avoid recognizing full width chars as a part of URI scheme | Akira Matsuda | 2011-02-01 | 1 | -1/+7 | |
| | | | | | | | | fixes regression by http://github.com/rails/rails/commit/133ada6ab0f0cb7bef2bd40dbc18f2d5bc6b964e [#5503 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Accept String value for render_partial :as option | Akira Matsuda | 2011-02-01 | 1 | -1/+6 | |
| | | | | | | [#6222 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | Solve SystemStackError when changing locale inside ActionMailer [#5329 ↵ | José Valim | 2011-01-19 | 1 | -1/+1 | |
| | | | | state:resolved] | |||||
* | Merge branch 'template_error' into merge | Aaron Patterson | 2011-01-18 | 1 | -0/+13 | |
|\ | | | | | | | | | | | * template_error: Ensure original exception message is present in both Template::Error#message and Template::Error#inspect. ActiveSupport::Deprecation.silence no longer needed. | |||||
| * | Ensure original exception message is present in both Template::Error#message ↵ | John Firebaugh | 2010-10-29 | 1 | -0/+13 | |
| | | | | | | | | | | | | and Template::Error#inspect. Previously, #inspect would produce #<ActionView::Template::Error: ActionView::Template::Error>, which is not very useful. | |||||
* | | fixing space errors | Aaron Patterson | 2011-01-17 | 1 | -1/+1 | |
| | | ||||||
* | | button_tag should escape it content | Santiago Pastorino | 2011-01-12 | 1 | -0/+7 | |
| | | ||||||
* | | Allow view in AV::TestCase to access it's controller helpers methods | Santiago Pastorino | 2011-01-12 | 1 | -0/+21 | |
| | | ||||||
* | | Improve select helpers by allowing a selected value of false. This is ↵ | John Allison | 2011-01-09 | 1 | -8/+24 | |
| | | | | | | | | useful when using a select helper with a boolean attribute, and the attribute is false. (e.g. f.select :allow_comments) | |||||
* | | HTML5 button_tag helper | Rizwan Reza | 2011-01-09 | 1 | -0/+28 | |
| | | | | | | | | | | | | | | | | This tag is similar in nature to submit_tag, but allows more control. It also doesn't submit if submit type isn't used, allowing JavaScript to control the flow where required. For more information: http://www.whatwg.org/specs/web-apps/current-work/multipage/the-button-element.html#the-button-element | |||||
* | | Don't be so picky on MissingTemplate error details, this fails randomly on ↵ | Piotr Sarnacki | 2010-12-31 | 1 | -4/+3 | |
| | | | | | | | | 1.8.7 because of not ordered hash | |||||
* | | added tests for the MissingTemplate exception message. | Nick Sutterer | 2010-12-31 | 1 | -0/+21 | |
| | | ||||||
* | | ActionController::Base.helpers.sanitize ignores case in protocol | Timothy N. Tsvetkov | 2010-12-30 | 1 | -0/+7 | |
| | | | | | | | | | | | | [#6044 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com> | |||||
* | | all tests pass | artemave | 2010-12-26 | 3 | -29/+29 | |
| | | ||||||
* | | Allow registering javascript/stylesheet_expansions to existing symbols | Santiago Pastorino | 2010-12-22 | 1 | -0/+19 | |
| | | ||||||
* | | Do not use the same hash instance for expansions [#6114 state:resolved] | Piotr Sarnacki | 2010-12-22 | 1 | -0/+8 | |
| | | | | | | | | | | Using the same hash instance makes using the same expansions for both javascripts and stylesheets. | |||||
* | | Fixed number_with_precision rounding error [#6182 state:resolved] | Don Wilson | 2010-12-18 | 1 | -0/+5 | |
| | |