Merge pull request #1 from nonZero/master

:-)

.gitignore

@@ -46,3 +46,4 @@ Boaz-Chen_OPEN-COMMUNITY/
 /.idea/
 build
 media/community_logo
+whoosh_index/

requirements.txt

@@ -6,14 +6,21 @@ django-floppyforms==1.1
 South==0.7.6
 
 # general libs
-pillow==2.1.0
+pillow==2.3.0
 bleach==1.2.2
 
+#search
+Whoosh==2.6.0
+django-haystack==2.1.0
+
 # dev stuff
 django-extensions==1.1.1
 django-debug-toolbar==0.9.4
 django-nose==1.1
+django-taggit==0.11.2
 ipython
+--allow-external python-graph-core
+--allow-unverified python-graph-core
 python-graph-core==1.8.2
 # fabric
 # fabric-virtualenv

src/communities/admin.py

@@ -21,6 +21,7 @@ class CommunityAdmin(ModelAdmin):
               'issue_ranking_enabled',
               'allow_links_in_emails',
               'register_missing_board_members',
+              'email_invitees',
               )
 
     inlines = [CommunityMembershipInline]

src/communities/forms.py

@@ -5,6 +5,8 @@
 from ocd.formfields import HTMLArea, OCSplitDateTime, OCCheckboxSelectMultiple
 from users.models import OCUser, Membership
 import floppyforms as forms
+from haystack.forms import SearchForm, ModelSearchForm
+
 
 class EditUpcomingMeetingForm(forms.ModelForm):
 
@@ -124,3 +126,14 @@ def __init__(self, *args, **kwargs):
         self.fields['upcoming_meeting_participants'].queryset = self.instance.get_members()
         self.fields['upcoming_meeting_participants'].label = ""
 
+
+class CommunitySearchForm(ModelSearchForm):
+    pass
+    # def search(self):
+    #     # First, store the SearchQuerySet received from other processing.
+    #     sqs = super(DateRangeSearchForm, self).search()
+    #
+    #     if not self.is_valid():
+    #         return self.no_query_found()
+    #
+    #     return sqs