Browse files

2.0 Release Candidate 1

  • Loading branch information...
1 parent e2a3253 commit 822dd31d03d911b54132147202b3d1f10d189e16 @tvdeyen tvdeyen committed Mar 27, 2012
Showing with 27 additions and 22 deletions.
  1. +24 −0 LICENSE
  2. +0 −20 MIT-LICENSE
  3. +1 −0 alchemy_crm.gemspec
  4. +1 −1 lib/alchemy_crm/version.rb
  5. +1 −1 spec/models/alchemy_crm/delivery_spec.rb
View
24 LICENSE
@@ -0,0 +1,24 @@
+Copyright (c) 2011, magic labs*
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification,
+are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation and/or
+ other materials provided with the distribution.
+
+* Neither the name of magic labs* nor the names of its contributors may be used to
+ endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS
+BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
+OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
20 MIT-LICENSE
@@ -1,20 +0,0 @@
-Copyright 2011 magic labs*
-
-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 AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
View
1 alchemy_crm.gemspec
@@ -8,6 +8,7 @@ Gem::Specification.new do |gem|
gem.description = %q{A CRM module for Alchemy CMS with Newsletters, Contacts, Mailings.}
gem.summary = %q{A CRM module for Alchemy CMS}
gem.homepage = "http://alchemy-cms.com"
+ s.license = 'BSD New'
gem.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
gem.files = `git ls-files`.split("\n")
View
2 lib/alchemy_crm/version.rb
@@ -1,3 +1,3 @@
module AlchemyCrm
- VERSION = "2.0.0.beta1"
+ VERSION = "2.0.0.rc1"
end
View
2 spec/models/alchemy_crm/delivery_spec.rb
@@ -33,7 +33,7 @@ module AlchemyCrm
@recipients.count.should == @mailing.contacts.count
end
- context "mailing having former deliveries", :focus => true do
+ context "mailing having former deliveries" do
before(:each) do
@more_emails = %w(tim@struppi.de mickey@mouse.com)

0 comments on commit 822dd31

Please sign in to comment.