Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | Merge commit 'rails/master' into i18n | Sven Fuchs | 2008-08-25 | 2 | -11/+12 | |
|\ | ||||||
| * | Update translations for pluralization key change from 'other' to 'many' | Jeremy Kemper | 2008-08-24 | 1 | -11/+11 | |
| | | ||||||
| * | Ruby 1.9 compat: set source encoding | Jeremy Kemper | 2008-08-23 | 1 | -0/+1 | |
| | | ||||||
| * | I18n: use :other instead of :many as default key for pluralization to better ↵ | Sven Fuchs | 2008-08-23 | 1 | -11/+11 | |
| | | | | | | | | | | | | conform w/ cldr pluralization rules Signed-off-by: Michael Koziarski <michael@koziarski.com> | |||||
* | | I18n: add aliases #t and #l to TranslationHelper#translate and #localize | Sven Fuchs | 2008-08-25 | 1 | -0/+2 | |
| | | ||||||
* | | I18n: use :other instead of :many as default key for pluralization to better ↵ | Sven Fuchs | 2008-08-23 | 1 | -11/+11 | |
|/ | | | | conform w/ cldr pluralization rules | |||||
* | Merge branch 'master' into i18n | Jeremy Kemper | 2008-08-22 | 3 | -1/+15 | |
|\ | ||||||
| * | Ensure :partial => @collection and :collection => @collection behaves same. ↵ | Ryan Bates | 2008-08-22 | 3 | -1/+15 | |
| | | | | | | | | | | | | [#884 state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | Merge commit 'sven/i18n' into i18n | Jeremy Kemper | 2008-08-22 | 6 | -72/+132 | |
|\ \ | |/ |/| | ||||||
| * | Merge branch 'master' into i18n | Sven Fuchs | 2008-08-21 | 34 | -496/+789 | |
| |\ | ||||||
| * | | fixing actionpack yml translations | Sven Fuchs | 2008-08-20 | 1 | -21/+23 | |
| | | | ||||||
| * | | Changed locale file to yml for actionpack, but still broken | Iain Hecker | 2008-08-20 | 3 | -90/+90 | |
| | | | ||||||
| * | | Cleaned up ActiveRecord i18n scoping | Iain Hecker | 2008-08-14 | 3 | -26/+28 | |
| | | | ||||||
| * | | switch to using I18n.load_translations instead of requiring plain ruby files | Sven Fuchs | 2008-08-13 | 2 | -78/+79 | |
| | | | ||||||
| * | | update i18n usage for pluralization hashes (api change) | Sven Fuchs | 2008-08-10 | 2 | -12/+67 | |
| | | | ||||||
* | | | Removed template_public? because it will always be true since the default ↵ | Joshua Peek | 2008-08-21 | 2 | -10/+1 | |
| | | | | | | | | | | | | template is never a partial | |||||
* | | | Tidy up pick partial template logic | Joshua Peek | 2008-08-21 | 1 | -18/+12 | |
| | | | ||||||
* | | | Cleanup around partial rendering | Ryan Bates | 2008-08-21 | 6 | -90/+66 | |
| | | | | | | | | | | | | Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | | update rack tests for default response content_type and charset | Jeremy Kemper | 2008-08-21 | 1 | -3/+3 | |
| | | | ||||||
* | | | deprecate Base#assign_default_content_type_and_charset | Jeremy Kemper | 2008-08-21 | 1 | -0/+5 | |
| | | | ||||||
* | | | Move default content type and charset from Base to Response. Handle charset ↵ | Jeremy Kemper | 2008-08-21 | 3 | -16/+50 | |
| | | | | | | | | | | | | = nil. | |||||
* | | | Allow polymorphic_url helper to take url options. [#880 state:resolved] | Tarmo Tänav | 2008-08-21 | 3 | -7/+33 | |
| |/ |/| | | | | | | | | | | | | | | | All *_polymorphic_url, *_polymorphic_path helpers can now accept an options hash which will be passed on to the named route making it possible to generate polymorphic routes with additional url parameters. Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | Allow overriding id for feed and entry with atom_feed_builder. [#485 ↵ | Darragh Curran | 2008-08-21 | 2 | -16/+45 | |
| | | | | | | | | | | | | state:resolved] Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | Simplified and renamed CallbackChain union method to replace_or_append! | Joshua Peek | 2008-08-21 | 1 | -1/+1 | |
| | | ||||||
* | | Partial revert of 2681685 premature TypeArray abstraction | Joshua Peek | 2008-08-21 | 1 | -1/+25 | |
| | | ||||||
* | | Switched integration test runner to use Rack processor instead of CGI | Joshua Peek | 2008-08-20 | 3 | -45/+35 | |
| | | ||||||
* | | Improve test coverage for integration tests cookie header | Joshua Peek | 2008-08-20 | 1 | -1/+4 | |
| | | ||||||
* | | Don't shadow query string method | Joshua Peek | 2008-08-19 | 1 | -1/+10 | |
| | | ||||||
* | | Test coverage for integration testing with parameters | Joshua Peek | 2008-08-19 | 1 | -0/+32 | |
| | | ||||||
* | | Return nil instead of a space when passing an empty collection or nil to ↵ | Ryan Bates | 2008-08-19 | 5 | -6/+17 | |
| | | | | | | | | | | | | 'render :partial' [#791 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | Delegate xhr helper method to integration session | Joshua Peek | 2008-08-19 | 2 | -2/+19 | |
| | | ||||||
* | | Make AbstractRequest.if_modified_sense return nil if the header could not be ↵ | Jamis Buck | 2008-08-19 | 2 | -1/+3 | |
| | | | | | | | | parsed | |||||
* | | hack around CGI session close | Joshua Peek | 2008-08-19 | 1 | -1/+5 | |
| | | ||||||
* | | Consistently use the framework's configured logger and avoid reverting to ↵ | Joshua Peek | 2008-08-18 | 4 | -5/+6 | |
| | | | | | | | | RAILS_DEFAULT_LOGGER unless necessary. | |||||
* | | pass yielded arguments to block for ActionView::Base#render with :layout ↵ | Ryan Bates | 2008-08-17 | 7 | -28/+74 | |
| | | | | | | | | | | | | [#847 state:resolved] Signed-off-by: Joshua Peek <josh@joshpeek.com> | |||||
* | | More integration test coverage | Joshua Peek | 2008-08-17 | 1 | -3/+29 | |
| | | ||||||
* | | Use Response status accessor instead of the Status header | Joshua Peek | 2008-08-17 | 1 | -17/+17 | |
| | | ||||||
* | | Merge RackProcess#normalize_headers logic into AbstractResponse#prepare! | Joshua Peek | 2008-08-17 | 2 | -47/+75 | |
| | | ||||||
* | | Use RackRequest as a mock instead of StubCGI into RequestTest | Joshua Peek | 2008-08-17 | 1 | -14/+10 | |
| | | ||||||
* | | Set cache control to require revalidation if cache freshness response ↵ | Jeremy Kemper | 2008-08-14 | 1 | -5/+14 | |
| | | | | | | | | headers are set. Don't set Content-Length header if 304 status. | |||||
* | | Fix asset file paths with dangling queries in mtime check | Jeremy Kemper | 2008-08-14 | 1 | -2/+6 | |
| | | ||||||
* | | TestRequest#recycle! uses unmemoize_all to reset cached request method, ↵ | Jeremy Kemper | 2008-08-13 | 1 | -3/+3 | |
| | | | | | | | | accepts, etc. | |||||
* | | Fix rendering partials at the top level [#795 state:resolved] | Joshua Peek | 2008-08-13 | 4 | -1/+21 | |
| | | ||||||
* | | Refactor Filter predicate methods to use inheritance. [#815 state:resolved] | Josh Susser | 2008-08-13 | 1 | -3/+16 | |
| | | | | | | | | Signed-off-by: Pratik Naik <pratiknaik@gmail.com> | |||||
* | | Set asset-cached file ctime and mtime to the max mtime of the combined ↵ | Jeremy Kemper | 2008-08-12 | 2 | -1/+7 | |
| | | | | | | | | files. Allows for consistent ETag generation without having a shared filesystem. | |||||
* | | Merge branch 'conditional-get' | Jeremy Kemper | 2008-08-12 | 15 | -300/+323 | |
|\ \ | |/ |/| | ||||||
| * | Update changelog for conditional GET utility methods | Jeremy Kemper | 2008-08-12 | 1 | -2/+8 | |
| | | ||||||
| * | Update tests for request memoization | Jeremy Kemper | 2008-08-08 | 9 | -121/+146 | |
| | | ||||||
| * | Don't shadow host method | Jeremy Kemper | 2008-08-08 | 1 | -1/+1 | |
| | | ||||||
| * | Simplifying usage of ETags and Last-Modified and conditional GET requests | Jeremy Kemper | 2008-08-07 | 7 | -135/+169 | |
| | |