Skip to content

Comparing changes

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

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also .
...
  • 7 commits
  • 26 files changed
  • 3 commit comments
  • 3 contributors
View
56 Gemfile.lock
@@ -1,48 +1,48 @@
PATH
remote: .
specs:
- refinerycms (0.9.9.14)
+ refinerycms (0.9.9.15)
bundler (~> 1.0)
- refinerycms-authentication (~> 0.9.9.14)
- refinerycms-base (~> 0.9.9.14)
- refinerycms-core (~> 0.9.9.14)
- refinerycms-dashboard (~> 0.9.9.14)
- refinerycms-images (~> 0.9.9.14)
- refinerycms-pages (~> 0.9.9.14)
- refinerycms-resources (~> 0.9.9.14)
- refinerycms-settings (~> 0.9.9.14)
- refinerycms-authentication (0.9.9.14)
+ refinerycms-authentication (= 0.9.9.15)
+ refinerycms-base (= 0.9.9.15)
+ refinerycms-core (= 0.9.9.15)
+ refinerycms-dashboard (= 0.9.9.15)
+ refinerycms-images (= 0.9.9.15)
+ refinerycms-pages (= 0.9.9.15)
+ refinerycms-resources (= 0.9.9.15)
+ refinerycms-settings (= 0.9.9.15)
+ refinerycms-authentication (0.9.9.15)
devise (~> 1.2.0)
- refinerycms-core (~> 0.9.9.14)
- refinerycms-base (0.9.9.14)
- refinerycms-core (0.9.9.14)
+ refinerycms-core (= 0.9.9.15)
+ refinerycms-base (0.9.9.15)
+ refinerycms-core (0.9.9.15)
acts_as_indexed (~> 0.7)
friendly_id_globalize3 (~> 3.2.1)
globalize3 (>= 0.1.0.beta)
moretea-awesome_nested_set (~> 1.4)
rails (~> 3.0.5)
rdoc (>= 2.5.11)
- refinerycms-base (~> 0.9.9.14)
+ refinerycms-base (= 0.9.9.15)
refinerycms-generators (~> 1.0)
- refinerycms-settings (~> 0.9.9.14)
+ refinerycms-settings (= 0.9.9.15)
truncate_html (~> 0.5)
will_paginate (~> 3.0.pre)
- refinerycms-dashboard (0.9.9.14)
- refinerycms-core (~> 0.9.9.14)
- refinerycms-images (0.9.9.14)
+ refinerycms-dashboard (0.9.9.15)
+ refinerycms-core (= 0.9.9.15)
+ refinerycms-images (0.9.9.15)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (~> 0.9.9.14)
- refinerycms-pages (0.9.9.14)
- refinerycms-core (~> 0.9.9.14)
+ refinerycms-core (= 0.9.9.15)
+ refinerycms-pages (0.9.9.15)
+ refinerycms-core (= 0.9.9.15)
seo_meta (~> 1.0.2)
- refinerycms-resources (0.9.9.14)
+ refinerycms-resources (0.9.9.15)
dragonfly (~> 0.8.2)
rack-cache (>= 0.5.3)
- refinerycms-core (~> 0.9.9.14)
- refinerycms-settings (0.9.9.14)
- refinerycms-base (~> 0.9.9.14)
- refinerycms-testing (0.9.9.14)
+ refinerycms-core (= 0.9.9.15)
+ refinerycms-settings (0.9.9.15)
+ refinerycms-base (= 0.9.9.15)
+ refinerycms-testing (0.9.9.15)
autotest
autotest-notification
autotest-rails
@@ -55,7 +55,7 @@ PATH
json_pure
launchy
rack-test (~> 0.5.6)
- refinerycms-core (~> 0.9.9.14)
+ refinerycms-core (= 0.9.9.15)
rspec-rails (~> 2.5)
GEM
@@ -89,7 +89,7 @@ GEM
activemodel (= 3.0.5)
activesupport (= 3.0.5)
activesupport (3.0.5)
- acts_as_indexed (0.7.1)
+ acts_as_indexed (0.7.2)
arel (2.0.9)
autotest (4.4.6)
ZenTest (>= 4.4.1)
View
2 authentication/lib/gemspec.rb
@@ -19,7 +19,7 @@
s.require_paths = %w(lib)
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
s.add_dependency 'devise', '~> 1.2.0'
s.files = [
View
6 authentication/refinerycms-authentication.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-authentication}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Authentication engine for Refinery CMS}
s.description = %q{The default authentication engine for Refinery CMS}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
s.add_dependency 'devise', '~> 1.2.0'
s.files = [
View
2 base/lib/gemspec.rb
@@ -9,7 +9,7 @@
s.name = %q{#{gemname = 'refinerycms-base'}}
s.version = %q{#{::Refinery.version}}
s.summary = %q{Base engine for Refinery CMS}
- s.description = %q{The basic base for Refinery CMS Refinery CMS}
+ s.description = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
s.date = %q{#{Time.now.strftime('%Y-%m-%d')}}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
View
2 base/lib/refinery/version.rb
@@ -3,7 +3,7 @@ class Version
@major = 0
@minor = 9
@tiny = 9
- @build = 14
+ @build = 15
class << self
attr_reader :major, :minor, :tiny, :build
View
6 base/refinerycms-base.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-base}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Base engine for Refinery CMS}
- s.description = %q{The basic base for Refinery CMS Refinery CMS}
- s.date = %q{2011-03-31}
+ s.description = %q{This provides a base for Refinery CMS which handles things like settings on the Refinery namespace.}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
View
6 changelog.md
@@ -1,3 +1,9 @@
+## 0.9.9.15 [1 April 2011]
+
+* Fixed asset caching of files in `public/stylesheets/`. [Sergio Cambra](https://github.com/scambra)
+* All dependencies now have an absolute version dependency (e.g. '= 0.9.9.15' rather than '~> 0.9.9.15') to prevent Refinery auto-updating. [Philip Arndt](https://github.com/parndt)
+* [See full list](https://github.com/resolve/refinerycms/compare/0.9.9.14...0.9.9.15)
+
## 0.9.9.14 [31 March 2011]
* Added `refinery.before_inclusion` for running extra functionality just before Refinery attaches to Rails. [Philip Arndt](https://github.com/parndt)
View
8 core/app/views/shared/_html_tag.html.erb
@@ -1,6 +1,6 @@
<!-- paulirish.com/2008/conditional-stylesheets-vs-css-hacks-answer-neither/ -->
-<!--[if lt IE 7 ]> <html lang="en" class="no-js ie6"> <![endif]-->
-<!--[if IE 7 ]> <html lang="en" class="no-js ie7"> <![endif]-->
-<!--[if IE 8 ]> <html lang="en" class="no-js ie8"> <![endif]-->
-<!--[if IE 9 ]> <html lang="en" class="no-js ie9"> <![endif]-->
+<!--[if lt IE 7 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie6"> <![endif]-->
+<!--[if IE 7 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie7"> <![endif]-->
+<!--[if IE 8 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie8"> <![endif]-->
+<!--[if IE 9 ]> <html lang="<%= ::I18n.locale %>" class="no-js ie9"> <![endif]-->
<!--[if (gt IE 9)|!(IE)]><!--> <html lang="<%= ::I18n.locale %>" class="no-js"> <!--<![endif]-->
View
4 core/lib/gemspec.rb
@@ -19,8 +19,8 @@
s.require_paths = %w(lib)
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
- s.add_dependency 'refinerycms-base', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-settings', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-base', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-settings', '= #{::Refinery::Version}'
s.add_dependency 'refinerycms-generators', '~> 1.0'
s.add_dependency 'acts_as_indexed', '~> 0.7'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
View
2 core/lib/refinerycms-core.rb
@@ -80,7 +80,7 @@ class Engine < ::Rails::Engine
end
tag_helper_class.module_eval do
def asset_file_path(path)
- unless (return_path = Pathname.new(File.join(path.split('?').first))).exist?
+ unless (return_path = Pathname.new(File.join(config.assets_dir, path.split('?').first))).exist?
this_asset_filename = path.split('?').first.to_s.gsub(/^\//, '')
::Refinery::Plugins.registered.pathnames.each do |pathname|
if (pathname_asset_path = pathname.join('public', this_asset_filename)).exist?
View
4 core/public/javascripts/wymeditor/lang/es.js
@@ -43,8 +43,8 @@ WYMeditor.STRINGS['es'] = {
Classes: 'Clases',
Status: 'Estado',
Source_Code: 'Código fuente',
- Text_Align: 'Alineación Texto',
- Image_Align: 'Alineación Texto',
+ Text_Align: 'Alineación de Texto',
+ Image_Align: 'Alineación de Imagen',
Font_Size: 'Tamaño de Fuente',
Left: 'Izquierda',
Right: 'Derecha',
View
8 core/refinerycms-core.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-core}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Core engine for Refinery CMS}
s.description = %q{The core of Refinery CMS. This handles the common functionality and is required by most engines}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,8 +14,8 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-base', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-settings', '= 0.9.9.15'
s.add_dependency 'refinerycms-generators', '~> 1.0'
s.add_dependency 'acts_as_indexed', '~> 0.7'
s.add_dependency 'friendly_id_globalize3', '~> 3.2.1'
View
2 dashboard/lib/gemspec.rb
@@ -25,7 +25,7 @@
}.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n '")}'
]
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
end
EOF
View
6 dashboard/refinerycms-dashboard.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-dashboard}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Dashboard engine for Refinery CMS}
s.description = %q{The dashboard is usually the first engine the user sees in the backend of Refinery CMS. It displays useful information and contains links to common functionality.}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -71,5 +71,5 @@ Gem::Specification.new do |s|
'refinerycms-dashboard.gemspec'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
end
View
2 images/lib/gemspec.rb
@@ -25,7 +25,7 @@
}.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n '")}'
]
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 images/refinerycms-images.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-images}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Images engine for Refinery CMS}
s.description = %q{Handles all image upload and processing functionality in Refinery CMS.}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -94,7 +94,7 @@ Gem::Specification.new do |s|
'spec/uploads/beach.jpeg'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
16 lib/gemspec.rb
@@ -47,14 +47,14 @@
s.add_dependency 'bundler', '~> 1.0'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-base', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-dashboard', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-images', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-pages', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-resources', '~> #{::Refinery::Version}'
- s.add_dependency 'refinerycms-settings', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-authentication', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-base', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-dashboard', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-images', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-pages', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-resources', '= #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-settings', '= #{::Refinery::Version}'
s.files = [
'#{files.sort.join("',\n '")}'
View
2 pages/lib/gemspec.rb
@@ -25,7 +25,7 @@
}.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n '")}'
]
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
s.add_dependency 'seo_meta', '~> 1.0.2'
end
EOF
View
6 pages/refinerycms-pages.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-pages}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Pages engine for Refinery CMS}
s.description = %q{The default content engine of Refinery CMS. This engine handles the administration and display of user-editable pages.}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -115,6 +115,6 @@ Gem::Specification.new do |s|
'spec/models/page_spec.rb'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
s.add_dependency 'seo_meta', '~> 1.0.2'
end
View
20 refinerycms.gemspec
@@ -2,9 +2,9 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
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{2011-03-31}
+ s.date = %q{2011-04-01}
s.summary = %q{A Ruby on Rails CMS that supports Rails 3}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
@@ -18,14 +18,14 @@ Gem::Specification.new do |s|
s.add_dependency 'bundler', '~> 1.0'
# Refinery CMS
- s.add_dependency 'refinerycms-authentication', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-base', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-dashboard', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-images', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-pages', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-resources', '~> 0.9.9.14'
- s.add_dependency 'refinerycms-settings', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-authentication', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-dashboard', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-images', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-pages', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-resources', '= 0.9.9.15'
+ s.add_dependency 'refinerycms-settings', '= 0.9.9.15'
s.files = [
'.gitignore',
View
2 resources/lib/gemspec.rb
@@ -25,7 +25,7 @@
}.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n '")}'
]
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
6 resources/refinerycms-resources.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-resources}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Resources engine for Refinery CMS}
s.description = %q{Handles all file upload and processing functionality in Refinery CMS.}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -87,7 +87,7 @@ Gem::Specification.new do |s|
'spec/uploads/refinery_is_awesome.txt'
]
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
s.add_dependency 'dragonfly', '~> 0.8.2'
s.add_dependency 'rack-cache', '>= 0.5.3'
end
View
2 settings/lib/gemspec.rb
@@ -25,7 +25,7 @@
}.map{|d| d.relative_path_from(gempath)}.uniq.sort.join("',\n '")}'
]
- s.add_dependency 'refinerycms-base', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-base', '= #{::Refinery::Version}'
end
EOF
View
6 settings/refinerycms-settings.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-settings}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Settings engine for Refinery CMS}
s.description = %q{The default settings engine that is required by Refinery CMS core. Adds programmer creatable, user editable settings for each engine.}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -83,5 +83,5 @@ Gem::Specification.new do |s|
'spec/models/refinery_setting_spec.rb'
]
- s.add_dependency 'refinerycms-base', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-base', '= 0.9.9.15'
end
View
2 testing/lib/gemspec.rb
@@ -19,7 +19,7 @@
s.require_paths = %w(lib)
s.executables = %w(#{Pathname.glob(gempath.join('bin/*')).map{|d| d.relative_path_from(gempath)}.sort.join(" ")})
- s.add_dependency 'refinerycms-core', '~> #{::Refinery::Version}'
+ s.add_dependency 'refinerycms-core', '= #{::Refinery::Version}'
# RSpec
s.add_dependency 'rspec-rails', '~> 2.5'
View
6 testing/refinerycms-testing.gemspec
@@ -2,10 +2,10 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-testing}
- s.version = %q{0.9.9.14}
+ s.version = %q{0.9.9.15}
s.summary = %q{Testing plugin for Refinery CMS}
s.description = %q{This plugin adds the ability to run cucumber and rspec against the RefineryCMS gem while inside a RefineryCMS project}
- s.date = %q{2011-03-31}
+ s.date = %q{2011-04-01}
s.email = %q{info@refinerycms.com}
s.homepage = %q{http://refinerycms.com}
s.rubyforge_project = %q{refinerycms}
@@ -14,7 +14,7 @@ Gem::Specification.new do |s|
s.require_paths = %w(lib)
s.executables = %w()
- s.add_dependency 'refinerycms-core', '~> 0.9.9.14'
+ s.add_dependency 'refinerycms-core', '= 0.9.9.15'
# RSpec
s.add_dependency 'rspec-rails', '~> 2.5'

Showing you all comments on commits in this comparison.

@parndt
Refinery member
parndt commented on 61d7143 Mar 30, 2011

I carnt speel

@parndt
Refinery member
parndt commented on 3788269 Apr 1, 2011

Implemented as requested :-)

Something went wrong with that request. Please try again.