artfully_ose 1.3.0.pre1 → 1.3.0.pre2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a91236e58df6a58752ee849ab10fdc434042889
-  data.tar.gz: a23a35e3e9a3509d51aab0b2649d89b144fb57e9
+  metadata.gz: 2227e62aa7b96bf9b47c53b10e6f7be5e505b8d2
+  data.tar.gz: 2730b7c985317b350a7375e3d323ce1625652f77
 SHA512:
-  metadata.gz: dd3aa2d49a76d635a0da70475c5f6ae428eec357c42ce38e49cfbf9105423749122c9f20cbee3a1301e0c83c88ce9732fc09b8f53344d79a46605c449a1b0af0
-  data.tar.gz: 33d68fe5b36584e757a141047835fe03fa0becb90efed842ae601ac206ed57fd98e9ddfd264ebdd5b7a15c50b7d25d6e365718d626c64b0a11fec1ef0572f377
+  metadata.gz: a1d9292c210b7f9eb3a73b4ab50be727c9a2963b494475ce7b2638d7f3ca8f1d5958972af8fb1f14c146b054be255d74c6dde8c7148933caa07a395061a94988
+  data.tar.gz: e94e5cda62a1e681e59f7dfffe0621018b3ea8c9c84c414e8ed4d51aac6bf7d58bc0ad6b0d8410d306e4f1379d3241a57a73d0283fbefb7a18f4dcba8d4feb33

data/app/controllers/mailchimp_kits_controller.rb

@@ -0,0 +1,71 @@
+class MailchimpKitsController < ApplicationController
+  rescue_from CanCan::AccessDenied do |exception|
+    flash[:alert] = exception.message
+    redirect_to root_path, :alert => exception.message
+  end
+
+  rescue_from Gibbon::GibbonError do |exception|
+    if exception.message =~ /api_key/
+      redirect_to edit_mailchimp_kit_path(params[:id])
+    end
+    redirect_to root_path, :alert => "There was a problem with mailchimp, please try again"
+  end
+
+  before_filter do
+    authorize! :edit, current_user.current_organization
+  end
+
+  def edit
+    @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
+  end
+
+  def update
+    @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
+
+    unless params[:mailchimp_kit][:api_key].nil?
+      params[:mailchimp_kit][:api_key] = params[:mailchimp_kit][:api_key].strip
+    end
+
+    @kit.old_api_key = @kit.api_key
+    if @kit.update_attributes(params[:mailchimp_kit])
+      redirect_to lists_mailchimp_kit_url(@kit)
+    else
+      params[:new_api_key] = true
+      flash[:error] = "We could not validate your api key.  Please make sure it is correct and try again."
+      render :edit
+    end
+  end
+
+  def lists
+    @kit = Kit.find(params[:id])
+    authorize! :edit, @kit
+  end
+
+  def default_list
+    @kit = Kit.find(params[:id])
+  end
+
+  def manage
+    kit = Kit.find(params[:id])
+    authorize! :edit, kit
+
+    kit.change_lists(params[:lists] || [])
+    kit.update_attributes(mailchimp_kit_params)
+    redirect_to current_user.current_organization, :notice => "Great! We're syncing your MailChimp lists with Artful.ly and will email when we're done."
+  end
+
+  def hide_alert
+    kit = Kit.find(params[:id])
+    kit.hide_default_list_alert = true
+    kit.save
+    head :ok
+  end
+
+  private
+
+  def mailchimp_kit_params
+    params.fetch(:mailchimp_kit).slice(:default_list_id, :fan_subscribe_question)
+  end
+end

data/app/controllers/mailchimp_webhooks_controller.rb

@@ -0,0 +1,25 @@
+class MailchimpWebhooksController < ApplicationController
+  skip_before_filter :authenticate_user!
+  skip_before_filter :metric_logged_in
+
+  def show
+    MailchimpKit.find(params[:id])
+    head :ok
+  end
+
+  def update
+    mailchimp_kit = MailchimpKit.find(params[:id])
+
+    if mailchimp_kit.attached_lists.none? { |list| list[:list_id] == params[:list_id] }
+      head 422
+      return
+    end
+
+    if !mailchimp_kit.cancelled?
+      job = MailchimpSyncJob.new(mailchimp_kit, :type => "webhook_#{params[:type]}", :data => params[:data], :list_id => params[:list_id])
+      Delayed::Job.enqueue(job, :queue => "mailchimp")
+    end
+
+    head :ok
+  end
+end

