Dan Weinand
91eeb0ff11
Using the highlight helper on text with html shouldn't highlight text inside html attributes. [ #1302 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2009-01-28 19:53:59 +00:00
Daniel Rodríguez Troitiño
9a8e2a059c
Ensure selected option is not ignored for collection_select. [ #1037 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2009-01-28 19:35:18 +00:00
Joshua Peek
093f758bd0
Restore implicit rendering for XHR requests that want a HTML template [ #1590 state:resolved]
2009-01-27 14:09:11 -06:00
Yaroslav Markin
17db28f1ca
Improve i18n support for number_to_human_size helper:
...
* now using pluralization properly
* storage unit translations moved to number.human.storage_units.units
* introduced number.human.storage_units.format for languages that do not follow "{{number}} {{unit}}" format (Japanese)
NOTE: I18n table changed, you will need to update your translations.
[#1634 state:committed]
Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net >
2009-01-27 09:22:00 -08:00
Joshua Peek
57f0b85900
Fix for failing ActionMailer multipart tests
2009-01-26 13:15:29 -06:00
Joshua Peek
a98cd7ca9b
Add localized templates
...
# Default locale
app/views/messages/index.html.erb
# I18n.locale is set to :da (Danish)
app/views/messages/index.da.html.erb
2009-01-25 22:51:21 -06:00
Pratik Naik
39e1ac658e
Merge docrails
2009-01-18 18:10:58 +00:00
Jeremy Kemper
fe013ce934
Fix performance regression
2009-01-16 20:36:59 -08:00
Josh
7260852187
Fix date_select within fields_for with an index [ #1666 state:resolved] [Josh, Frederick Cheung]
...
Signed-off-by: Frederick Cheung <frederick.cheung@gmail.com >
2009-01-16 17:23:43 +00:00
Jeremy Kemper
35fa007313
Include process methods in ActionController::TestCase only. No need to alias_method_chain :process either.
2009-01-07 14:49:05 -08:00
Jeremy Kemper
84194ce936
Explicitly require AS::TestCase
2009-01-06 15:35:46 -08:00
Joshua Peek
ce706b4b9b
Cache AssetTag timestamps
2009-01-04 15:39:16 -06:00
Joshua Peek
104898fcb7
Revert to the good old days when AssetTag didn't cause anyone problems
2009-01-02 13:40:23 -06:00
David Heinemeier Hansson
a1fb57aa69
Added :silence option to BenchmarkHelper#benchmark and turned log_level into a hash parameter and deprecated the old use [DHH]
2009-01-01 18:53:16 +01:00
David Heinemeier Hansson
f1e20ce9a7
Merge branch 'master' of git@github.com:rails/rails
2009-01-01 18:13:14 +01:00
David Heinemeier Hansson
49a055dff6
Fixed the AssetTagHelper cache to use the computed asset host as part of the cache key instead of just assuming the its a string [ #1299 state:committed]
2009-01-01 18:12:49 +01:00
Jeremy Kemper
d961592886
Merge branch 'master' of git@github.com:rails/rails
2008-12-30 12:40:32 -08:00
Joshua Peek
558ab327b7
Clean up view path cruft and split path implementations into Template::Path and Template::EagerPath
2008-12-29 19:27:19 -06:00
Jeremy Kemper
276ec16007
Merge branch 'master' of git@github.com:rails/rails
2008-12-29 14:38:54 -08:00
Xavier Noria
a2270ef259
Inline code comments for class_eval/module_eval [ #1657 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-12-28 19:49:28 +00:00
Joshua Peek
faf8364050
Defining a new method is atomic, no mutex needed.
2008-12-22 16:58:48 -06:00
Jeremy Kemper
2e053aec9b
Don't construct object deprecation proxy if unneeded
2008-12-22 14:48:45 -08:00
Sam Oliver
70456aed31
Use I18n for date/time select helpers prompt text [ #561 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-12-22 15:13:39 +00:00
Sam Oliver
389534c38c
Added prompt options to date helpers [ #561 state:resolved]
...
Signed-off-by: Pratik Naik <pratiknaik@gmail.com >
2008-12-21 23:24:05 +00:00
Joshua Peek
858a420ce1
Ensure the template format is always passed to the template finder. Now we can cleanup some nasty stuff.
2008-12-21 17:24:16 -06:00
Frederick Cheung
40247a8cbb
Remove observe_field :on option as prototype no longer supports it [ #1088 state:resolved]
2008-12-21 15:55:52 +00:00
Pratik Naik
c3f53f412c
Merge docrails
2008-12-19 14:27:43 +00:00
Pratik Naik
c044c079ab
Revert "Auto-load template handlers based on unmatched extensions [ #1540 state:resolved]"
...
This reverts commit e8c1915416
2008-12-19 13:05:45 +00:00
Nathan Weizenbaum
e8c1915416
Auto-load template handlers based on unmatched extensions [ #1540 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-12-15 14:49:38 -06:00
Dan Pickett
38412ecb5d
Fixed ActionView::TestCase current url context [ #1561 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-12-15 11:47:39 -06:00
mark
49306ccacf
Add :partial option to assert_template [ #1550 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-12-11 11:06:35 -06:00
Joshua Peek
7cfa6c535b
Fixed template lookups from outside the rails root [ #1557 state:resolved]
2008-12-11 10:17:29 -06:00
Joshua Peek
014b7994ac
Explicitly require ERB Utils extensions from TagHelper
2008-12-09 14:13:33 -06:00
Jeremy Kemper
e8c4939fb3
Benchmark.ms
2008-12-09 11:17:11 -08:00
Pratik Naik
dbbae5e00e
Merge with docrails
2008-12-07 03:27:53 +01:00
Joshua Peek
731dcd8404
Silence server backtrace in rescue templates and log files. Also remove some noise from missing template errors.
2008-12-05 11:24:28 -06:00
Joshua Peek
148aff2097
Set template_format to html inside rjs templates so renders within it default to html.
2008-12-04 17:20:51 -06:00
Sam Stephenson
ab211bf592
Fix rendering html partials from an rjs template
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-12-04 16:35:13 -06:00
Joshua Peek
7c0dfa35db
Register bogus template handlers for ActionMailer test fixtures
2008-12-03 13:58:47 -06:00
Joshua Peek
2fc6c7dd05
Validate template extensions [ #1187 state:resolved]
2008-12-03 10:57:35 -06:00
Jeremy Kemper
99f2cb4918
Merge branch 'master' of git@github.com:rails/rails
2008-12-03 10:32:30 -06:00
Jeremy Kemper
3db59ce0dc
Unnecessary CGI require
2008-12-03 10:23:43 -06:00
Tekin Suleyman
dab78e55cf
Ensure ActionMailer doesn't blow up when a two argument proc is set for the asset host
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1394 state:committed]
2008-12-01 19:38:25 +01:00
Andrew Kaspick
bda55f82c6
allow options to be passed to email address auto generation
...
Signed-off-by: Michael Koziarski <michael@koziarski.com >
[#1418 state:committed]
2008-12-01 19:27:03 +01:00
Sven Fuchs
1182658e76
Make sure #compute_public_path caching allows to return different results for different given sources [ #1471 state:resolved]
...
Signed-off-by: Joshua Peek <josh@joshpeek.com >
2008-11-29 16:03:44 -06:00
Joshua Peek
9fccf72725
fixed template recompile issue with previous commit and add some better tests so we can make sure it doesn't happen again
2008-11-28 14:31:54 -06:00
Joshua Peek
9fc23745f1
Reinstate "Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading."
2008-11-28 11:18:28 -06:00
David Heinemeier Hansson
5fa0457542
Revert "Super lazy load view paths in development mode (no indexing or caching at all). Switch layout finders to use view path api to take advantage of cache." as it killed dev mode reloading.
...
This reverts commit 4d910b0333
2008-11-27 21:04:24 +01:00
David Heinemeier Hansson
6fa9957e0e
Merge branch 'master' of git@github.com:rails/rails
2008-11-27 18:59:33 +01:00
David Heinemeier Hansson
229f959d15
Added the option to declare an asset_host as an object that responds to call (see http://github.com/dhh/asset-hosting-with-minimum-ssl for an example) [DHH]
2008-11-27 17:51:33 +01:00
