Permalink
Browse files

Get new spree social to work with rdr

  • Loading branch information...
1 parent 970d58c commit 81f4c6dedda00f3698051da2040c6d939ddcc1fb @LBRapid LBRapid committed Feb 28, 2012
View
@@ -13,11 +13,12 @@ gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-0-stable'
gem 'spree_recently_viewed', :git => 'git://github.com/spree/spree_recently_viewed.git'
gem 'spree_related_products', :git => 'git://github.com/spree/spree_related_products.git'
-gem 'spree_social', :git => 'git://github.com/spree/spree_social.git', :branch => 'namespace'
+#gem 'spree_social', :git => 'git://github.com/LBRapid/spree_social.git'
+gem 'spree_social', :path => '~/projects/spree_social2/spree_social'
gem 'spree_wishlist', :git => 'git://github.com/spree/spree_wishlist.git'
gem 'spree_email_to_friend', :git => 'git://github.com/spree/spree_email_to_friend.git'
-gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git', :branch => 'namespace'
+gem 'spree_static_content', :git => 'git://github.com/spree/spree_static_content.git', :branch => '1-0-stable'
#gem 'spree_editor', :git => 'git://github.com/spree/spree_editor.git'
gem 'spree_paypal_express', :git => 'git://github.com/spree/spree_paypal_express.git'
gem 'spree_active_shipping', :git => 'git://github.com/spree/spree_active_shipping.git'
View
@@ -89,23 +89,13 @@ GIT
spree_core (>= 1.0.0.rc3)
GIT
- remote: git://github.com/spree/spree_social.git
- revision: b2b9471013fd13fd6c270856f2ff02cb28245121
- branch: namespace
- specs:
- spree_social (1.3)
- oa-oauth (>= 0.3.2)
- spree_auth (>= 0.60.1)
-
-GIT
remote: git://github.com/spree/spree_static_content.git
- revision: ab00967f62ed7e6457568afe20845fec6aa442b6
- branch: namespace
+ revision: 519283c0afe9656a8121067d780bf61bcc20a91c
+ branch: 1-0-stable
specs:
- spree_static_content (1.0.0.beta)
- formtastic
- spree_auth (>= 1.0.0.beta)
- spree_core (>= 1.0.0.beta)
+ spree_static_content (1.0.1)
+ spree_auth (~> 1.0.0)
+ spree_core (~> 1.0.0)
GIT
remote: git://github.com/spree/spree_wishlist.git
@@ -119,6 +109,18 @@ PATH
specs:
spree_rdr_theme (0.1.0)
+PATH
+ remote: ~/projects/spree_social2/spree_social
+ specs:
+ spree_social (1.0.0)
+ oa-core
+ omniauth
+ omniauth-facebook
+ omniauth-github
+ omniauth-twitter
+ spree_auth (= 1.0.0)
+ spree_core (= 1.0.0)
+
GEM
remote: http://rubygems.org/
specs:
@@ -226,8 +228,7 @@ GEM
foreman (0.39.0)
term-ansicolor (~> 1.0.7)
thor (>= 0.13.6)
- formtastic (2.0.2)
- rails (~> 3.0)
+ hashie (1.2.0)
highline (1.6.8)
hike (1.2.1)
hoptoad_notifier (2.4.11)
@@ -263,7 +264,7 @@ GEM
i18n (~> 0.4)
multi_json (1.0.4)
multi_xml (0.4.1)
- multipart-post (1.1.4)
+ multipart-post (1.1.5)
mysql (2.8.1)
nested_set (1.6.8)
activerecord (>= 3.0.0)
@@ -278,17 +279,26 @@ GEM
newrelic_rpm (3.3.1)
nokogiri (1.5.0)
oa-core (0.3.2)
- oa-oauth (0.3.2)
- faraday (~> 0.7.3)
- multi_json (~> 1.0.0)
- multi_xml (~> 0.4.0)
- oa-core (= 0.3.2)
- oauth (~> 0.4.0)
- oauth2 (~> 0.5.0)
oauth (0.4.5)
oauth2 (0.5.2)
faraday (~> 0.7)
multi_json (~> 1.0)
+ omniauth (1.0.2)
+ hashie (~> 1.2)
+ rack
+ omniauth-facebook (1.2.0)
+ omniauth-oauth2 (~> 1.0.0)
+ omniauth-github (1.0.1)
+ omniauth (~> 1.0)
+ omniauth-oauth2 (~> 1.0)
+ omniauth-oauth (1.0.0)
+ oauth
+ omniauth (~> 1.0)
+ omniauth-oauth2 (1.0.0)
+ oauth2 (~> 0.5.0)
+ omniauth (~> 1.0)
+ omniauth-twitter (0.0.8)
+ omniauth-oauth (~> 1.0)
orm_adapter (0.0.6)
paperclip (2.5.0)
activerecord (>= 2.3.0)
@@ -11,3 +11,4 @@
//= require admin/spree_promo
//= require_tree .
+//= require admin/spree_social
@@ -15,3 +15,4 @@
//= require jcarousellite_1.3.1
//= require store/rdr_wishlist
//= require store/spree_wishlist
+//= require store/spree_social
@@ -11,5 +11,5 @@
*= require_self
*= require_tree .
- *= require formtastic
+ *= require admin/spree_social
*/
@@ -13,4 +13,5 @@
*= require store/rdr
*= require store/social
*= require store/spree_wishlist
+ *= require store/spree_social
*/
@@ -4,7 +4,5 @@ class NamespaceSpreeSocialTables < ActiveRecord::Migration
def change
rename_table :user_authentications, :spree_user_authentications
rename_table :authentication_methods, :spree_authentication_methods
-
- Spree::PreferenceRescue.try
end
end
@@ -0,0 +1,9 @@
+class UpdateAuthenticationMethods < ActiveRecord::Migration
+ def change
+ change_table :spree_authentication_methods do |t|
+ t.string :provider
+ t.string :api_key
+ t.string :api_secret
+ end
+ end
+end
View
@@ -1,3 +1,4 @@
+# encoding: UTF-8
# This file is auto-generated from the current state of the database. Instead
# of editing this file, please use the migrations feature of Active Record to
# incrementally modify your database, and then regenerate this schema definition.
@@ -10,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20120210094721) do
+ActiveRecord::Schema.define(:version => 20120228144316) do
create_table "spree_activators", :force => true do |t|
t.string "description"
@@ -88,6 +89,9 @@
t.boolean "active"
t.datetime "created_at"
t.datetime "updated_at"
+ t.string "provider"
+ t.string "api_key"
+ t.string "api_secret"
end
create_table "spree_calculators", :force => true do |t|

0 comments on commit 81f4c6d

Please sign in to comment.