data/app/controllers/membership_comps_controller.rb

@@ -3,6 +3,12 @@ class MembershipCompsController < ArtfullyOseController
   
   def new
     @membership_types = current_organization.membership_types.all
+
+    if @membership_types.empty?
+      flash[:notice] = "To comp a memberhsip to a patron you'll need to create a memebership type first."
+      redirect_to new_membership_type_path and return
+    end
+
     @membership_types_hash = {}
     @membership_types.each {|mt| @membership_types_hash[mt.id] = {:allow_multiple_memberships => mt.allow_multiple_memberships?,:formatted_ends_at => I18n.l(mt.ends_at, :format => :date_for_input)}}
 

data/app/controllers/people_controller.rb

@@ -75,7 +75,7 @@ class PeopleController < ArtfullyOseController
           single_optin = params.fetch("single_optin", false) == "true"
           @person.update_and_note_subscriptions!(current_user, subscribed_lists, groupings, single_optin)
           flash[:notice] << "Your changes have been saved." +
-              (have_duplicate_addresses ? " We didn’t save some addresses because they were duplicates." : "")
+              (have_duplicate_addresses ? " We didn't save some addresses because they were duplicates." : "")
         else
           errs = [@person.errors.delete(:"relationships.base")].flatten + [@person.errors.full_messages.to_sentence].flatten
           flash[:alert] = errs.blank? ? "Sorry, we couldn't save your changes. Make sure you entered a first name, last name or email address." : errs.compact

data/app/helpers/mailchimp_helper.rb

@@ -0,0 +1,14 @@
+module MailchimpHelper
+  def default_list_options(kit)
+    lists = kit.attached_lists.map { |list| [list[:list_name], list[:list_id]] }
+    options_for_select(lists, kit.default_list_id)
+  end
+
+  def default_list_prompt(kit)
+    if kit.attached_lists.empty?
+      "Please select lists above"
+    else
+      "Select a list"
+    end
+  end
+end

data/app/models/action_feed.rb

