Commit Graph

131 Commits (79ddb02df9b6cb4ddca00e2187b46af79b0e6583)

Author SHA1 Message Date
eric 28045aed77 merge master into improve_registration 2013-03-13 10:40:20 -04:00
thatandromeda 7dc1f4cba3 Merge pull request #129 from Gluejar/manager_supporter_msgs
Managers and staff can send messages to supporters [#36991391]
2013-03-12 11:52:43 -07:00
eric 800d0ffdeb cleanup of css and js imports, also mapping 2013-03-08 14:16:24 -05:00
eric 14a6803b9f mailchimp integration [finish #37732465]
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
eric d08ca3efbd Turns out site was already in context for notifications as "current_site"
Also, added sender to notification calls for messages and comments
2013-02-28 16:04:41 -05:00
eric 819f532624 email message needed the full urls 2013-02-27 17:27:32 -05:00
eric 282f877890 wire up msg view to wishlist_message notification [#36991391] 2013-02-26 12:43:54 -05:00
Andromeda Yelton 609c09c74d it was missing a parenthesis 2012-12-31 11:12:55 -05:00
Andromeda Yelton 8692d26540 friendlifying 2012-11-26 14:23:04 -05:00
thatandromeda 1976bb14d3 Update frontend/templates/notification/pledge_charged/short.txt 2012-11-26 13:45:12 -05:00
Raymond Yee 6ab521faa1 Merge branch 'master' into charge_failed 2012-11-23 09:20:58 -08:00
Raymond Yee ecea475419 a few modifications to pledge_failed notice 2012-11-21 11:40:19 -08:00
Raymond Yee cbac6f1e3c First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing 2012-11-21 09:21:01 -08:00
Andromeda Yelton 2858ed194c bugfixing 2012-11-16 11:43:00 -05:00
Andromeda Yelton 87da5ae50e tweaking phrasing following user feedback 2012-11-16 10:07:45 -05:00
Andromeda Yelton 1433be3856 customizing this on a per-user basis is going to be a pain, hence no amount 2012-11-16 10:07:19 -05:00
Raymond Yee b02a289e01 Add templates for pledge_failed notification 2012-11-15 09:06:55 -08:00
Andromeda Yelton 102937567b better syntax 2012-10-16 10:20:41 -04:00
Andromeda Yelton 386a30e3da missing endif 2012-10-14 17:27:52 -04:00
Andromeda Yelton 56f2357b50 DRYer 2012-10-14 17:19:33 -04:00
Andromeda Yelton 0c8d73fbc7 making acknowledgements formatting the same 2012-10-14 17:15:45 -04:00
Andromeda Yelton c15ecd7715 remove ref to payment processor, add acknowledgements 2012-10-14 17:04:32 -04:00
eric 476ce46dab display and notifications of acknowledgements 2012-10-12 23:45:09 -04:00
Raymond Yee 4ab64c2a68 Merge branch 'master' into pledge_pretty_stick_merge
Conflicts:
	frontend/templates/faq_pledge.html
	static/css/sitewide.css
	static/less/sitewide.less

I took frontend/templates/faq_pledge.html from master.
I combined less/css to have def'n of both .central and li.checked
2012-10-10 16:46:11 -07:00
Andromeda Yelton 599606d2ce removing paypal and amazon references [#36554899] 2012-10-10 14:34:59 -04:00
Andromeda Yelton a9d9cde55a grammar 2012-10-02 07:55:11 -04:00
thatandromeda 38b2567a02 Merge pull request #27 from Gluejar/deannoyify_email_notices
[finish #31209035] removes first line from the email notices
2012-10-01 06:28:57 -07:00
eshellman 96a54adc4a Merge pull request #25 from Gluejar/new_wisher_notification_improvement
include clickable links, make grammar singular/plural sensitive
2012-09-28 14:47:47 -07:00
eric f336730800 [finish #31209035] found where that extra line came from
This is why I got email leakage
2012-09-28 15:50:43 -04:00
Andromeda Yelton 57df9c116e removing references to paypal and amazon 2012-09-27 12:35:23 -04:00
Andromeda Yelton 2216369bbf include clickable links, make grammar singular/plural sensitive 2012-09-18 10:16:08 -04:00
Raymond Yee b08643a0ac Merge branch 'master' into relaunch 2012-09-13 10:50:43 -07:00
Andromeda Yelton d8316c76ec user isn't in the context so we shouldn't reference it 2012-09-12 08:41:22 -04:00
Raymond Yee deee2ab75a Merge branch 'master' into relaunch
Conflicts:
	core/signals.py
	frontend/views.py
2012-09-10 14:25:43 -07:00
Andromeda Yelton f2e9559a3a beginning of a notification to RHs when someone wishlists their work 2012-08-31 13:47:01 -04:00
Andromeda Yelton adef29f536 Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
Conflicts:
	core/signals.py
2012-08-16 17:11:12 -04:00
Andromeda Yelton 8ef30302d4 notice templates for campaign shutoffs due to amazon payment suspension 2012-08-08 14:19:04 -04:00
eric 0d13fe9ba4 2 more minus_amount s [#21784207] 2012-08-07 16:18:03 -04:00
eric 5362c202bb added management command to create credits, balance notification [#21784207] 2012-08-07 14:12:50 -04:00
thatandromeda b691c8f896 Update frontend/templates/notification/notice_template.html 2012-07-24 14:52:39 -03:00
eric ed12a0d460 [#32290103] fixed html error- <hr /> not allowed in span 2012-07-22 14:53:53 -04:00
Andromeda Yelton abdb4ddfc7 adding separator between headline and notification text 2012-07-16 14:46:45 -04:00
Andromeda Yelton c9d57bb08b making the sharing block work 2012-07-16 13:47:18 -04:00
Andromeda Yelton f000c01267 fixing more syntax after testing 2012-07-16 13:29:20 -04:00
Andromeda Yelton f56b342b00 fixing syntax errors found while testing 2012-07-16 12:44:27 -04:00
Andromeda Yelton a226669109 bleah, django-notification fails around the with tags. removed. 2012-07-16 11:50:31 -04:00
Andromeda Yelton 95c95dfcc8 added comment to explain about url dispatcher situation 2012-07-09 15:49:36 -04:00
Andromeda Yelton 69502b75ee need to convert urls to template variables or django-notification can't find them 2012-07-09 15:47:38 -04:00
Andromeda Yelton 59b3657808 we were using this verbatim in five different templates. DRY 2012-07-09 15:47:09 -04:00
Andromeda Yelton ac682c2c47 whoa hey. if we're using a TEMPLATING SYSTEM the notification content should probably be blocks inserted into a TEMPLATE, huh. 2012-07-09 11:33:21 -04:00