aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_view/helpers/date_helper.rb
Commit message (Collapse)AuthorAgeFilesLines
...
* Remove extra white spaces on ActionPack docs.Sebastian Martinez2011-05-231-1/+1
|
* Clean up redundant backslashesPirogov Evgenij2011-05-141-4/+4
|
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-05-141-66/+73
|\ | | | | | | | | | | Conflicts: actionpack/lib/action_view/helpers/date_helper.rb railties/lib/rails/generators/rails/app/templates/config/initializers/wrap_parameters.rb.tt
| * Fix styiling issues on DateHelper docsSebastian Martinez2011-05-101-64/+70
| |
| * Explain the implication of using :ignore_date on time_selectAditya Sanghi2011-05-101-1/+2
| |
| * Fixed typos in documentation for the date_select helper in ↵Philip Roberts2011-05-091-1/+1
| | | | | | | | | | | | actionpack/action_view. The description for an example of the date_select method did not match the actual code example.
* | Merge pull request #343 from asanghi/ampmJosé Valim2011-05-071-4/+30
|\ \ | | | | | | Allow AM/PM format in datetime selectors
| * | DRY this baby upAditya Sanghi2011-04-291-23/+4
| | |
| * | add more documentation; remove unused assignmentAditya Sanghi2011-04-291-4/+14
| | |
| * | Allow AM/PM in datetime selectorsAditya Sanghi2011-04-291-0/+35
| |/
* | strip spaceAditya Sanghi2011-05-061-2/+2
| |
* | Take leap years into account more seriously when calculating year distance ↵Aditya Sanghi2011-05-061-3/+14
|/ | | | [#6074 state:resolved]
* Merge branch 'master' of git://github.com/lifo/docrailsXavier Noria2011-04-191-4/+6
|\ | | | | | | | | | | Conflicts: railties/guides/source/ajax_on_rails.textile railties/guides/source/generators.textile
| * Fixing more spacing inconsistenciesMatt Duncan2011-04-151-1/+1
| |
| * Days are never approximated using 'about'Matt Duncan2011-04-151-1/+1
| |
| * Making example result match actual resultMatt Duncan2011-04-151-1/+1
| |
| * Including actual usage in exampleMatt Duncan2011-04-151-1/+3
| |
* | Aligning commentsMatt Duncan2011-04-131-1/+1
| |
* | Fixing distance_of_time_in_words range near 2 daysMatt Duncan2011-04-131-5/+5
|/
* Action Pack typos.R.T. Lechow2011-03-051-2/+2
|
* Add Date#rfc3339 and Date#iso8601 to ASSantiago Pastorino2011-02-131-0/+1
|
* Allow for the format of time_tag in AP to be changed via an option argument.Josh Kalderimis2011-02-121-3/+5
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* Added time_tag helper to AP for HTML5 time tag [#5919 state:resolved]Sjoerd Andringa2011-02-121-0/+19
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* patching to ensure separator is printed with order [#5816 state:resolved]Aditya Sanghi2010-11-111-0/+2
| | | | Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* The deleted examples are redundant.Aditya Sanghi2010-10-171-11/+0
| | | | They do not reveal anything new that is not already been explained in preceding example.
* Avoid uninitialized variable warning.Emilio Tagua2010-09-271-0/+1
|
* Add missing require.José Valim2010-08-271-1/+2
|
* Removing some unuseful begin/end and refactor prompt_option_tag a bitCarlos Antonio da Silva2010-08-271-16/+11
| | | | | | [#5469 state:committed] Signed-off-by: Santiago Pastorino <santiago@wyeworks.com>
* fixing the ternary operation where the logic is very confusing.Neeraj Singh2010-07-181-1/+2
| | | | | | [#5136 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* removed 'unless const_defined?' code smellJosh Kalderimis2010-06-211-2/+2
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Merge remote branch 'rails/master'Xavier Noria2010-06-201-2/+4
|\ | | | | | | | | Conflicts: actionpack/lib/abstract_controller/base.rb
| * Fixed date_select date_separator when discard_month and/or discard_day are ↵Thibaud Guillaume-Gentil2010-06-201-2/+4
| | | | | | | | | | | | true [#4856 state:resolved] Signed-off-by: José Valim <jose.valim@gmail.com>
* | Adds title and description where needed.Rizwan Reza2010-06-161-0/+2
|/
* removing the extra assignment statement [#4432 state:resolved]Neeraj Singh2010-04-301-1/+0
| | | | Signed-off-by: José Valim <jose.valim@gmail.com>
* Fix form builder and form helpers inconsistencies [#4432 state:resolved]Neeraj Singh2010-04-291-43/+33
| | | | | | | | * datetime_select and select_datetime should be consistent as much as possible * date_select and select_date should be consistent as much as possible * time_select and select_time should be consistent as much as possible Signed-off-by: José Valim <jose.valim@gmail.com>
* Adds disable option to date_helpers generated hidden fields when ↵Santiago Pastorino2010-03-051-1/+2
| | | | | | | | html_options specifies it. ht by Marc Schütz [#3807 state:committed] Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* add time_separator for minutes only if minutes aren't hiddenSantiago Pastorino2010-02-251-1/+1
| | | | Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
* content_tag should escape its inputBruno Michel2010-02-141-3/+3
| | | | Signed-off-by: Yehuda Katz <yehudakatz@YK.local>
* For performance reasons, you can no longer call html_safe! on Strings. ↵Yehuda Katz2010-01-311-7/+7
| | | | | | | | | | | | 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.
* Fixed that much of DateHelper wouldn't return html_safe? strings [DHH]David Heinemeier Hansson2010-01-081-5/+5
|
* Switch to on-by-default XSS escaping for rails.Michael Koziarski2009-10-081-3/+3
| | | | | | | | | | | | This consists of: * String#html_safe! a method to mark a string as 'safe' * ActionView::SafeBuffer a string subclass which escapes anything unsafe which is concatenated to it * Calls to String#html_safe! throughout the rails helpers * a 'raw' helper which lets you concatenate trusted HTML from non-safety-aware sources (e.g. presantized strings in the DB) * New ERB implementation based on erubis which uses a SafeBuffer instead of a String Hat tip to Django for the inspiration.
* Introduce :almost keyword for distance_of_time_in_words. Make 1.75 days - 2 ↵John Trupiano2009-09-281-10/+19
| | | | | | | days return '2 days'. Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3266 state:committed]
* Enhancing distance_of_time_in_words to prefix year output with over and ↵Jay Pignata2009-09-281-4/+7
| | | | | | | about depending upon how many months have elapsed Signed-off-by: Michael Koziarski <michael@koziarski.com> [#3106 state:committed]
* Merge docrailsPratik Naik2009-07-251-5/+5
|
* Merge docrailslifo2009-04-171-3/+3
|
* Merge docrailsPratik Naik2009-03-161-2/+2
|
* Stops date select helpers from defaulting the selected date to today if ↵Sam Oliver2009-02-131-1/+1
| | | | | | | :prompt option has been used Signed-off-by: Michael Koziarski <michael@koziarski.com> [#561 state:resolved]
* Fix date_select within fields_for with an index [#1666 state:resolved] ↵Josh2009-01-161-5/+5
| | | | | | [Josh, Frederick Cheung] Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com>
* Use I18n for date/time select helpers prompt text [#561 state:resolved]Sam Oliver2008-12-221-6/+2
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
* Added prompt options to date helpers [#561 state:resolved]Sam Oliver2008-12-211-0/+79
| | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com>