@@ -0,0 +1,126 @@
+class ActionFeed
+  attr_accessor :organization_id, :redis
+  include ActionView::Helpers::SanitizeHelper
+  cattr_accessor :redis
+
+  def self.for(organization_id)
+    af = ActionFeed.new
+    af.organization_id = organization_id
+    @@redis ||= RedisManager.connection
+    af
+  end
+
+  def key
+    "feed:#{organization_id}"
+  end
+
+  def burst_key
+    "burst:#{organization_id}"
+  end
+
+  #
+  # If the action is ON TOP, add it to the top of the feed
+  # If the action is *in* the top, rebuild the feed
+  # Otherwise do nothing
+  #
+  def add(action)
+    Rails.logger.debug("ACTION_FEED [#{self.key}] checking action [#{action.id}]")
+
+    if(is_top? action.id)
+      Rails.logger.debug("ACTION_FEED [#{self.key}] adding action [#{action.id}]")
+      # lpush!
+      @@redis.lpush(self.key, for_dashboard(action))
+      @@redis.ltrim(self.key, 0, 24)
+    else
+      delay_time = action.can_wait? ? 300 : 10
+      self.rebuild_later(delay_time)
+    end
+  end
+
+  def feed
+    begin 
+      @@redis.lrange(self.key, 0, 24)
+    rescue Exception => e 
+      Airbrake.notify(e, :parameters => {:error_message => "Redis error getting action feed"})
+      []
+    end
+  end
+
+  def is_top?(action_id)
+    id = Action.recent(self.organization_id).limit(1).pluck(:id).first
+    Rails.logger.debug("ACTION_FEED [#{self.key}] top action is [#{id}]")
+    action_in_top = (action_id == id)
+
+    if (action_in_top)
+      Rails.logger.debug("ACTION_FEED [#{self.key}] action [#{action_id}] is on top")
+    end 
+
+    action_in_top
+  end
+
+  def in_top?(action_id)
+    ids = Action.recent(self.organization_id).limit(25).pluck(:id)
+    Rails.logger.debug("ACTION_FEED [#{self.key}] top actions #{ids}")
+    action_in_top = ids.include?(action_id)
+    Rails.logger.debug("ACTION_FEED [#{self.key}] action [#{action_id}] is in top [#{action_in_top}]")
+    action_in_top
+  end
+
+  def rebuild_if_necessary(action, and_delay=false)
+    if ((action.deleted_at.present?) || (self.in_top? action.id))
+      Rails.logger.debug("ACTION_FEED [#{self.key}] rebuild_if_necessary")
+      and_delay ? self.rebuild_later : self.rebuild
+    end
+  end
+
+  def rebuild_later(delay_time = 10)
+    Rails.logger.debug("ACTION_FEED [#{self.key}] rebuild_later")
+
+    RedisManager.burst_job(burst_key, delay_time) do
+      Rails.logger.debug("ACTION_FEED [#{self.key}] scheduling rebuild")
+      job = ActionFeed::RebuildJob.new(self.organization_id)
+      Delayed::Job.enqueue(job, {:queue => "feed", :run_at => delay_time.seconds.from_now})
+    end
+  end
+
+  #
+  # To rebuild now. Not terribly slow but still use with caution
+  #
+  def rebuild
+    Rails.logger.debug("ACTION_FEED [#{self.key}] rebuilding")
+    actions = Action.recent(self.organization_id).limit(25)
+    self.destroy
+    actions.each do |action|
+      # rpush!
+      @@redis.rpush(self.key, for_dashboard(action))
+    end
+    @@redis.ltrim(self.key, 0, 24)
+    actions
+  end
+
+  def destroy
+    @@redis.del(key)
+  end
+
+  def for_dashboard(action)
+    template    = File.read("#{ArtfullyOse::Engine.root}/app/views/index/_action.html.haml")
+    haml_engine = Haml::Engine.new(template)
+
+    base = Class.new do
+      include ArtfullyOseHelper
+      include ActionView::Helpers::DateHelper
+    end.new
+
+    scope       = base
+    output      = haml_engine.render(scope, {:action => action})
+    output.gsub("'","\'") # necessary to escape single '
+    output = sanitize(output)
+    output
+  end
+
+  class RebuildJob < Struct.new(:organization_id)
+    def perform
+      ActionFeed.for(self.organization_id).rebuild
+    end
+  end
+end

data/app/views/kits/_list.html.haml

@@ -5,5 +5,13 @@
     %ul
       %li Paid Ticketing
       %li People
-      %li= link_to "Membership", [:edit, @organization.membership_kit], :id => "configure_#{@organization.membership_kit.type.underscore}"
-      %li= link_to "Passes", [:edit, @organization.passes_kit], :id => "configure_#{@organization.passes_kit.type.underscore}"
+      %li Scannable Tickets
+      %li Fundraising/Campaigns
+      -if @ability.can? :manage, Kit
+        %li= link_to "Membership", [:edit, @organization.membership_kit]
+        %li= link_to "Passes", [:edit, @organization.passes_kit]
+        %li= link_to "Mailchimp", [:edit, @organization.kits.where(:type => "MailchimpKit").first]
+      -else
+        %li Membership
+        %li Passes
+        %li Mailchimp

data/app/views/layouts/application.html.haml

@@ -2,8 +2,6 @@
 %html{:lang => "en", "ng-app" => "artfully"}
   %head
     %title= "#{yield :title} : #{t 'artfully.page_title'}"
-    = stylesheet_link_tag "#{ENV['CAS_ASSET_HOST'] || ENV['CAS_BASE_URL']}/assets/memberbar.css"
-    = javascript_include_tag "#{ENV['CAS_ASSET_HOST'] || ENV['CAS_BASE_URL']}/assets/memberbar.js"
 
     :plain
       <link href='//fonts.googleapis.com/css?family=Open+Sans+Condensed:300' rel='stylesheet' type='text/css'>

data/app/views/mailchimp_kits/activate.html.haml

