Raymond Yee
|
0765e6801d
|
Now working on breaking down specific material and acknowledgement premiums for OLA
|
2012-07-19 16:06:28 -07:00 |
|
Raymond Yee
|
172e77bb6f
|
First draft of a management command to hlep prototype how we are going to gather premium choices for OLA
|
2012-07-19 11:02:39 -07:00 |
Andromeda Yelton
|
6a6ee190e4
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-07-18 15:15:31 -04:00 |
|
Andromeda Yelton
|
c47f9326f6
|
erroneously referred to learn_more.css rather than learnmore.css
|
2012-07-18 15:14:48 -04:00 |
|
Andromeda Yelton
|
ac72d2a4c7
|
addressing IE8 bug with feedback button, I hope
|
2012-07-18 15:10:29 -04:00 |
|
Raymond Yee
|
167bd8a4c1
|
Fixing a situation in which there is an error in the pledge view
|
2012-07-18 11:09:48 -07:00 |
|
Raymond Yee
|
f7e49edfcb
|
Continuing work on collecting info for OLA pledges
|
2012-07-18 10:49:25 -07:00 |
|
Andromeda Yelton
|
ce8a36580a
|
whoops, mixed up some attributions
|
2012-07-18 07:51:30 -04:00 |
|
Raymond Yee
|
b8f9155789
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-07-17 09:24:27 -07:00 |
|
Andromeda Yelton
|
97c2d0b63d
|
need to make sure base.html About link in header works with new expand_about.js
|
2012-07-17 12:17:43 -04:00 |
|
Andromeda Yelton
|
f57ac97e81
|
die zeit, german NPR coverage
|
2012-07-17 09:04:10 -04:00 |
|
Andromeda Yelton
|
c9871b29a2
|
Merge branch 'wishlist_tabs'
Conflicts:
frontend/templates/base.html
|
2012-07-17 08:53:28 -04:00 |
|
Andromeda Yelton
|
f32cb39d9a
|
added conditionals to make sure phrasing made sense for empty wishlists, and clarified who chooses the ungluing fee
|
2012-07-17 08:47:53 -04:00 |
|
Raymond Yee
|
ba6762e781
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-07-16 11:56:13 -07:00 |
|
Andromeda Yelton
|
362a4d2b85
|
Merge branch 'master' of github.com:Gluejar/regluit
|
2012-07-16 14:52:38 -04:00 |
|
Raymond Yee
|
d5056441e8
|
oops...forgot to commit pledge_recharge.html
|
2012-07-16 11:48:10 -07: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 |
eric
|
cf3351d84b
|
Merge branch 'master' of https://github.com/Gluejar/regluit
|
2012-07-15 16:58:52 -04:00 |
|
Raymond Yee
|
8b3ccf298c
|
revert back to old google books key on jenkins to see whether errors will go down in number
|
2012-07-13 17:18:29 -07:00 |
|
Raymond Yee
|
1e49732693
|
almost ready to send this out to supporters with failed pledges
|
2012-07-13 15:55:41 -07:00 |
|
Raymond Yee
|
de415480ae
|
first pass at calculating transactions that need to be recharged
modification to fabfile to download a file of emails
|
2012-07-13 10:17:51 -07:00 |
|
Raymond Yee
|
da1386d7ab
|
Merge branch 'master' into ola_fulfill
|
2012-07-12 06:16:40 -07:00 |
|
eric
|
d72e905628
|
Revert "seeinggoogle account limits are the problem"
This reverts commit 1551be38bf.
|
2012-07-12 09:03:58 -04:00 |
|
Raymond Yee
|
7353731db5
|
4 campaigns now
|
2012-07-11 21:39:21 -07:00 |
|
Raymond Yee
|
1097c7891b
|
verify signature for amazon payment return
|
2012-07-11 21:27:24 -07:00 |
|
Raymond Yee
|
94384fcb59
|
Work in progress
|
2012-07-11 19:51:36 -07:00 |
|
eric
|
1551be38bf
|
seeinggoogle account limits are the problem
|
2012-07-11 21:26:32 -04:00 |
|
eric
|
36c6a5614e
|
[finish #27011135] fixed "login to pledge" trapped in iframe
|
2012-07-11 21:06:12 -04:00 |
|
thatandromeda
|
df147937aa
|
phrasing was unclear, scary. we're not space-limited here like we used to be.
|
2012-07-11 12:37:23 -03:00 |
|
Raymond Yee
|
4540263a6d
|
Merge branch 'master' into ola_fulfill
|
2012-07-11 07:39:19 -07:00 |
|
Raymond Yee
|
99057859e9
|
Setting up the URLs in progress.
|
2012-07-11 06:54:15 -07:00 |
|
eric
|
e3be202189
|
"benefactors", not patrons [#30516251]
|
2012-07-11 09:18:14 -04:00 |
|
Raymond Yee
|
7a76a2cbaf
|
Merge branch 'master' into ola_fulfill
|
2012-07-10 14:15:28 -07:00 |
|
Raymond Yee
|
94bd6fff2d
|
First pass at having a pledge recharge view (DON'T KNOW WHETHER THIS EVEN BUILDS PROPERLY)
|
2012-07-10 13:36:32 -07:00 |
|
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 |