7265488484
Merge branch 'master' into expiring_cc
2013-04-26 08:58:47 -07:00
c5517df1c9
Merge pull request #167 from Gluejar/less_officious_comments
...
Less officious comments
2013-04-25 15:26:47 -07:00
a375112e72
Merge branch 'master' into expiring_cc
2013-04-24 13:50:33 -07:00
aca759447d
test for staffness in template
2013-04-24 11:28:05 -04:00
80ee477198
disambiguate staff and RH
2013-04-23 10:22:08 -04:00
516f867d87
removing word 'official'
2013-04-23 10:07:59 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
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
3b900e2328
Align names signals.py with those in the short.txt for notices
2013-04-17 13:24:43 -07:00
86dcdea1b7
updated text for cc notices
2013-04-17 11:42:49 -07:00
9cc2e3121e
Merge branch 'master' into expiring_cc
2013-04-10 09:14:29 -07:00
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
7dd1b994cd
fixing syntax error
2013-04-01 10:28:19 -04:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
aca38d66a1
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/tests.py
2013-03-20 09:41:30 -07:00
7f64189284
create and deploy avatar_source and avatar_url
2013-03-14 15:43:24 -04:00
6143c6a3aa
normalize invocation of supporter url, fix wrong user for comment links
2013-03-14 15:33:00 -04:00
28045aed77
merge master into improve_registration
2013-03-13 10:40:20 -04:00
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
800d0ffdeb
cleanup of css and js imports, also mapping
2013-03-08 14:16:24 -05:00
14a6803b9f
mailchimp integration [finish #37732465 ]
...
need to pip install postmonkey
2013-03-04 17:01:33 -05:00
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
7fef0a65f0
refining account_* notices
2013-02-27 15:18:32 -08:00
819f532624
email message needed the full urls
2013-02-27 17:27:32 -05:00
282f877890
wire up msg view to wishlist_message notification [ #36991391 ]
2013-02-26 12:43:54 -05:00
609c09c74d
it was missing a parenthesis
2012-12-31 11:12:55 -05:00
8692d26540
friendlifying
2012-11-26 14:23:04 -05:00
1976bb14d3
Update frontend/templates/notification/pledge_charged/short.txt
2012-11-26 13:45:12 -05:00
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
ecea475419
a few modifications to pledge_failed notice
2012-11-21 11:40:19 -08:00
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
2858ed194c
bugfixing
2012-11-16 11:43:00 -05:00
87da5ae50e
tweaking phrasing following user feedback
2012-11-16 10:07:45 -05:00
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
b02a289e01
Add templates for pledge_failed notification
2012-11-15 09:06:55 -08:00
102937567b
better syntax
2012-10-16 10:20:41 -04:00
386a30e3da
missing endif
2012-10-14 17:27:52 -04:00
56f2357b50
DRYer
2012-10-14 17:19:33 -04:00
0c8d73fbc7
making acknowledgements formatting the same
2012-10-14 17:15:45 -04:00
c15ecd7715
remove ref to payment processor, add acknowledgements
2012-10-14 17:04:32 -04:00
476ce46dab
display and notifications of acknowledgements
2012-10-12 23:45:09 -04:00
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
599606d2ce
removing paypal and amazon references [ #36554899 ]
2012-10-10 14:34:59 -04:00
a9d9cde55a
grammar
2012-10-02 07:55:11 -04:00
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
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
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
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
2216369bbf
include clickable links, make grammar singular/plural sensitive
2012-09-18 10:16:08 -04:00
b08643a0ac
Merge branch 'master' into relaunch
2012-09-13 10:50:43 -07:00
d8316c76ec
user isn't in the context so we shouldn't reference it
2012-09-12 08:41:22 -04:00
deee2ab75a
Merge branch 'master' into relaunch
...
Conflicts:
core/signals.py
frontend/views.py
2012-09-10 14:25:43 -07:00
f2e9559a3a
beginning of a notification to RHs when someone wishlists their work
2012-08-31 13:47:01 -04:00
adef29f536
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
...
Conflicts:
core/signals.py
2012-08-16 17:11:12 -04:00
8ef30302d4
notice templates for campaign shutoffs due to amazon payment suspension
2012-08-08 14:19:04 -04:00
0d13fe9ba4
2 more minus_amount s [ #21784207 ]
2012-08-07 16:18:03 -04:00
5362c202bb
added management command to create credits, balance notification [ #21784207 ]
2012-08-07 14:12:50 -04:00
b691c8f896
Update frontend/templates/notification/notice_template.html
2012-07-24 14:52:39 -03:00
ed12a0d460
[ #32290103 ] fixed html error- <hr /> not allowed in span
2012-07-22 14:53:53 -04:00
abdb4ddfc7
adding separator between headline and notification text
2012-07-16 14:46:45 -04:00
c9d57bb08b
making the sharing block work
2012-07-16 13:47:18 -04:00
f000c01267
fixing more syntax after testing
2012-07-16 13:29:20 -04:00
f56b342b00
fixing syntax errors found while testing
2012-07-16 12:44:27 -04:00
a226669109
bleah, django-notification fails around the with tags. removed.
2012-07-16 11:50:31 -04:00
95c95dfcc8
added comment to explain about url dispatcher situation
2012-07-09 15:49:36 -04:00
69502b75ee
need to convert urls to template variables or django-notification can't find them
2012-07-09 15:47:38 -04:00
59b3657808
we were using this verbatim in five different templates. DRY
2012-07-09 15:47:09 -04:00
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
6ccaf81f06
updated to reflect Amazon email so supporters won't be surprised by it
2012-07-02 11:07:10 -04:00
8fbc65a305
merge
2012-06-28 14:31:48 -07:00
de929363e5
we are going to need an unsuccessful campaign signal asap, sadly
2012-06-28 14:07:33 -07:00
4bb48c64e6
changing future to present continuous tense for when credit card charged
2012-06-21 09:07:05 -07:00
0c88c77733
forgot the easy-to-forget endswith
2012-06-21 06:14:37 -07:00
013ddb5a3c
Another template problem in the pledge_charged notices
2012-06-21 06:09:37 -07:00
20e5baa6ba
work -> transaction.campaign.work
2012-06-21 05:09:51 -07:00
7482a19cd1
work.id -> campaign.work.id
2012-06-20 21:29:23 -07:00
f7282d4e11
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-06-19 07:34:52 -04:00
001f654880
trivial cleanup in unglued ebook notification
2012-06-19 07:34:37 -04:00
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
12dca9c36d
reducing redundancy in comment notification lead-in
2012-06-15 11:32:12 -03:00
2241134e92
comment notifications should contain link to comments tab
2012-06-13 08:52:53 -03:00
153e7eaff9
Merge branch 'master' of github.com:Gluejar/regluit
2012-06-01 11:02:35 -04:00
4eab46f1d5
clarify what 'official comment' means
2012-05-30 12:36:35 -04:00
63567d8eaa
mad->made (typo fix)
2012-05-30 09:32:04 -07:00
1c5264d8a1
removing reference to payment_processor context variable, made irrelevant now that we have transaction.host
2012-05-29 21:01:17 -04:00
48481bd819
improving ple pledge_modified
2012-05-29 20:50:53 -04:00
5d37a969bd
phrasing needs to be sensitive to increase vs decrease
2012-05-29 08:55:16 -04:00
8ca9b7900c
[start #28494261 ] "official" notification get sent by email too wishers by default. needs syncdb
2012-05-25 14:52:50 -04:00
0fcdbee50a
minor copy-editing type stuff
2012-05-22 11:07:40 -04:00
c4053a4b59
communicating stuff more clearly
2012-05-16 14:03:14 -04:00
104b916171
changing http unglue.it links to https
2012-05-16 11:38:42 -04:00
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
775d1d4af2
fixing rendering of successful campaign notifications
2012-05-16 10:06:26 -04:00
979bb8b037
missing humaize in pledged_charge [ #28493739 ]
2012-05-16 01:48:41 -04:00
06b002c276
[ #28493739 ] fix heading of pleadge_charged notice
2012-05-15 23:07:18 -04:00
8fd4edbe42
wired pledged_charged notice [finish #28493739 ]
2012-05-15 22:47:57 -04:00
8cba752057
more notices need html templates for display at /notifications
2012-05-15 10:27:57 -04:00
95d4786c4b
notice templates should actually say stuff
2012-05-14 21:42:46 -04:00
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
33bfb73a25
the sharing options in the you_have_pledged notice.html should be real live links
2012-05-14 16:53:53 -04:00
Raymond Yee
eshellman
Andromeda Yelton