@@ -0,0 +1,19 @@
+- content_for :header do
+  %h1 MailChimp Kit
+
+.row
+  .span6
+    %p
+      With your activated MailChimp Kit, you can:
+      %ul{:style => "margin:10px;padding:10px;list-style:disc;"}
+        %li Push your Artful.ly contacts up to Mailchimp
+        %li Import your MailChimp subscribers into Artful.ly
+        %li Record MailChimp newsletters on Artful.ly people records
+        %li Let fans subscribe to a list when they checkout
+
+  .span5
+    .well
+      .center
+        Click the Activate button to get started
+      .btn-toolbar.form-actions.center
+        .btn-group= button_to "Activate Mailchimp", kits_path(:type => @kit.type.underscore), :class => "btn btn-success btn-large"

data/app/views/mailchimp_kits/edit.html.haml

@@ -0,0 +1,20 @@
+- content_for :header do
+  %h1 MailChimp Kit
+
+.row
+  .span6.offset3
+    - if @kit.api_key.nil? || params[:new_api_key]
+      = form_for @kit, :html => { :class => 'form-horizontal' } do |f|
+        %p
+          Artful.ly needs your MailChimp API key to communicate with MailChimp.  Get your API key #{link_to "here", "http://admin.mailchimp.com/account/api", :target => "_blank" } and fill in that value below:
+
+        = f.text_field :api_key, :class => "span4"
+
+        = f.submit "Set API Key", :class => "btn"
+    - else
+      %p
+        Your MailChimp Kit is all set!  If you like, you can:
+      %p
+        = link_to "Change this API key", edit_mailchimp_kit_path(@kit, :new_api_key => true)
+      %p
+        = link_to "Manage my connected lists.", lists_mailchimp_kit_path(@kit)

data/app/views/mailchimp_kits/lists.html.haml

@@ -0,0 +1,48 @@
+- content_for :header do
+  %h1 MailChimp Kit
+
+.row
+  .span6
+    %p
+      Select which MailChimp lists you would like Artful.ly to integrate with.  Subscribers to each selected list will be imported into Artful.ly.
+    %p
+      You can come back to this page and edit this list at any time.
+    %p
+      The following data will be imported from your MailChimp subscribers:
+    %table.table.table-bordered.table-striped.docs
+      %tr
+        %td.field EMAIL
+        %td This is an "email" type field. We will push the individual's email address to this field.
+      %tr
+        %td.field FNAME
+        %td This is is a "text" type field. We will push the individual's first name to this field.
+      %tr
+        %td.field LNAME
+        %td This is is a "text" type field. We will push the individual's last name to this field.
+  .span5
+    - if @kit.lists.count > 0
+      = form_for @kit, :url => manage_mailchimp_kit_path(@kit), :method => :post do |f|
+        .well
+          %p
+            Which MailChimp lists would you like to sync?
+          - @kit.lists.each do |list|
+            .list
+              = label_tag "", :class => "checkbox" do
+                = check_box_tag "lists[]", list[1], @kit.list_attached?(list[1]), :class => "list", "data-list-name" => list[0]
+                %span.name= list[0]
+        .well
+          = label_tag "mailchimp_kit[default_list_id]" do
+            Which list would you like to ask your fans to join when they check out?
+          .list-default
+            = select_tag "mailchimp_kit[default_list_id]", default_list_options(@kit), :prompt => default_list_prompt(@kit)
+
+        .well
+          = label_tag "mailchimp_kit[fan_subscribe_question]" do
+            How would you like to ask fans to subscribe to that list?
+          = text_field_tag "mailchimp_kit[fan_subscribe_question]", @kit.fan_subscribe_question, :maxlength => "60"
+
+        = f.submit "Save", :class => "btn btn-primary"
+
+    - else
+      .notice
+        No Mailchimp lists were attached to this account. Please make a list and try again.

data/app/views/organizations/_basics.html.haml

