eric
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
Raymond Yee
53a37b1b31
Merge branch 'master' into mobigen_integrate
2015-04-03 10:05:02 -07:00
eric
1739e94177
returned gbooks thumbnail urls have changed
2015-03-18 14:59:38 -04:00
Raymond Yee
b0550999e1
incorporate changes from kindle safe title changes.
...
Merge branch 'master' into kindle_file_size
Conflicts:
frontend/views.py
2015-03-09 10:56:20 -07:00
Raymond Yee
71c8a95b90
add comment about what fix_kindle_bugs does
2015-03-06 15:16:04 -08:00
eric
0c4550fe4a
save ebook file size on send_to_kindle
...
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
eric
f05b276118
provide a title that's kindle-safe
2015-03-03 17:39:23 -05:00
Raymond Yee
9c4d609579
Merge pull request #459 from Gluejar/download-nits
...
add inactive download counts in rh tools [fix #88928040 ]
2015-02-25 11:21:08 -08:00
eric
84227748db
add inactive download counts in rh tools
2015-02-23 16:52:55 -05:00
eric
53ecbfcb5f
DRY for safe_get_work
2015-02-18 12:47:19 -05:00
Raymond Yee
a9d4a71912
fixed an incorrect reference, uncovered by the tests!
2015-02-03 15:41:38 -08:00
Raymond Yee
edd65c08c3
make sure the campaigns for the editions returned by editions_to_convert are not b2u.
2015-02-02 15:05:36 -08:00
eric
53b62642cd
more idiomatic increment
2015-02-02 13:31:10 -05:00
eric
c714de0d67
also for doab records
2015-01-30 11:39:48 -05:00
eric
7cb0f473de
remove many-commas subjects, prevent their addition
2015-01-30 11:33:22 -05:00
Raymond Yee
32ec6b0a03
Merge pull request #449 from Gluejar/improve_gifts
...
Improve gifts
2015-01-28 11:59:27 -08:00
Raymond Yee
0b7f522232
first pass at a command to convert all the convertible campaign ebooks to mobi
2015-01-26 12:19:26 -08:00
Raymond Yee
dfbdf9bbd7
add a test for mobigen
2015-01-26 09:48:16 -08:00
Raymond Yee
e9d8080c3b
First cut of celery tasks for converting to mobi
2015-01-23 15:52:35 -08:00
Raymond Yee
6c1630905b
Merge branch 'master' into mobigen_integrate
2015-01-23 10:43:33 -08:00
eric
ea5adba871
add notifications for unredeemed gifts
2015-01-23 13:11:19 -05:00
Raymond Yee
61c0de3fbc
add a command to delete subjects with non-xml characters
2015-01-22 15:48:04 -08:00
Raymond Yee
b4776f36e2
Merge branch 'master' into mobigen_integrate
2015-01-20 13:13:58 -08:00
eric
aa14bcb5c9
fix github matcher
2015-01-19 12:10:07 -05:00
Raymond Yee
1be246586c
Merge pull request #443 from Gluejar/edit_kw
...
Edit kw
2015-01-16 09:17:11 -08:00
eric
154701bea5
show most common keywords first
2015-01-16 08:56:36 -05:00
Raymond Yee
50fae7d544
Running into validation problems with OPDS because "image/image" mime-type for
...
urls like https://github.com/Gluejar/open_access_ebooks_ebook/blob/master/open_access_ebooks/EPUB/cover.120.jpg?raw=true
Fix by looking at the ending of the path of a url, not the fragement, parameter, or query string
2015-01-14 18:29:17 -08:00
eric
4f0cc87b48
temp add kw
2015-01-14 15:07:54 -05:00
eric
ea4e489213
fix the odds implementation of kw facet
...
mostly, fixing missing url encoding
2015-01-12 12:03:47 -05:00
Raymond Yee
134988f082
modify migration to handle situation in which a subject does not exist (e.g., Selenium tests)
2015-01-11 12:44:31 -08:00
Raymond Yee
684c518324
add comments to clarify intention of parts of facets.py, based on Eric's answers to Raymond's questions
2015-01-11 12:18:30 -08:00
eric
62daa67880
coming together! (needs migration)
2015-01-09 17:05:34 -05:00
Raymond Yee
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
eric
5e4b7a7b89
fix wrong field type in model
2014-12-22 13:49:39 -05:00
eric
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
Raymond Yee
642653c4f8
Merge pull request #433 from Gluejar/give_btu
...
bug fix in give_btu
2014-12-22 11:50:18 -05:00
eric
c85fd340d8
how did that sneak through?
2014-12-22 11:47:34 -05:00
Raymond Yee
05686ffaec
Merge pull request #432 from Gluejar/give_btu
...
Give btu updates
2014-12-22 09:04:08 -05:00
eric
ae208286f0
handle case of double gifts
...
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
Raymond Yee
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
eric
5719f7f90c
forgot to actually test the code
2014-12-20 13:14:05 -05:00
eric
b01562b630
Properly handle gifts to existing users
2014-12-20 12:47:15 -05:00
eric
f18acfc091
notify the giver when the gift is redeemed
...
migration needed
2014-12-19 15:13:54 -05:00
eric
2c44a29aa7
regifting
2014-12-18 13:37:28 -05:00
eric
1c651f2458
everything more or less works except resifting
2014-12-18 01:07:59 -05:00
eric
41163d81a2
purchase and provisioning the gift
2014-12-16 14:18:51 -05:00
Raymond Yee
b9aee9095b
Merge branch 'master' into mobigen_integrate
2014-12-16 08:55:51 -08:00
Raymond Yee
ac39075ccd
a comment to explain logic of reset_free_flag
2014-12-15 11:46:59 -08:00
eric
7b5174aca6
ui and model for buy as a gift
2014-12-15 00:56:08 -05:00
eric
be0ab46872
use is_free in query sets
2014-12-14 10:00:10 -05:00