eric
|
ccef6ba411
|
again [start #32488017]
|
2012-07-10 16:06:57 -04:00 |
|
eric
|
15ea12534a
|
[#32488017] merge conflicts
|
2012-07-10 16:03:36 -04:00 |
|
eric
|
94787951ad
|
allowed staff to manage campaigns
|
2012-07-10 15:58:19 -04:00 |
|
eric
|
f2a1bac760
|
[start #32488017] added some logging of send_mail task
|
2012-07-10 15:57:44 -04:00 |
Raymond Yee
|
c8f0143630
|
Merge branch 'master' into ola_fulfill
|
2012-07-09 14:04:21 -07: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 |
|
Raymond Yee
|
f5ea51cdca
|
Merge branch 'feedback'
|
2012-07-09 10:44:33 -07:00 |
|
Raymond Yee
|
f528fe3654
|
SERVER_EMAIL needs to be set to a verified SES email for mail_admins to work
|
2012-07-09 10:43:48 -07:00 |
|
Raymond Yee
|
a5d0ef36d7
|
Merge branch 'feedback'
|
2012-07-09 10:09:59 -07:00 |
|
Raymond Yee
|
2f49651466
|
Force the from_email to be settings.DEFAULT_FROM_EMAIL unless you really want your from_email
|
2012-07-09 10:08:49 -07:00 |
|
Raymond Yee
|
d869431b43
|
a first pass at getting a model for getting premium feedback for the OLA campaign
|
2012-07-09 09:28:50 -07: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
|
a41178d53c
|
increasing spacing between comments
|
2012-07-09 10:57:36 -04:00 |
|
Andromeda Yelton
|
d53ea242b6
|
changing 'staff picks' to 'noteworthy'
|
2012-07-09 10:53:58 -04:00 |
|
Andromeda Yelton
|
dcee8182bf
|
restricting displayed ungluers to those with nonempty wishlists
|
2012-07-09 10:53:44 -04:00 |
|
Andromeda Yelton
|
ac2763eac9
|
increasing line height to make premiums more readable after font size increase
|
2012-07-09 10:37:08 -04:00 |
|
eric
|
01cb96e65d
|
reported email as notices, not accounts
|
2012-07-09 09:25:31 -04:00 |
|
eric
|
e2962e1075
|
[finish #30516251] supporter acknowledgement page basic version
|
2012-07-07 18:13:05 -04:00 |
|
eric
|
21e3cb582d
|
fix tabs
|
2012-07-07 18:12:54 -04:00 |
|
eric
|
1764cd62d6
|
small optimization of supporter count
|
2012-07-07 16:38:23 -04:00 |
|
eric
|
a7af78cc9a
|
[start #31995801] manage campaign form now handles the 11:59PM closing time
|
2012-07-06 22:10:55 -04:00 |
|
eric
|
b6d77a7645
|
usernames were not being URLescaped. [#finish #32365703]
|
2012-07-06 12:25:20 -04:00 |
|
eric
|
011dc4ffde
|
[#32289649] validation nit
|
2012-07-06 11:19:51 -04:00 |
|
Raymond Yee
|
3401f138d0
|
Updating selenium because the latest Firefox won't work with previous version
|
2012-07-05 10:25:47 -07:00 |
|
Andromeda Yelton
|
9152655587
|
list ungluers in two-column format by reverse of date wished [#32289815]
|
2012-07-05 11:33:57 -04:00 |
|
Andromeda Yelton
|
b9aaff2968
|
david brin hooray
|
2012-07-05 11:33:18 -04:00 |
|
Andromeda Yelton
|
3ce4db8e9a
|
change support to premiums and make it clickable [#32289833]
|
2012-07-05 10:39:19 -04:00 |
|
Andromeda Yelton
|
1bf0fe8d26
|
moving notification alert inline [#32289941]
|
2012-07-05 10:30:26 -04:00 |
|
Andromeda Yelton
|
85247c306e
|
Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
core/models.py
|
2012-07-05 10:21:08 -04:00 |
|
Andromeda Yelton
|
325765e453
|
loose ends from anaheim [#32290011] [#32289649] [#32289951]
|
2012-07-05 10:05:04 -04:00 |
|
Andromeda Yelton
|
0329976165
|
send signal for unsuccessful campaign notifications
|
2012-07-05 10:04:27 -04:00 |
|
Raymond Yee
|
5e3cf5d7aa
|
Latest integration of campaign data in our own db plus the spreadsheet you can download from Amazon payments
to produce CVS file
|
2012-07-03 07:46:42 -07: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 |
|
Raymond Yee
|
bfe02fc39d
|
4->3 active campaigns
|
2012-06-29 18:38:19 -07:00 |
|
Raymond Yee
|
280bbb9c6d
|
Merge branch 'master' into production
|
2012-06-29 18:32:15 -07:00 |
|
Raymond Yee
|
cf2847544b
|
Fix the time when the campaign status dated -- 12:01 am -- maybe it should be 12:00
|
2012-06-29 18:22:19 -07:00 |
|
Raymond Yee
|
5b733d214c
|
setting up to automate daily campaign status update
|
2012-06-29 18:05:14 -07:00 |
|
Raymond Yee
|
23ea9342d1
|
Turn test email in celerybeat off.
|
2012-06-29 13:19:05 -07:00 |
|
Raymond Yee
|
dd5b2d073f
|
Turn on the test email to confirm that celerybeat is working on production
|
2012-06-29 13:12:36 -07:00 |
|
Raymond Yee
|
275d127e29
|
If we're canceling a campaign, record the reason in the transaction.reason as "UNSUCCESSFUL CAMPAIGN" (by default)
|
2012-06-29 11:11:42 -07:00 |
|
Raymond Yee
|
9ac4aa26bd
|
hook the unsuccessful_campaign to the right notice
|
2012-06-29 09:52:06 -07: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 |
|
eric
|
17cbab1fc4
|
temporarily stop checking for end date changes
|
2012-06-28 16:23:29 -04:00 |
|
eric
|
8be8883e63
|
draft of front matter template (not used yet)
|
2012-06-28 16:23:29 -04:00 |
|
thatandromeda
|
cbef02e3fc
|
moar boingboing
|
2012-06-28 12:45:21 -07:00 |
|
Raymond Yee
|
80a5f4d76f
|
Get rid of "," in email_addresses
|
2012-06-26 22:41:31 -07:00 |
|
Raymond Yee
|
558ec0f810
|
escape the \n in the email_addresses fab command
|
2012-06-26 22:34:37 -07:00 |