Browse files

trivial changes

  • Loading branch information...
1 parent 2eb00fd commit d4d19597203f2be1d8cdf462e9ceb7295d255585 Justine Tunney committed Feb 3, 2012
Showing with 22 additions and 16 deletions.
  1. +9 −0 MANIFEST.in
  2. +1 −1 Makefile
  3. +2 −2 README.rst
  4. +4 −3 notes.org
  5. +1 −1 sparkles/admin.py
  6. +5 −9 sparkles/models.py
View
9 MANIFEST.in
@@ -0,0 +1,9 @@
+include README.rst
+include Makefile
+include notes.org
+include conf/init.d/sparkles
+include conf/nginx/nginx.conf
+include conf/nginx/sparkles.conf
+include doc/index.rst
+include doc/Makefile
+include doc/conf.py
View
2 Makefile
@@ -34,7 +34,7 @@ pro:
sparkles collectstatic --noinput
deps:
- apt-get install -y python python-dev lessc uglifyjs
+ apt-get install -y python python-dev lessc coffeescript
newdb:
rm -f sparkles.sqlite3
View
4 README.rst
@@ -6,7 +6,7 @@
:name: sparkles
:description: sparkles
-:copyright: © 2012 Justine Tunney
+:copyright: © 2012 Justine Alexandra Roberts Tunney
:license: GNU AGPL v3 or later
@@ -22,6 +22,7 @@ Install from git into a virtualenv::
source ../bin/activate
git clone git://github.com/jart/sparkles.git
cd sparkles
+ make deps
make
How to run a debug server::
@@ -30,5 +31,4 @@ How to run a debug server::
How to run a non-debug server::
- sudo apt-get install coffeescript lessc
make pro && sparkles runserver
View
7 notes.org
@@ -1,6 +1,7 @@
-* Sparkles Hours
-** Messaging
- CLOCK: [2012-02-03 Fri 02:51]
+* Justine's Hours
+** System Design
+ CLOCK: [2012-02-03 Fri 02:51]--[2012-02-03 Fri 04:30] => 1:39
+** Signup & Messaging
CLOCK: [2012-02-02 Thu 22:43]--[2012-02-03 Fri 02:42] => 3:59
CLOCK: [2012-02-02 Thu 22:25]--[2012-02-02 Thu 22:36] => 0:11
CLOCK: [2012-02-02 Thu 22:00]--[2012-02-02 Thu 22:24] => 0:24
View
2 sparkles/admin.py
@@ -33,7 +33,7 @@ def __init__(self, *args, **kwargs):
class ProposalAdmin(admin.ModelAdmin):
- list_display = ('title', 'created', 'user', 'workgroup')
+ list_display = ('title', 'created', 'user')
search_fields = ('title',)
date_hierarchy = 'created'
history_latest_first = True
View
14 sparkles/models.py
@@ -99,8 +99,8 @@ class FriendRequest(models.Model):
"""Ask someone to be your friend
Once you're friends with someone, that's it! Trust is established and they
- can invite you to whatever goofy proposal they want thereby bombarding
- your phone with text messages. So friend wisely my friends.
+ can add you to whatever goofy proposal they want, thereby bombarding your
+ phone with text messages. So friend wisely my friends.
"""
STATUS_CHOICES = (
('pending', 'Pending'),
@@ -117,7 +117,6 @@ class FriendRequest(models.Model):
class Meta:
unique_together = ("user", "friend")
- ordering = ("user__username", "friend__username")
class Workgroup(models.Model):
@@ -159,9 +158,9 @@ class Meta:
class Proposal(models.Model):
"""A model for fabulous ideas"""
PRIVACY_CHOICES = (
- ('public', 'Public'), #
- ('semipub', 'Semi-Public'), # friends of friends
- ('private', 'Private'), # members only, only creator can invite
+ ('public', 'Public'),
+ ('semipub', 'Semi-Public'),
+ ('private', 'Private'),
)
sid = models.CharField(max_length=255, unique=True, help_text="""
@@ -172,9 +171,6 @@ class Proposal(models.Model):
A single line description""")
created = models.DateTimeField(auto_now_add=True, help_text="""
When was this first created?""")
- workgroup = models.ForeignKey(
- Workgroup, null=True, blank=True, related_name='proposals',
- help_text="Optionally associate proposal with a working group")
privacy = models.CharField(max_length=255, choices=PRIVACY_CHOICES,
default='semipub', help_text="""
Semi-public is the default which means anyone who's friends with a

0 comments on commit d4d1959

Please sign in to comment.