Commit Graph

3054 Commits

Author SHA1 Message Date
Niels Ganser
cb40c761b2 Minor spelling fix 2009-03-06 13:45:26 +01:00
Pratik Naik
21b80f8144 Merge commit 'mainstream/master' 2009-02-22 23:52:02 +01:00
Andrew White
3248553d32 Fix requirements regexp for path segments
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1772 state:committed]
2009-02-22 15:35:22 +13:00
Andrew White
f7a0a394f4 Remove hardcoded number_of_capturesin ControllerSegment to allow regexp requirements with capturing parentheses
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1887 state:committed]
2009-02-22 15:34:01 +13:00
Sven Fuchs
8c5cc66a83 make action_controller/layouts pick templates from the current instance's view_paths instead of the class view_paths [#1974 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-20 14:19:45 -06:00
Joshua Peek
69c049f5ab Move development mode reloading up the stack to avoid issues with class reloading in middleware 2009-02-20 12:04:57 -06:00
Sven Fuchs
53fe301a42 Lazy evaluate middleware arguments [#2028 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-20 10:50:21 -06:00
Joshua Peek
9702636a08 Lazy evaluate ActionController session store middleware class to pickup custom plugin session stores [#2001 state:resolved] 2009-02-19 21:21:34 -06:00
Joshua Peek
f8ea9f85d4 Fix templates reloading in development when using custom view path [#2012 state:resolved] 2009-02-19 20:55:56 -06:00
Pratik Naik
d8f1ee4b41 Merge commit 'mainstream/master' 2009-02-19 21:20:15 +01:00
Xavier Noria
623b1b9669 document :checked => true in #radio_button. 2009-02-17 17:01:49 +01:00
Joshua Peek
b6e56efe07 Special case in deprecated CGI proxy layer for Mongrel CGI cookies [#1957 state:resolved] 2009-02-16 22:17:54 -06:00
Joshua Peek
460269dcaf Autoload ActionController::Caching::Sweeper constant [#1977 state:resolved] 2009-02-16 14:37:42 -06:00
Joshua Peek
0096eb1555 Removed dead convert_expires! in Response [#1952 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-16 14:18:06 -06:00
Donald Parish
86d8f92282 Fixed http digest authentication to use credentials URI passed from client. [#1848 state:resolved]
Signed-off-by: Pratik Naik <pratiknaik@gmail.com>
2009-02-16 20:20:23 +01:00
Joshua Peek
238a6bb62d Update bundled rack to fix more parameter parsing issues 2009-02-14 18:23:08 -06:00
Sven Fuchs
0cb020b4d6 workaround for picking layouts based on wrong view_paths [#1974 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-14 18:22:41 -06:00
Tekin Suleyman
d676a7f18a Updated rdoc to reflect changes to form option helpers
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#837 state:committed]
2009-02-14 14:51:40 +13:00
Tekin Suleyman
1525f3816e Enhanced form option helpers to add support for disabled option tags and use of anonymous functions for specifying selected and disabled values from collections.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
2009-02-14 14:51:35 +13:00
Sam Oliver
f04346d8b9 Stops date select helpers from defaulting the selected date to today if :prompt option has been used
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#561 state:resolved]
2009-02-13 22:04:27 +13:00
Lance Ivy
5dbc9d40a4 Changed API of NestedAttributes to take an array, or hash with index keys, of hashes that have the id on the inside of the attributes hash and updated the FormBuilder to produce such hashes. Also fixed NestedAttributes with composite ids.
Signed-off-by: Michael Koziarski <michael@koziarski.com>
Signed-off-by: Eloy Duran <eloy.de.enige@gmail.com>
[#1892 state:committed]
2009-02-13 21:47:56 +13:00
thedarkone
3942cb406e Port fast reloadable templates from rails-dev-boost. 2009-02-12 13:04:12 -06:00
Joshua Peek
ff3fb6c5f3 Reapply 0d5b3e6 2009-02-10 13:36:50 -06:00
Joshua Peek
5689e681e9 Update vendored rack 2009-02-10 13:18:13 -06:00
Joshua Peek
f400209084 Move checkbox hidden field before the actual checkbox so the actual value doesn't get clobbered [#1863 state:resolved] 2009-02-10 13:10:46 -06:00
Andrew White
199e750d46 Fix some edge cases when the same template is called with different local assigns
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-10 12:09:49 -06:00
Joshua Peek
0d5b3e6b41 Make sure vendored rack is at the front of the load path 2009-02-10 10:48:54 -06:00
David Heinemeier Hansson
7527cdf79c Added partial scoping to TranslationHelper#translate, so if you call translate('.foo') from the people/index.html.erb template, you'll actually be calling I18n.translate(people.index.foo) [DHH] 2009-02-10 12:57:12 +01:00
Andrew White
893e9eb995 Improve view rendering performance in development mode and reinstate template recompiling in production [#1909 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-09 14:20:30 -06:00
Hongli Lai (Phusion)
cce017bed5 Improve documentation for ActionController::Streaming. Document 'render :text => proc { ... }' as a way to stream on-the-fly generated data to the browser. 2009-02-08 11:52:58 +01:00
Joshua Peek
5fbacde2af Session LazyHash#inspect triggers the hash to load 2009-02-07 16:47:44 -06:00
Joshua Peek
acd0612cde Don't add vendored rack to load path 2009-02-07 16:22:33 -06:00
Joshua Peek
524d8edf68 Update bundled Rack for Ruby 1.9 spec changes 2009-02-07 16:18:09 -06:00
Joshua Peek
0edb0a4fac Deprecate ActionController::Response#set_cookie :http_only option infavor of :httponly 2009-02-07 15:37:54 -06:00
Joshua Peek
3c625d65e8 Ruby 1.9 compat: removed redundant nested repeat operator 2009-02-07 15:33:11 -06:00
Joshua Peek
e4a7c0bb5b ~ backup files don't clobber original templates [#1818 state:resolved] 2009-02-07 12:06:35 -06:00
Andrew White
5f5d2d30a0 Move cleanup before prepare_dispatch so that constants are not loaded twice [#1898 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-07 11:41:00 -06:00
José Valim
50f51ff950 Render implicit html template when xhr request now supports localization [#1886 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-07 11:37:02 -06:00
Joshua Peek
2277fbedbe Temporarily bundle Rack 1.0 prerelease for testing 2009-02-07 00:08:28 -06:00
José Valim
24f2e676f7 Added support to dashed locales in templates localization [#1888 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-06 23:23:50 -06:00
Joshua Peek
43c09383ce Ensure session id is set in session options hash [#1880 state:resolved] 2009-02-06 23:16:58 -06:00
Eugene Pimenov
b1c1e3deb7 Ruby 1.9 compat: change encoding of action_view/renderable to utf-8, so erb templates can use utf-8 properly
[#1881 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-02-06 11:03:41 -08:00
Eugene Pimenov
ae36fcedce Ruby 1.9 compat: call bytesize for content_length
[#1881 state:committed]

Signed-off-by: Jeremy Kemper <jeremy@bitsweat.net>
2009-02-06 10:28:09 -08:00
Joshua Peek
7259baab47 Restore stale session check and move after dispatch development cleanups before the request 2009-02-05 20:22:43 -06:00
Andrew White
bccd2c54b2 Use Path rather than EagerPath when cache_classes == false so other view paths are properly recompiled in development mode [#1764 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-05 19:56:22 -06:00
Pascal Ehlert
d15d53cf81 Allowing an object to be passed explicitly to a fields_for with nested_attributes on one-to-one associations
Signed-off-by: Michael Koziarski <michael@koziarski.com>
[#1849 state:committed]
2009-02-06 13:26:58 +13:00
Andrew White
7aa847fab4 Eliminate unnecessary File.exist? when correct file extension given [#1879 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-05 15:38:29 -06:00
Adam McCrea
06182ea02e implicitly rendering a js response should not use the default layout [#1844 state:resolved]
Signed-off-by: Joshua Peek <josh@joshpeek.com>
2009-02-05 15:23:05 -06:00
chris finne
b80fa817d4 Fix a syntax error in current_page?() that was prevent matches against URL's with multiple query parameters [#1868 state:committed]
Signed-off-by: David Heinemeier Hansson <david@loudthinking.com>
2009-02-05 20:31:04 +01:00
David Heinemeier Hansson
46288f5935 Remove double parenthesis in docs 2009-02-05 20:27:34 +01:00