Commit Graph

158 Commits (439169a1ab3b89478641576fff5a8b065b42a424)

Author SHA1 Message Date
eric 1c33c34f21 purchase complete notification, contextual wishlist active, fulfillment in signal handler 2013-08-22 14:30:56 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -04:00
eric d5b9f88380 move "extra data" into a json field dict to improve payment code tidieness
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
Raymond Yee 27bc134fa4 Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc 2013-08-08 12:28:36 -04:00
Raymond Yee a9b5d51b36 Merge branch 'master' into expiring_cc 2013-08-07 22:59:37 -04:00
eric a1b8ac6dba change Rghts tab to More… tab 2013-08-05 17:40:42 -04:00
eric e78d5c7472 clean up account update notices 2013-08-05 12:18:51 -04:00
Raymond Yee 73290fdfc1 fixed up text for account_active notice -- even though at this point, it's not being fired 2013-05-08 16:49:43 -07:00
Raymond Yee db1ee70647 fixed up notice texts for account_expired
also made sure that user is properly passed to sender of notices
2013-04-26 10:50:28 -07:00
Raymond Yee 7265488484 Merge branch 'master' into expiring_cc 2013-04-26 08:58:47 -07:00
eshellman c5517df1c9 Merge pull request #167 from Gluejar/less_officious_comments
Less officious comments
2013-04-25 15:26:47 -07:00
Raymond Yee a375112e72 Merge branch 'master' into expiring_cc 2013-04-24 13:50:33 -07:00
Andromeda Yelton aca759447d test for staffness in template 2013-04-24 11:28:05 -04:00
Andromeda Yelton 80ee477198 disambiguate staff and RH 2013-04-23 10:22:08 -04:00
Andromeda Yelton 516f867d87 removing word 'official' 2013-04-23 10:07:59 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
Raymond Yee aac69cf64c Fixed up account_expiring text...next step is to fix up account_expired and account_active 2013-04-17 15:43:44 -07:00
Raymond Yee 3b900e2328 Align names signals.py with those in the short.txt for notices 2013-04-17 13:24:43 -07:00
Raymond Yee 86dcdea1b7 updated text for cc notices 2013-04-17 11:42:49 -07:00
Raymond Yee 9cc2e3121e Merge branch 'master' into expiring_cc 2013-04-10 09:14:29 -07:00
Andromeda Yelton 075dfc3c55 altering term 'rights holder' in places where non-RHs are likely to encounter it and be confused 2013-04-09 12:31:19 -04:00
Andromeda Yelton 7dd1b994cd fixing syntax error 2013-04-01 10:28:19 -04:00
eric d905f288d7 merge from master 2013-03-22 16:45:41 -04:00
Raymond Yee aca38d66a1 Merge branch 'master' into expiring_cc
Conflicts:
	payment/tests.py
2013-03-20 09:41:30 -07:00
eric 7f64189284 create and deploy avatar_source and avatar_url 2013-03-14 15:43:24 -04:00
eric 6143c6a3aa normalize invocation of supporter url, fix wrong user for comment links 2013-03-14 15:33:00 -04:00
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
Raymond Yee 7fef0a65f0 refining account_* notices 2013-02-27 15:18:32 -08: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