Commit Graph

213 Commits (f57652e833b5bf7b5b57918537403c787716d52f)

Author SHA1 Message Date
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
Andromeda Yelton 6ccaf81f06 updated to reflect Amazon email so supporters won't be surprised by it 2012-07-02 11:07:10 -04:00
Andromeda Yelton 8fbc65a305 merge 2012-06-28 14:31:48 -07:00
Andromeda Yelton de929363e5 we are going to need an unsuccessful campaign signal asap, sadly 2012-06-28 14:07:33 -07:00
Raymond Yee 4bb48c64e6 changing future to present continuous tense for when credit card charged 2012-06-21 09:07:05 -07:00
Raymond Yee 0c88c77733 forgot the easy-to-forget endswith 2012-06-21 06:14:37 -07:00
Raymond Yee 013ddb5a3c Another template problem in the pledge_charged notices 2012-06-21 06:09:37 -07:00
Raymond Yee 20e5baa6ba work -> transaction.campaign.work 2012-06-21 05:09:51 -07:00
Raymond Yee 7482a19cd1 work.id -> campaign.work.id 2012-06-20 21:29:23 -07:00
eric f7282d4e11 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-06-19 07:34:52 -04:00
eric 001f654880 trivial cleanup in unglued ebook notification 2012-06-19 07:34:37 -04:00
Raymond Yee 30bf30177c Added a case for pledge_modified to have a up_or_down to be 'canceled' -- and change in template text to handle the canceling of a pledge 2012-06-15 16:14:26 -04:00
Andromeda Yelton 12dca9c36d reducing redundancy in comment notification lead-in 2012-06-15 11:32:12 -03:00
Andromeda Yelton 2241134e92 comment notifications should contain link to comments tab 2012-06-13 08:52:53 -03:00
Andromeda Yelton 153e7eaff9 Merge branch 'master' of github.com:Gluejar/regluit 2012-06-01 11:02:35 -04:00
Andromeda Yelton 4eab46f1d5 clarify what 'official comment' means 2012-05-30 12:36:35 -04:00
Raymond Yee 63567d8eaa mad->made (typo fix) 2012-05-30 09:32:04 -07:00
Andromeda Yelton 1c5264d8a1 removing reference to payment_processor context variable, made irrelevant now that we have transaction.host 2012-05-29 21:01:17 -04:00
Andromeda Yelton 48481bd819 improving ple pledge_modified 2012-05-29 20:50:53 -04:00
Andromeda Yelton 5d37a969bd phrasing needs to be sensitive to increase vs decrease 2012-05-29 08:55:16 -04:00
eric 8ca9b7900c [start #28494261] "official" notification get sent by email too wishers by default. needs syncdb 2012-05-25 14:52:50 -04:00
Andromeda Yelton 0fcdbee50a minor copy-editing type stuff 2012-05-22 11:07:40 -04:00
Andromeda Yelton c4053a4b59 communicating stuff more clearly 2012-05-16 14:03:14 -04:00
Andromeda Yelton 104b916171 changing http unglue.it links to https 2012-05-16 11:38:42 -04:00
Andromeda Yelton b9de19bb09 modifying pledge_charged to only send transaction as context, and templates derive campaign and work info therefrom 2012-05-16 10:35:58 -04:00
Andromeda Yelton 775d1d4af2 fixing rendering of successful campaign notifications 2012-05-16 10:06:26 -04:00
eric 979bb8b037 missing humaize in pledged_charge [#28493739] 2012-05-16 01:48:41 -04:00
eric 06b002c276 [#28493739] fix heading of pleadge_charged notice 2012-05-15 23:07:18 -04:00
eric 8fd4edbe42 wired pledged_charged notice [finish #28493739] 2012-05-15 22:47:57 -04:00
Andromeda Yelton 8cba752057 more notices need html templates for display at /notifications 2012-05-15 10:27:57 -04:00
Andromeda Yelton 95d4786c4b notice templates should actually say stuff 2012-05-14 21:42:46 -04:00
Andromeda Yelton 26061cd240 hey the reason I wasn't getting the layout I expected was that I'm an idiot. sweet\! 2012-05-14 21:09:29 -04:00
Andromeda Yelton 33bfb73a25 the sharing options in the you_have_pledged notice.html should be real live links 2012-05-14 16:53:53 -04:00
Andromeda Yelton 1c5d517d93 setting clearer expectations about communication in response to user feedback 2012-05-14 13:50:55 -04:00
eric 9ed4186124 Merge branch 'master' of https://github.com/Gluejar/regluit 2012-05-13 15:37:28 -04:00
eric aad5593c1d resolve conflicts 2012-05-13 15:37:20 -04:00
Andromeda Yelton c38a3a320f fixing some URLs 2012-05-13 15:33:19 -04:00
eric 0cdac29c22 apply intcomma to currency display everywhere and add humanize 2012-05-13 15:32:32 -04:00
Andromeda Yelton ea5664b08c that ampersand should not be URLencoded since it's actually a parameter 2012-05-13 15:22:38 -04:00
Andromeda Yelton ae76f89034 fixing problems with context for you_have_pledged notification 2012-05-12 22:42:09 -04:00
Andromeda Yelton e6467e4e85 even moar wordsmithing of notifications 2012-05-12 21:49:31 -04:00
Andromeda Yelton 6fe7aeeabb even more notification wordsmithing 2012-05-12 21:28:27 -04:00
Andromeda Yelton 54e1e3e98b merge all the things 2012-05-12 12:25:17 -04:00
Andromeda Yelton 83730badbb more wordsmithing 2012-05-12 11:58:33 -04:00
Andromeda Yelton 8e3baba673 wordsmithing 2012-05-11 21:36:20 -04:00
eric ca2bfedafd [#28851641] fillied in you_have_pledged templates 2012-05-11 21:29:03 -04:00
thatandromeda 328cea6cf3 Update frontend/templates/notification/wishlist_active/full.txt 2012-05-11 16:05:47 -03:00
eric 0f1bfaebc4 [finish #29411521] added site to url 2012-05-10 17:13:09 -04:00
Andromeda Yelton beff46fd8c standardizing on Unglue.it rather than Unglue.It 2012-05-08 16:15:23 -04:00
Andromeda Yelton ce36f6771d css changes per Stefan, part 1 2012-05-01 09:56:19 -04:00
eric 61a4878b54 [finish #24030945] tested it! scheduled notification for 12:30 at night via celerybeat. fixed various messge problems. 2012-04-28 13:02:38 -04:00
eric 6cd6064387 [start #24030945] notification that ebooks have been added to database 2012-04-27 17:29:57 -04:00
eric 6246b231b1 [finish #27115511] remove html from wishlist_active notice 2012-04-25 10:20:04 -04:00
eric 3709fa3ba8 polish up notice settings [finish #27014673] 2012-04-25 10:06:22 -04:00
eric 028aa8f10d reorganize notifications [#27014673] 2012-04-24 22:44:19 -04:00
eric d32190e905 [#27115511] removed user avatar from comment notices because it didn't look right next to book cover.
Can revisit with professional design help.
2012-04-17 15:16:07 -04:00
eric bf68f2f587 corrected bad reference to rightsholder name 2012-04-11 13:39:32 -04:00
eric 8cb1375ffe friendlification of comment notifications 2012-04-11 13:39:03 -04:00
eric 80c3a0090f fix spelling before it leads to bugs. will need to syncdb 2012-04-11 13:37:36 -04:00
Raymond Yee e38e0dcb37 Forgot to commit templates for successful_campaign notice type 2012-04-10 10:09:51 -07:00
Andromeda Yelton acd4d7048c making sure it isn't barfing on context variables 2012-04-09 11:26:12 -04:00
Andromeda Yelton 39129877ae more edits to notification display, trying to get column widths right 2012-04-09 11:15:48 -04:00
Andromeda Yelton f71366cb13 non-link title should be italicized 2012-04-09 10:10:19 -04:00
eric 6d8bc9d199 tried smaller cover image in notice [#27115511] 2012-04-05 13:11:42 -04:00
Andromeda Yelton 24674d8a2d improving display of active campaign notice 2012-04-03 12:30:34 -04:00
eric 0319185251 resolve conflicts 2012-04-03 10:54:31 -04:00
eric 6f1ccde928 moved notify_active_campaign into model, removed redundant context 2012-04-03 10:45:12 -04:00
Andromeda Yelton e197cd6acc now notifications actually get sent. cleanup to follow. 2012-04-02 15:04:51 -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
Andromeda Yelton 7a590637a4 prettifying 2012-03-29 16:26:06 -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 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
eric 887ca1e696 revert to Andromeda's de-uglification; left base notification template 2012-03-29 10:59:24 -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
Andromeda Yelton 142ec1a904 de-uglifying 2012-03-28 11:31:50 -04:00
eric 2932758077 got notification settings to work [#27116165] 2012-03-27 17:47:54 -04:00
eric 32ca831897 Comments are now notifying and notices are listing [#25980231] 2012-03-27 15:45:41 -04:00
eric 290aecab19 wired up notifications 2012-03-27 13:24:16 -04:00
eric 3925e96ad1 wishlist_comment templates 2012-03-27 12:37:07 -04:00