Permalink
Browse files

Spring 2012 Release

  • Loading branch information...
1 parent 04ac7d4 commit e59acec3d600c049323397b17cae14fdcaaaec07 @fernando-devsar fernando-devsar committed Apr 11, 2012
Showing 3,447 changed files with 159,552 additions and 1,583 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
View
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<projectDescription>
- <name>GitHub-CollectorCity-Market-Place</name>
- <comment></comment>
- <projects>
- </projects>
- <buildSpec>
- <buildCommand>
- <name>org.python.pydev.PyDevBuilder</name>
- <arguments>
- </arguments>
- </buildCommand>
- </buildSpec>
- <natures>
- <nature>org.python.pydev.pythonNature</nature>
- </natures>
-</projectDescription>
@@ -1,5 +0,0 @@
-#Sun Jun 19 22:50:19 EDT 2011
-eclipse.preferences.version=1
-encoding//stores/cron_past_due.py=utf-8
-encoding//stores/cron_send_daily_invoice.py=utf-8
-encoding//stores/cron_update_bt_payment_status.py=utf-8
View
@@ -8,10 +8,10 @@ import sys
wsgi_path = os.path.abspath(os.path.dirname(__file__))
# guessing that this .wsgi file is under project/deploy/ directory
-sys.path.append(os.path.join(wsgi_path, "../../auctions-env/lib/python2.6/site-packages/"))
+sys.path.append(os.path.join(wsgi_path, "../env/lib/python2.6/site-packages/"))
sys.path.append(os.path.join(wsgi_path, ".."))
-sys.path.append(os.path.join(wsgi_path, "../../"))
-sys.path.append(os.path.join(wsgi_path, "../apps/"))
+#sys.path.append(os.path.join(wsgi_path, "../../"))
+#sys.path.append(os.path.join(wsgi_path, "../apps/"))
# we need to setup the DJANGO_SETTINGS_MODULE before doing any import form the
# django.* namespace:
View
@@ -1,15 +1,29 @@
-django<1.3
+django<1.4
MySQL-python
PIL==1.1.7
-braintree==2.4.0
+#M2Crypto==0.21.1
+#braintree==2.4.0
+braintree==2.10
django-flash==1.7.2
gchecky==0.2.1
boto==1.9b
-pysolr==2.0.12
-django-haystack==1.0.1-final
+pysolr==2.0.13
+django-haystack==1.2.6
Jinja2>=2.5
httplib2
coverage
DjangoSEO
django-debug-toolbar
django-seo
+textile
+git+git://github.com/Tivix/django-cron.git
+django-extensions
+django-simple-captcha
+django-tinymce
+pyenchant
+django_compressor
+python-twitter
+bitlyapi
+django-pagination
+python-memcached
+django-social-auth
View
@@ -1,133 +0,0 @@
-<?xml version="1.0" ?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<schema name="default" version="1.1">
- <types>
- <fieldtype name="string" class="solr.StrField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true" omitNorms="true"/>
-
- <!-- Numeric field types that manipulate the value into
- a string value that isn't human-readable in its internal form,
- but with a lexicographic ordering the same as the numeric ordering,
- so that range queries work correctly. -->
- <fieldType name="sint" class="solr.SortableIntField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="slong" class="solr.SortableLongField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sfloat" class="solr.SortableFloatField" sortMissingLast="true" omitNorms="true"/>
- <fieldType name="sdouble" class="solr.SortableDoubleField" sortMissingLast="true" omitNorms="true"/>
-
- <fieldType name="date" class="solr.DateField" sortMissingLast="true" omitNorms="true"/>
-
- <fieldType name="text" class="solr.TextField" positionIncrementGap="100">
- <analyzer type="index">
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <!-- in this example, we will only use synonyms at query time
- <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
- -->
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="1" catenateNumbers="1" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
- <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
- </analyzer>
- <analyzer type="query">
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
- <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt"/>
- <filter class="solr.WordDelimiterFilterFactory" generateWordParts="1" generateNumberParts="1" catenateWords="0" catenateNumbers="0" catenateAll="0"/>
- <filter class="solr.LowerCaseFilterFactory"/>
- <filter class="solr.EnglishPorterFilterFactory" protected="protwords.txt"/>
- <filter class="solr.RemoveDuplicatesTokenFilterFactory"/>
- </analyzer>
- </fieldType>
-
- <fieldType name="text_ws" class="solr.TextField" positionIncrementGap="100">
- <analyzer>
- <tokenizer class="solr.WhitespaceTokenizerFactory"/>
- </analyzer>
- </fieldType>
- </types>
-
- <fields>
- <!-- general -->
- <field name="id" type="string" indexed="true" stored="true" multiValued="false" required="true"/>
- <field name="type" type="string" indexed="true" stored="true" multiValued="false" />
- <field name="name" type="string" indexed="true" stored="true" multiValued="false" />
-
- <dynamicField name="*_i" type="sint" indexed="true" stored="true"/>
- <dynamicField name="*_s" type="string" indexed="true" stored="true"/>
- <dynamicField name="*_l" type="slong" indexed="true" stored="true"/>
- <dynamicField name="*_t" type="text" indexed="true" stored="true"/>
- <dynamicField name="*_b" type="boolean" indexed="true" stored="true"/>
- <dynamicField name="*_f" type="sfloat" indexed="true" stored="true"/>
- <dynamicField name="*_d" type="sdouble" indexed="true" stored="true"/>
- <dynamicField name="*_dt" type="date" indexed="true" stored="true"/>
-
- <field name="django_ct" type="string" indexed="true" stored="true" multiValued="false" />
- <field name="django_id" type="string" indexed="true" stored="true" multiValued="false" />
-
-
- <field name="category" type="text" indexed="true" stored="true" multiValued="false" />
-
- <field name="category_id" type="slong" indexed="true" stored="true" multiValued="false" />
-
- <field name="ends_at" type="date" indexed="true" stored="true" multiValued="false" />
-
- <field name="description" type="string" indexed="false" stored="true" multiValued="false" />
-
- <field name="summary" type="text" indexed="true" stored="true" multiValued="false" />
-
- <field name="title" type="string" indexed="true" stored="true" multiValued="false" />
-
- <field name="price" type="sfloat" indexed="true" stored="true" multiValued="false" />
-
- <field name="product_id" type="slong" indexed="true" stored="true" multiValued="false" />
-
- <field name="added_at" type="date" indexed="true" stored="true" multiValued="false" />
-
- <field name="shop_name" type="text" indexed="true" stored="true" multiValued="false" />
-
- <field name="state" type="text" indexed="true" stored="true" multiValued="false" />
-
- <field name="shop_id" type="slong" indexed="true" stored="true" multiValued="false" />
-
- <field name="starts_at" type="date" indexed="true" stored="true" multiValued="false" />
-
- <field name="subcategory" type="text" indexed="true" stored="true" multiValued="false" />
-
- <field name="subcategory_id" type="slong" indexed="true" stored="true" multiValued="false" />
-
- <field name="shop_default_dns" type="string" indexed="false" stored="true" multiValued="false" />
-
- <field name="marketplace_id" type="slong" indexed="true" stored="true" multiValued="false" />
-
- <field name="shop_currency" type="string" indexed="false" stored="true" multiValued="false" />
-
- <field name="image_url" type="text" indexed="false" stored="true" multiValued="false" />
- </fields>
-
- <!-- field to use to determine and enforce document uniqueness. -->
- <uniqueKey>id</uniqueKey>
-
- <!-- field for the QueryParser to use when an explicit fieldname is absent -->
- <defaultSearchField>summary</defaultSearchField>
-
- <!-- SolrQueryParser configuration: defaultOperator="AND|OR" -->
- <solrQueryParser defaultOperator="AND" />
-</schema>
-
-
View
@@ -8,10 +8,10 @@ import sys
wsgi_path = os.path.abspath(os.path.dirname(__file__))
# guessing that this .wsgi file is under project/deploy/ directory
-sys.path.append(os.path.join(wsgi_path, "../../auctions-env/lib/python2.6/site-packages/"))
+sys.path.append(os.path.join(wsgi_path, "../env/lib/python2.6/site-packages/"))
sys.path.append(os.path.join(wsgi_path, ".."))
-sys.path.append(os.path.join(wsgi_path, "../../"))
-sys.path.append(os.path.join(wsgi_path, "../apps/"))
+#sys.path.append(os.path.join(wsgi_path, "../../"))
+#sys.path.append(os.path.join(wsgi_path, "../apps/"))
# we need to setup the DJANGO_SETTINGS_MODULE before doing any import form the
# django.* namespace:
View
Binary file not shown.
View
@@ -1,5 +0,0 @@
-from models import *
-from django.contrib import admin
-
-
-
No changes.
@@ -0,0 +1,31 @@
+from django import forms
+from django.contrib import admin
+from django.contrib.flatpages.models import FlatPage
+from django.utils.translation import ugettext_lazy as _
+
+
+class FlatpageForm(forms.ModelForm):
+ url = forms.RegexField(label=_("URL"), max_length=100, regex=r'^[-\w/]+$',
+ help_text = _("Example: '/about/contact/'. Make sure to have leading"
+ " and trailing slashes."),
+ error_message = _("This value must contain only letters, numbers,"
+ " underscores, dashes or slashes."))
+
+ class Meta:
+ model = FlatPage
+
+
+class FlatPageAdmin(admin.ModelAdmin):
+ form = FlatpageForm
+ fieldsets = (
+ (None, {'fields': ('url', 'title', 'content', 'marketplace')}),
+ (_('Advanced options'), {'classes': ('collapse',), 'fields': ('enable_comments', 'registration_required', 'template_name')}),
+ )
+ list_display = ('url', 'title')
+ list_filter = ('marketplace', 'enable_comments', 'registration_required')
+ search_fields = ('url', 'title')
+
+# class Media:
+# js = ('js/tiny_mce/tiny_mce.js', 'js/textareas.js')
+
+admin.site.register(FlatPage, FlatPageAdmin)
@@ -0,0 +1,32 @@
+[
+ {
+ "pk": 1,
+ "model": "flatpages.flatpage",
+ "fields": {
+ "registration_required": false,
+ "title": "A Flatpage",
+ "url": "/flatpage/",
+ "template_name": "",
+ "sites": [
+ 1
+ ],
+ "content": "Isn't it flat!",
+ "enable_comments": false
+ }
+ },
+ {
+ "pk": 2,
+ "model": "flatpages.flatpage",
+ "fields": {
+ "registration_required": true,
+ "title": "Sekrit Flatpage",
+ "url": "/sekrit/",
+ "template_name": "",
+ "sites": [
+ 1
+ ],
+ "content": "Isn't it sekrit!",
+ "enable_comments": false
+ }
+ }
+]
@@ -0,0 +1,18 @@
+from views import flatpage
+from django.http import Http404
+from django.conf import settings
+
+class FlatpageFallbackMiddleware(object):
+ def process_response(self, request, response):
+ if response.status_code != 404:
+ return response # No need to check for a flatpage for non-404 responses.
+ try:
+ return flatpage(request, request.path_info)
+ # Return the original response if any errors happened. Because this
+ # is a middleware, we can't assume the errors will be caught elsewhere.
+ except Http404:
+ return response
+ except:
+ if settings.DEBUG:
+ raise
+ return response
@@ -0,0 +1,75 @@
+# encoding: utf-8
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+class Migration(SchemaMigration):
+
+ def forwards(self, orm):
+
+ # Adding model 'FlatPage'
+ db.create_table('flatpages_flatpage', (
+ ('id', self.gf('django.db.models.fields.AutoField')(primary_key=True)),
+ ('url', self.gf('django.db.models.fields.CharField')(max_length=100, db_index=True)),
+ ('title', self.gf('django.db.models.fields.CharField')(max_length=200)),
+ ('content', self.gf('django.db.models.fields.TextField')(blank=True)),
+ ('enable_comments', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)),
+ ('template_name', self.gf('django.db.models.fields.CharField')(max_length=70, blank=True)),
+ ('registration_required', self.gf('django.db.models.fields.BooleanField')(default=False, blank=True)),
+ ('marketplace', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['market.MarketPlace'])),
+ ))
+ db.send_create_signal('flatpages', ['FlatPage'])
+
+ # Adding M2M table for field sites on 'FlatPage'
+ db.create_table('flatpages_flatpage_sites', (
+ ('id', models.AutoField(verbose_name='ID', primary_key=True, auto_created=True)),
+ ('flatpage', models.ForeignKey(orm['flatpages.flatpage'], null=False)),
+ ('site', models.ForeignKey(orm['sites.site'], null=False))
+ ))
+ db.create_unique('flatpages_flatpage_sites', ['flatpage_id', 'site_id'])
+
+
+ def backwards(self, orm):
+
+ # Deleting model 'FlatPage'
+ db.delete_table('flatpages_flatpage')
+
+ # Removing M2M table for field sites on 'FlatPage'
+ db.delete_table('flatpages_flatpage_sites')
+
+
+ models = {
+ 'flatpages.flatpage': {
+ 'Meta': {'object_name': 'FlatPage'},
+ 'content': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+ 'enable_comments': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'marketplace': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['market.MarketPlace']"}),
+ 'registration_required': ('django.db.models.fields.BooleanField', [], {'default': 'False', 'blank': 'True'}),
+ 'sites': ('django.db.models.fields.related.ManyToManyField', [], {'to': "orm['sites.Site']", 'symmetrical': 'False'}),
+ 'template_name': ('django.db.models.fields.CharField', [], {'max_length': '70', 'blank': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+ 'url': ('django.db.models.fields.CharField', [], {'max_length': '100', 'db_index': 'True'})
+ },
+ 'market.marketplace': {
+ 'Meta': {'object_name': 'MarketPlace'},
+ 'base_domain': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '128'}),
+ 'charge_on_card_as': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '255'}),
+ 'contact_email': ('django.db.models.fields.EmailField', [], {'default': "'contact@yourstore.com'", 'max_length': '75'}),
+ 'contact_phone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '128'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '92'}),
+ 'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '92', 'db_index': 'True'}),
+ 'template_prefix': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'max_length': '92', 'db_index': 'True'}),
+ 'title': ('django.db.models.fields.CharField', [], {'max_length': '92'})
+ },
+ 'sites.site': {
+ 'Meta': {'object_name': 'Site', 'db_table': "'django_site'"},
+ 'domain': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+ 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+ 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+ }
+ }
+
+ complete_apps = ['flatpages']
Oops, something went wrong.

0 comments on commit e59acec

Please sign in to comment.