diff --git a/authentication/refinerycms-authentication.gemspec b/authentication/refinerycms-authentication.gemspec index df70f222e8..ae735e2111 100644 --- a/authentication/refinerycms-authentication.gemspec +++ b/authentication/refinerycms-authentication.gemspec @@ -2,7 +2,7 @@ require File.expand_path('../../core/lib/refinery/version', __FILE__) version = Refinery::Version.to_s -rails_version = ['>= 3.1.3', '< 4.1'] +rails_version = ['>= 3.1.11', '< 4.1'] Gem::Specification.new do |s| s.platform = Gem::Platform::RUBY diff --git a/changelog.md b/changelog.md index 9719edcad6..255122643a 100644 --- a/changelog.md +++ b/changelog.md @@ -5,9 +5,14 @@ * Updated how `_make_sortable` works to take an options hash, requiring manual file changes. [Philip Arndt](https://github.com/parndt) * [See full list](https://github.com/refinery/refinerycms/compare/2-1-stable...master) -## 2.1.1 [unreleased] +## 2.1.1 [26 November 2013] * Fixed menu reordering bug when `Refinery::Core.backend_route` was set to something different than `refinery`. [#2368](https://github.com/refinery/refinerycms/pull/2368). [xyz](https://github.com/xyz) +* Fixed bug in serializelist.js where we were iterating through object fields instead of the array elements. [#2360](https://github.com/refinery/refinerycms/pull/2360). Uģis Ozols](https://github.com/ugisozols) +* Bumped `selenium-webdriver` gem dependency version to `~> 2.34.0`. +* Fixed bug which occurred when trying to save a child page with no default translation. [#2379](https://github.com/refinery/refinerycms/pull/2379). [Jess Brown](https://github.com/jess) & [Uģis Ozols](https://github.com/ugisozols) +* Upgraded Globalize dependency to `~> 3.0.1`. [Chris Salzberg](https://github.com/shioyama) [#2462](https://github.com/refinery/refinerycms/pull/2462) +* [See full list](https://github.com/refinery/refinerycms/compare/2.1.0...2.1.1) ## 2.1.0 [5 August 2013] @@ -78,7 +83,6 @@ * Blocked past insecure Rails versions. [Philip Arndt](https://github.com/parndt) * Fixed problems with editing pages in different locales. [Philip Arndt](https://github.com/parndt) * Locked `truncate_html` to 0.5.x to ensure Ruby 1.8.x compatibility. [Uģis Ozols](https://github.com/ugisozols) - * [See full list](https://github.com/refinery/refinerycms/compare/2.0.9...2.0.10) ## 2.0.9 [21 November 2012] diff --git a/doc/guides/1 - Getting Started/2 - Getting Started.textile b/doc/guides/1 - Getting Started/2 - Getting Started.textile index efea71cf3e..7669f40ad9 100644 --- a/doc/guides/1 - Getting Started/2 - Getting Started.textile +++ b/doc/guides/1 - Getting Started/2 - Getting Started.textile @@ -83,6 +83,8 @@ $ gem install refinerycms NOTE: This step may take some time to load as it needs to download and install all the ruby gems Refinery depends on. +NOTE: If +gem install refinerycms+ fails with an error message saying +ERROR: While executing gem ... (Gem::ImpossibleDependenciesError)+, run +gem install rails -v=3.2.15+ then +gem install refinerycms+ + TIP. If you're working on Windows, you should be aware that the vast majority of Refinery development is done in Unix environments. If at all possible, we suggest that you develop on a Linux based operating system. h5. Rails Application Templates diff --git a/doc/guides/1 - Getting Started/4 - Best Practices and Frequently Asked Questions.textile b/doc/guides/1 - Getting Started/4 - Best Practices and Frequently Asked Questions.textile index 2edbea3c9a..773aca1ca0 100644 --- a/doc/guides/1 - Getting Started/4 - Best Practices and Frequently Asked Questions.textile +++ b/doc/guides/1 - Getting Started/4 - Best Practices and Frequently Asked Questions.textile @@ -3,6 +3,8 @@ h2. Best Practices and Frequently Asked Questions This guide covers recommendations on best practices for coding Refinery sites, and also attempts to document answers to the most frequently asked questions. +endprologue. + h3. General h4. I've never done any Ruby or Rails development. Will Refinery be easy to use for me? diff --git a/doc/guides/2 - Refinery Basics/9 - Resources.textile b/doc/guides/2 - Refinery Basics/9 - Resources.textile index 5b58855cb3..8fc73a2801 100644 --- a/doc/guides/2 - Refinery Basics/9 - Resources.textile +++ b/doc/guides/2 - Refinery Basics/9 - Resources.textile @@ -1,5 +1,9 @@ h2. Resources +This guide will show you how to set a Content-Disposition when working with resources. + +endprologue. + h3. How to change Content-Disposition Refinery comes with support for uploading files (in addition to images). By default, file uploads are given an http header of +Content-Disposition: attachment; filename=xxx+ diff --git a/pages/config/locales/es.yml b/pages/config/locales/es.yml index cf40948619..6d0bffa282 100644 --- a/pages/config/locales/es.yml +++ b/pages/config/locales/es.yml @@ -71,6 +71,8 @@ es: layout_template_help: Puedes elegir una plantilla para la dispoción diferente view_template: Plantilla para la vista view_template_help: Puedes elegir una plantilal para la vista diferente + custom_slug: Título personalizado + custom_slug_help: Puedes personalizar el título para esta página actions: create_new_page: Crear nueva página reorder_pages: Reordenar páginas diff --git a/pages/refinerycms-pages.gemspec b/pages/refinerycms-pages.gemspec index 23ef7c46a6..6aa6ca5764 100644 --- a/pages/refinerycms-pages.gemspec +++ b/pages/refinerycms-pages.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |s| s.files = `git ls-files`.split("\n") s.test_files = `git ls-files -- spec/*`.split("\n") - s.add_dependency 'friendly_id', '>= 5.0.0.rc3' + s.add_dependency 'friendly_id', '~> 5.0.1' s.add_dependency 'globalize', '~> 4.0.0.alpha.1' s.add_dependency 'awesome_nested_set', '~> 3.0.0.rc.1' s.add_dependency 'seo_meta', '~> 2.0.0.rc.1'