Browse files

Merge branch '2-0-stable'

Conflicts:
	Gemfile
	refinerycms-inquiries.gemspec
  • Loading branch information...
2 parents 0d01ad5 + d6d88b4 commit 51566ca7f1eaabe76bb4aa271135cf9f4229fa9d @parndt parndt committed May 16, 2012
Showing with 11 additions and 7 deletions.
  1. +4 −0 db/seeds.rb
  2. +5 −5 license.md
  3. +2 −2 refinerycms-inquiries.gemspec
View
4 db/seeds.rb
@@ -52,3 +52,7 @@
})
end
end
+
+(Refinery::Inquiries::Setting.methods.sort - ActiveRecord::Base.methods).each do |setting|
+ Refinery::Inquiries::Setting.send(setting) unless setting.to_s =~ /=$/
+end
View
10 license.md
@@ -1,17 +1,17 @@
# MIT License
-
-Copyright (c) 2005-2010 [Resolve Digital Ltd.](http://www.resolvedigital.co.nz)
-
+
+Copyright 2012 Uģis Ozols, Philip Arndt, and Rob Yurkowski
+
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:
-
+
The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
-
+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
View
4 refinerycms-inquiries.gemspec
@@ -3,12 +3,12 @@
Gem::Specification.new do |s|
s.name = %q{refinerycms-inquiries}
s.version = %q{2.1.0.dev}
- s.date = "#{Date.today.strftime("%Y-%m-%d")}"
+ s.date = Date.today.strftime("%Y-%m-%d")
s.summary = %q{Inquiry handling functionality for the Refinery CMS project.}
s.description = %q{Inquiry handling functionality extracted from Refinery CMS to allow you to have a contact form and manage inquiries in the Refinery backend.}
s.homepage = %q{http://refinerycms.com}
s.email = %q{info@refinerycms.com}
- s.authors = ['Philip Arndt', 'Uģis Ozols', 'David Jones']
+ s.authors = ['Uģis Ozols', 'Philip Arndt', 'Rob Yurkowski']
s.require_paths = %w(lib)
s.files = `git ls-files`.split("\n")

0 comments on commit 51566ca

Please sign in to comment.