62daa67880
coming together! (needs migration)
2015-01-09 17:05:34 -05:00
1d3eb7bbe4
Merge pull request #439 from Gluejar/ssl_redirect_prod
...
redirect all for prod
2015-01-08 18:01:26 -05:00
c911a0f945
redirect all for prod
2015-01-08 14:08:18 -08:00
afee7482f6
Merge pull request #438 from Gluejar/ssl_redirect_just
...
Ssl redirect just
2015-01-08 11:15:44 -08:00
a77bae1cd6
restore prod to current state
2015-01-08 11:14:12 -08:00
b6e17b6fcf
Merge branch 'master' into ssl_redirect
2015-01-08 13:11:18 -05:00
b768afb076
Merge pull request #437 from Gluejar/update_press
...
update press page
2015-01-02 10:54:53 -05:00
ad2017e054
update press page
2015-01-02 00:33:32 -05:00
8a1caf6477
Merge pull request #436 from Gluejar/gift_news
...
update news item
2014-12-30 16:30:07 -05:00
56d0020839
update news item
2014-12-30 11:23:35 -05:00
aed91bca7a
Merge pull request #435 from Gluejar/give_btu
...
Give btu: improve gift admin/prevent self-redemption
2014-12-22 18:30:07 -05:00
f77ef95a64
prevent self-redemption
2014-12-22 18:08:13 -05:00
8224b9e24c
improve gift admin
2014-12-22 17:49:05 -05:00
f08c721d2e
Merge pull request #434 from Gluejar/give_btu
...
Give btu updates: gift table revamp, add gift admin
2014-12-22 15:31:50 -05:00
2db4516505
rip out useless code
2014-12-22 14:24:49 -05:00
fb878094d1
new test for established user
2014-12-22 14:21:40 -05:00
c6d9f5bf23
add gift admin
2014-12-22 13:49:56 -05:00
5e4b7a7b89
fix wrong field type in model
2014-12-22 13:49:39 -05:00
6fc3eb8703
turns out we can't send notifications to inactive accounts
...
I had intended that gift redemption would activate the account, but
that doesn't work. Need to figure out the downside to having unverified
active accounts.
2014-12-22 13:24:22 -05:00
642653c4f8
Merge pull request #433 from Gluejar/give_btu
...
bug fix in give_btu
2014-12-22 11:50:18 -05:00
c85fd340d8
how did that sneak through?
2014-12-22 11:47:34 -05:00
05686ffaec
Merge pull request #432 from Gluejar/give_btu
...
Give btu updates
2014-12-22 09:04:08 -05:00
c060ae17e0
Put a gift note in the ebook
2014-12-22 08:22:34 -05:00
ae208286f0
handle case of double gifts
...
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
f70e75b082
Merge pull request #431 from Gluejar/fix_crontab
...
I had a bug in the crontab for just all this time....
2014-12-20 18:23:35 -05:00
8a5c86d718
I had a bug in the crontab for just all this time....
2014-12-20 18:22:20 -05:00
20c3ffe12e
Merge pull request #430 from Gluejar/give_btu
...
As requested by Eric, I'm now going to do the merge to get this PR on just. Then I'll test downloads. Noting the current commit on master in case we need to revert: 25dcb06f46
2014-12-20 15:42:00 -05:00
5719f7f90c
forgot to actually test the code
2014-12-20 13:14:05 -05:00
220d2871c1
display gift status instead of "Purchased!"
2014-12-20 13:03:20 -05:00
b01562b630
Properly handle gifts to existing users
2014-12-20 12:47:15 -05:00
24f1686aec
nit
2014-12-19 15:15:36 -05:00
f18acfc091
notify the giver when the gift is redeemed
...
migration needed
2014-12-19 15:13:54 -05:00
e9a708bd9a
add faq
2014-12-19 14:24:17 -05:00
09994ee1fc
fix missing site
2014-12-18 18:10:04 -05:00
2c44a29aa7
regifting
2014-12-18 13:37:28 -05:00
c2b170c801
the password prompt now works
2014-12-18 11:41:06 -05:00
1c651f2458
everything more or less works except resifting
2014-12-18 01:07:59 -05:00
3182078ac9
more cents untruncation
2014-12-17 23:43:53 -05:00
05b5031784
improved pledge failed
2014-12-17 23:42:37 -05:00
12877dada9
untruncated the cents
2014-12-17 12:50:23 -05:00
41163d81a2
purchase and provisioning the gift
2014-12-16 14:18:51 -05:00
25dcb06f46
Merge pull request #429 from Gluejar/free_flag
...
Free flag
2014-12-16 08:56:36 -08:00
ac39075ccd
a comment to explain logic of reset_free_flag
2014-12-15 11:46:59 -08:00
7b5174aca6
ui and model for buy as a gift
2014-12-15 00:56:08 -05:00
e775dc3fa2
Merge branch 'free_flag' into give_btu
2014-12-14 16:41:52 -05:00
02066cfabb
missed this one
2014-12-14 16:40:14 -05:00
cdfe5d99d6
add is_free annotations on subject lists
2014-12-14 10:28:58 -05:00
be0ab46872
use is_free in query sets
2014-12-14 10:00:10 -05:00
b54b21fdfe
keep is_free up to date
2014-12-13 12:37:35 -05:00
c9270b154a
Merge branch 'master' into free_flag
2014-12-13 11:55:02 -05:00
eric
Raymond Yee