eric
86834f5e99
remove dead import
2012-04-03 11:47:41 -04:00
eric
298bd5ad3c
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-04-03 11:18:15 -04:00
eric
c90c42a2e8
linefeeds
2012-04-03 11:17:59 -04:00
eshellman
97c7a8edc8
Update core/models.py
2012-04-03 12:15:23 -03:00
eric
aab0c47eeb
reconcile linefeeds
2012-04-03 11:10:49 -04:00
eshellman
7769bbd8b3
really change the notice
2012-04-03 12:07:29 -03:00
eshellman
87bcf412d9
really remove campaign activate signal
2012-04-03 12:05:50 -03:00
eshellman
7cca21a4fb
merge changes
2012-04-03 12:04:12 -03:00
eric
12434c7c09
more resolving conflicts
2012-04-03 10:58:27 -04:00
eric
0319185251
resolve conflicts
2012-04-03 10:54:31 -04:00
eric
faf095408c
fixed campaign tests to include claim and rightsholder
2012-04-03 10:45:48 -04:00
eric
6f1ccde928
moved notify_active_campaign into model, removed redundant context
2012-04-03 10:45:12 -04:00
Raymond Yee
3dcacf881f
Add a function to fire off a successful_campaign signal
2012-04-03 07:08:05 -07:00
Andromeda Yelton
24b7a77228
modifying display of claim status
2012-04-03 09:56:41 -04:00
Andromeda Yelton
7cf46d7f24
now with actual information content
2012-04-03 08:21:05 -04:00
Andromeda Yelton
cd22bd9720
managers should be a required field because a campaign cannot be managed without a manager. against managerless frankencampaigns.
2012-04-03 08:20:46 -04:00
Andromeda Yelton
07f39993c3
now with fewer test failures - wrote custom signal to trigger only on campaign.activate(), not all campaign.save() events
2012-04-02 21:14:41 -04:00
Raymond Yee
01799924a9
1) Undo a mistake I had made -- I mistakenly reversed the comparison between the deadline of the campaign and now()
...
2) updated the campaign deadlines to 2013 in the tests to put the deadline into the future
3) modified campaign_status test to include a user in the transaction so that the notification works
2012-04-02 17:57:30 -07:00
Raymond Yee
f625e98b8f
1) Campaign.update_status determines that a campaign is SUCCESSFUL or UNSUCCESSFUL only after the deadline
...
2) first pass implementation of the successful_campaign notification -- using a successful_campaign custom signal
2012-04-02 16:10:56 -07:00
Andromeda Yelton
e197cd6acc
now notifications actually get sent. cleanup to follow.
2012-04-02 15:04:51 -04:00
Andromeda Yelton
679f797b74
Merge github.com:Gluejar/regluit
2012-04-02 14:17:28 -04:00
Andromeda Yelton
94aa31a950
campaign activation now sends signal which notify listens for. still need to fix actual sending of notification.
2012-04-02 14:17:18 -04:00
Raymond Yee
206c7ebcd4
I've added a send_email_task to wrap django.core.mail.send_mail -- I'm using it for testing but I think it could be useful in general.
...
I've used it to test celerybeat. In my local me.py, I added the following setting:
CELERYBEAT_SCHEDULE = {
"runs-every-30-seconds": {
"task": "regluit.core.tasks.send_mail_task",
"schedule": datetime.timedelta(seconds=60),
"args": ('hi there', 'testing 1, 2, 3', 'raymond.yee@gmail.com', ['raymond.yee@gmail.com'])
},
}
and then ran
django-admin.py celerybeat -l INFO
and started getting email sent to me every minute!
2012-03-30 17:31:54 -07:00
Raymond Yee
55b3e8398e
Hooking in djcelery admin to our admin interface
...
adding CeleryTask to the admin interface
2012-03-30 12:27:35 -07:00
Raymond Yee
69dde055b5
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-30 09:44:12 -07:00
eric
1b9a81b775
Notification back to working on celery startup. Not quite solved. but here's where it is. [ #27115145 ]
2012-03-30 03:07:23 -04:00
Andromeda Yelton
883da1c873
Merge github.com:Gluejar/regluit
2012-03-29 16:28:04 -04:00
Andromeda Yelton
e4d98bd13e
context processors work better if you add them to settings
2012-03-29 16:26:22 -04:00
Andromeda Yelton
7a590637a4
prettifying
2012-03-29 16:26:06 -04:00
Andromeda Yelton
00e9ee2e3c
now, with fewer syntax errors
2012-03-29 16:25:35 -04:00
eric
62e5c4b518
this setting no longer used [ #27115145 ]
2012-03-29 16:14:44 -04:00
eric
ec35e27b52
patched notification into celery
...
not sure where to put emit_notifications task; couldn't get it to work
in tasks because of circular imports [start #27115145 ]
2012-03-29 16:14:43 -04:00
eric
caae736432
removed unused task
2012-03-29 16:14:43 -04:00
Andromeda Yelton
2874be9693
now only displays unseen notices and only provides mark-as-seen option when relevant
2012-03-29 15:34:28 -04:00
Andromeda Yelton
92381d8ab5
added an unseen_count variable available to all templates for notification signaling
2012-03-29 15:34:03 -04:00
Andromeda Yelton
320c66c494
styling see your notifications option in parallel with change-settings option on companion notification page
2012-03-29 14:48:20 -04:00
Andromeda Yelton
449aae4662
notices page now has reasonably styled notices and there is a model for generating other notice types
2012-03-29 14:46:06 -04:00
Andromeda Yelton
17b8ad452a
Merge github.com:Gluejar/regluit
2012-03-29 14:44:15 -04:00
eric
887ca1e696
revert to Andromeda's de-uglification; left base notification template
2012-03-29 10:59:24 -04:00
Andromeda Yelton
28d3836175
Merge github.com:Gluejar/regluit
2012-03-29 08:54:59 -04:00
eric
30d7cbf1a9
either put the setting in common or the local settings, not both
2012-03-29 01:24:00 -04:00
eric
57a1c60903
comments were being id's by name not username, we didn't mean to make name public
2012-03-29 01:22:38 -04:00
eric
4d9e279862
[finish #25980231 ] implemented a separate notification type for other commenters
...
person entering content doesn't get the notification duh
if you've commented on a wishlist item, you only get the also commented
notification, not the wishlist comment notification
2012-03-29 01:21:37 -04:00
eric
729bc6e78d
put back in some stuff Andromeda axed without telling anyone
2012-03-28 23:25:41 -04:00
Raymond Yee
495610badf
Merge branch 'master' of github.com:Gluejar/regluit into payment
2012-03-28 14:37:02 -07:00
Andromeda Yelton
619d37e0a0
blank rights holder name on rh_admin page should not validate
2012-03-28 14:12:10 -04:00
eric
c7f9996444
added status display on work page
2012-03-28 14:12:00 -04:00
Raymond Yee
6d50897508
Clarify the pledge modification process for the supporter.
2012-03-28 10:12:09 -07:00
Andromeda Yelton
a884997364
making slideshow work on pledge_complete
2012-03-28 12:50:42 -04:00
Andromeda Yelton
142ec1a904
de-uglifying
2012-03-28 11:31:50 -04:00