Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: resolve/refinerycms
...
head fork: resolve/refinerycms
Checking mergeability… Don't worry, you can still create the pull request.
  • 9 commits
  • 11 files changed
  • 0 commit comments
  • 4 contributors
View
4 Gemfile.lock
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
- refinerycms (0.9.8.8)
+ refinerycms (0.9.8.9)
acts_as_indexed (~> 0.6.6)
authlogic (~> 2.1.6)
bundler (~> 1.0.0)
@@ -131,7 +131,7 @@ GEM
rake (>= 0.8.7)
thor (~> 0.14.4)
rake (0.8.7)
- rdoc (2.5.11)
+ rdoc (3.0.1)
refinerycms-i18n (0.9.8.12)
refinerycms (>= 0.9.8)
routing-filter (~> 0.1.6)
View
7 changelog.md
@@ -1,3 +1,10 @@
+## 0.9.8.9 [21 December 2010]
+* Fixed error in the inquiries engine seeds. [Philip Arndt](https://github.com/parndt)
+* Separate each error message into its own ``<li>``. [Uģis Ozols](https://github.com/ugisozols)
+* Add ``rescue_not_found`` option to turn on/off 404 rendering. [Ryan Bigg](https://github.com/radar)
+* Add ``:from`` key to ``UserMailer`` for password reset. [Earle Clubb](https://github.com/eclubb)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.8.8...0.9.8.9)
+
## 0.9.8.8 [16 December 2010]
* Prevented RefinerySetting from accessing its database table before it is created. [Philip Arndt](https://github.com/parndt)
* Added more options to ``bin/refinerycms`` like ability to specify database username and password. [Philip Arndt](https://github.com/parndt)
View
3  config/environments/development.rb
@@ -23,3 +23,6 @@
# Print deprecation notices to the Rails logger
config.active_support.deprecation = :log
end
+
+# Don't handle some exceptions with the 404 page.
+Refinery.rescue_not_found = false
View
3  config/environments/production.rb
@@ -55,3 +55,6 @@
# instead of the default file system for resources and images
# Make sure to your bucket info is correct in amazon_s3.yml
Refinery.s3_backend = !(ENV['S3_KEY'].nil? || ENV['S3_SECRET'].nil?)
+
+# Handle some exceptions with the 404 page.
+Refinery.rescue_not_found = true
View
3  config/environments/test.rb
@@ -33,3 +33,6 @@
# Print deprecation notices to the stderr <-- :log until authlogic calms down.
config.active_support.deprecation = :log
end
+
+# Don't handle some exceptions with the 404 page.
+Refinery.rescue_not_found = false
View
2  db/seeds/pages_for_inquiries.rb
@@ -1,4 +1,4 @@
-page_position = Page.maximum(:position, :conditions => {:parent_id => nil})
+page_position = (Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)
contact_us_page = Page.create(:title => "Contact",
:link_url => "/contact",
View
4 refinerycms.gemspec
@@ -2,9 +2,9 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.8.8}
+ s.version = %q{0.9.8.9}
s.description = %q{A Ruby on Rails CMS that supports Rails 3. It's easy to extend and sticks to 'the Rails way' where possible.}
- s.date = %q{2010-12-16}
+ s.date = %q{2010-12-21}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
View
6 vendor/refinerycms/authentication/app/mailers/user_mailer.rb
@@ -5,6 +5,12 @@ def reset_notification(user, request)
subject I18n.translate('user_mailer.link_to_reset_your_password')
@url = reset_users_url(:host => request.host_with_port,
:reset_code => user.perishable_token)
+
+ domain = request.domain(RefinerySetting.find_or_set(:tld_length, 1))
+
+ mail(:to => user.email,
+ :subject => I18n.translate('user_mailer.link_to_reset_your_password'),
+ :from => "\"#{RefinerySetting[:site_name]}\" <no-reply@#{domain}>")
end
protected
View
8 vendor/refinerycms/core/app/views/shared/admin/_error_messages.html.erb
@@ -3,12 +3,12 @@
<p><%= t('.problems_in_following_fields') %>:</p>
<ul>
<% unless defined?(include_object_name) and include_object_name %>
- <% object.errors.each_value do |msg| %>
- <li><%= msg %></li>
+ <% object.errors.each do |key, value| %>
+ <li><%= value %></li>
<% end %>
<% else %>
- <% object.errors.full_messages.each do |msg| %>
- <li><%= msg %></li>
+ <% object.errors.full_messages.each do |value| %>
+ <li><%= value %></li>
<% end %>
<% end %>
</ul>
View
10 vendor/refinerycms/core/lib/refinery/application_controller.rb
@@ -27,10 +27,12 @@ def self.included(c) # Extend controller
c.send :after_filter, :store_current_location!,
:if => Proc.new {|c| c.send(:refinery_user?) rescue false }
- c.send :rescue_from, ActiveRecord::RecordNotFound,
- ActionController::UnknownAction,
- ActionView::MissingTemplate,
- :with => :error_404
+ if Refinery.rescue_not_found
+ c.send :rescue_from, ActiveRecord::RecordNotFound,
+ ActionController::UnknownAction,
+ ActionView::MissingTemplate,
+ :with => :error_404
+ end
end
end
View
8 vendor/refinerycms/refinery.rb
@@ -5,7 +5,7 @@ module Refinery
WINDOWS = !!(RbConfig::CONFIG["host_os"] =~ %r!(msdos|mswin|djgpp|mingw)!)
class << self
- attr_accessor :root, :s3_backend, :base_cache_key
+ attr_accessor :root, :s3_backend, :base_cache_key, :rescue_not_found
def root
@root ||= Pathname.new(File.expand_path(__FILE__).split('vendor').first.to_s)
@@ -19,6 +19,10 @@ def base_cache_key
@base_cache_key ||= "refinery"
end
+ def rescue_not_found
+ !!@rescue_not_found
+ end
+
def version
::Refinery::Version.to_s
end
@@ -28,7 +32,7 @@ class Version
@major = 0
@minor = 9
@tiny = 8
- @build = 8
+ @build = 9
class << self
attr_reader :major, :minor, :tiny, :build

No commit comments for this range

Something went wrong with that request. Please try again.