@@ -0,0 +1,42 @@
+.row
+  .span6
+    %ul.kv
+      %li.row-fluid
+        .key.span3 Organization Name
+        .value.span6= @organization.name
+      %li.row-fluid
+        .key.span3 Email
+        .value.span6= @organization.email
+      %li.row-fluid
+        .key.span3 Time Zone
+        .value.span6= @organization.time_zone
+
+    - if @ability.can? :manage, current_user.current_organization
+      = link_to "Edit", edit_organization_path(@organization), {:class => "btn"}
+
+  .span6
+    %ul
+      %li.row-fluid
+        .span4 
+          %strong Your Central Storefront
+        .span8=link_to store_organization_events_url(@organization.cached_slug), store_organization_events_url(@organization.cached_slug), :target => "blank"
+    %p
+      ="Patrons can visit this URL to buy tickets to your events and make donations to your organization. You can customize this URL #{link_to "here", edit_organization_path(@organization)}.".html_safe
+
+    - if @organization.has_any_storefront_kit?
+      #storefront-table
+        %h5 Storefronts
+
+        %table.table.table-compact
+          - [:regular_donation, :membership, :passes].each do |kit|
+            - if(@organization.has_kit? (kit))
+              %tr
+                %td=@organization.kit(kit).friendly_name
+                %td{:id => "badge_#{kit}"}
+                  .center
+                    -if @organization.has_active_storefront? kit 
+                      .badge.badge-success{:id => "storefront_badge_#{kit.to_s}"}
+                        =link_to "On", [:edit, @organization.kit(kit)], :id => "configure_#{kit}", :style => "color: white; cursor: pointer;"
+                    -else
+                      .badge
+                        =link_to "Off", [:edit, @organization.kit(kit)], :id => "configure_#{kit}", :style => "color: white; cursor: pointer;"

data/app/views/organizations/_connection_form.html.haml

@@ -1,21 +0,0 @@
-#faForm.modal
-  = form_for fa_user, :url => connect_organization_path(organization) do |form|
-    .modal-header
-      .close{'data-dismiss'=>'modal'} x
-      .row-fluid
-        .span2
-          =image_tag "falogo_50.jpg"
-        .span10
-          %h3 Connect to Fractured Atlas
-    .modal-body
-      - back ||= false
-      = hidden_field_tag :back, true if back
-      %ul
-        %li
-          = form.label :username, "Fractured Atlas Username", :class=>'control-label'
-          = form.text_field :username
-        %li
-          =form.label :password, "Password", :class=>'control-label'
-          =form.password_field :password, autocomplete: 'off'
-    .modal-footer
-      = form.submit "Connect", :class => 'btn'

data/app/views/organizations/show.html.haml

@@ -2,26 +2,28 @@
 - content_for :header do
   %h1 Account Administration
 
-.bottom-room.bordered-section
-  .row
-    .span3
-      %h3{:style => "margin-top: 0px"} Details
-      - if can? :manage, current_user.current_organization
-        = link_to "Edit", edit_organization_path(@organization), {:class => "btn"}
-    .span9
-      %ul.kv
-        %li.row-fluid
-          .key.span3 Organization Name
-          .value.span9= @organization.name
-        %li.row-fluid
-          .key.span3 Email
-          .value.span9= @organization.email
-        %li.row-fluid
-          .key.span3 Time Zone
-          .value.span9= @organization.time_zone
+- @active_tab ||= "basics"
 
-.bottom-room.bordered-section
-  = render :partial => "kits/list", :locals => { :organization => @organization }
+%ul.nav.nav-tabs
+  %li{:class => "#{'active' if @active_tab=='basics'}"}
+    %a{:href => "#basics", "data-toggle" => "tab"} Basics
+  -if @ability.can? :manage, Kit
+    %li{:class => "#{'active' if @active_tab=='kits'}"}
+      %a{:href => "#kits", "data-toggle" => "tab"} Kits
 
-.bottom-room.bordered-section
-  = render :partial => "user_memberships/list", :locals => { :organization => @organization }
+  -if @ability.can? :view, User
+    %li{:class => "#{'active' if @active_tab=='users'}"}
+      %a{:href => "#users", "data-toggle" => "tab"} Users
+
+.tab-content
+  .tab-pane#basics{:class => "#{'active' if @active_tab=='basics'}"}
+    =render :partial => "basics"
+  -if @ability.can? :manage, Kit
+    .tab-pane#kits{:class => "#{'active' if @active_tab=='kits'}"}
+      = render :partial => "kits/list", :locals => { :kits => @kits }
+  -if @ability.can? :view, User
+    .tab-pane#users{:class => "#{'active' if @active_tab=='users'}"}
+      = render :partial => "user_memberships/list", :locals => { :organization => @organization }
+
+-if @ability.can? :manage, @organization
+  = render :partial => 'connection_form', :locals => { :organization => @organization }

data/config/routes.rb

@@ -113,7 +113,16 @@ Rails.application.routes.draw do
     get :alternatives, :on => :collection
     post :requirements, :on => :collection
     get :requirements, :on => :collection
+  end  
+  resources :mailchimp_kits, :only => [ :edit, :update ] do
+    member do
+      get :lists
+      post :manage
+      post :hide_alert
+    end
   end
+  resources :mailchimp_webhooks, :only => [ :show ]
+  post "/mailchimp_webhooks/:id" => "mailchimp_webhooks#update"
 
   resources :membership_kits, :only => [ :edit, :update ]
   resources :passes_kits, :only => [ :edit, :update ]

data/db/migrate/20141009191355_add_donated_to_searches.artfully_ose_engine.rb

@@ -0,0 +1,5 @@
+class AddDonatedToSearches < ActiveRecord::Migration
+  def change
+    add_column :searches, :has_donated, :boolean, :default => true
+  end
+end

data/lib/artfully_ose/version.rb

@@ -1,3 +1,3 @@
 module ArtfullyOse
-  VERSION = "1.3.0.pre1"
+  VERSION = "1.3.0.pre2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: artfully_ose
 version: !ruby/object:Gem::Version
-  version: 1.3.0.pre1
+  version: 1.3.0.pre2
 platform: ruby
 authors:
 - Artful.ly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-13 00:00:00.000000000 Z
+date: 2015-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -570,6 +570,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: redis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.2.0
 description: A Ruby on Rails engine for running ticketing, CRM, and order management.  See
   http://fracturedatlas.github.com/artfully_app/ for the reference implementation
 email:
@@ -1975,6 +1989,8 @@ files:
 - app/controllers/imports_controller.rb
 - app/controllers/index_controller.rb
 - app/controllers/job_monitors_controller.rb
+- app/controllers/mailchimp_kits_controller.rb
+- app/controllers/mailchimp_webhooks_controller.rb
 - app/controllers/member_cards_controller.rb
 - app/controllers/members/index_controller.rb
 - app/controllers/members/invitations_controller.rb
@@ -2043,6 +2059,7 @@ files:
 - app/helpers/households_helper.rb
 - app/helpers/imports_helper.rb
 - app/helpers/link_helper.rb
+- app/helpers/mailchimp_helper.rb
 - app/helpers/mailchimp_lists_for_search_helper.rb
 - app/helpers/members_helper.rb
 - app/helpers/membership_types_helper.rb
@@ -2059,6 +2076,7 @@ files:
 - app/mailers/reports_mailer.rb
 - app/models/ability.rb
 - app/models/action.rb
+- app/models/action_feed.rb
 - app/models/actions/change_action.rb
 - app/models/actions/comp_action.rb
 - app/models/actions/convert_action.rb
@@ -2470,6 +2488,9 @@ files:
 - app/views/layouts/mail.html.haml
 - app/views/layouts/members.html.haml
 - app/views/layouts/storefront.html.haml
+- app/views/mailchimp_kits/activate.html.haml
+- app/views/mailchimp_kits/edit.html.haml
+- app/views/mailchimp_kits/lists.html.haml
 - app/views/members/index/index.html.haml
 - app/views/members/invitations/edit.html.haml
 - app/views/members/invitations/new.html.erb
@@ -2527,6 +2548,7 @@ files:
 - app/views/orders/passes.html.haml
 - app/views/orders/sales.html.haml
 - app/views/orders/show.html.haml
+- app/views/organizations/_basics.html.haml
 - app/views/organizations/_connection_form.html.haml
 - app/views/organizations/_form.html.haml
 - app/views/organizations/_website_form.html.haml
@@ -2878,6 +2900,7 @@ files:
 - db/migrate/20140905080503_create_scheduled_pledge_payments.rb
 - db/migrate/20140909150251_add_org_to_suggested_household.rb
 - db/migrate/20141007114614_add_order_id_to_donations.rb
+- db/migrate/20141009191355_add_donated_to_searches.artfully_ose_engine.rb
 - db/migrate/20141021134013_add_lifetime_pledges_to_people.rb
 - db/migrate/20141027191307_default_overwrite_member_addresses_to_false.rb
 - db/migrate/20141031193839_update_relations.rb