eric
|
455032ebc3
|
delint
|
2018-06-08 15:17:39 -04:00 |
|
eric
|
8b385d05ed
|
fix Booxtreem LOCAL_TEST
|
2018-06-08 15:01:22 -04:00 |
|
eric
|
ab3c1934d5
|
fix pdf tester
boto3 storage returns unicode not str someplace
|
2018-06-08 13:56:07 -04:00 |
|
eric
|
ca5e5bed0c
|
update boto
|
2018-06-08 13:55:05 -04:00 |
|
eric
|
8aae6808d1
|
thought I already did this
|
2018-06-07 16:28:12 -04:00 |
|
eric
|
4afe792a73
|
set TEST_INTEGRATION
|
2018-06-07 15:08:23 -04:00 |
|
eric
|
f75fd07c76
|
use hosts not common
|
2018-06-07 14:39:36 -04:00 |
|
eric
|
f597da88aa
|
make sure common.keys overrides common
|
2018-06-07 13:05:25 -04:00 |
|
eric
|
3028c5f19d
|
re-decrypt
|
2018-06-07 12:17:46 -04:00 |
|
eric
|
0deb76b678
|
make keys a module
|
2018-06-07 09:59:35 -04:00 |
|
eric
|
cdce5e5fff
|
user is specific to org
|
2018-06-06 23:34:06 -04:00 |
|
eric
|
3e782e636d
|
files for running tests with travis
|
2018-06-06 23:27:08 -04:00 |
|
eshellman
|
92cdeedbc3
|
Merge pull request #780 from Gluejar/test-mobi
new mobigen
|
2018-06-06 22:32:55 -04:00 |
|
eric
|
c422965bdb
|
add column to EbookFile to indicate a failed make_mobi
so we don't keep trying with a bad epub file
|
2018-06-06 22:26:27 -04:00 |
|
eric
|
e1553f8121
|
switch to dockerized mobi
|
2018-06-06 17:29:12 -04:00 |
|
eric
|
16441fe456
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-05-11 12:04:50 -04:00 |
|
eshellman
|
71ba8dc9fa
|
Merge pull request #778 from Gluejar/doab-misc
fix bugs and delint
|
2018-05-11 11:47:48 -04:00 |
|
eric
|
05fae60ddb
|
delint
|
2018-05-11 11:46:04 -04:00 |
|
eric
|
33bf10c047
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-05-10 22:11:09 -04:00 |
|
eshellman
|
95b8276829
|
Merge pull request #777 from Gluejar/doab-misc
Doab misc
|
2018-05-10 22:01:43 -04:00 |
|
eric
|
a303c08333
|
delete doab should work
|
2018-05-10 22:00:47 -04:00 |
|
eric
|
620bedd1e5
|
error should not be thrown if duplicate id is already the id
|
2018-05-10 21:45:56 -04:00 |
|
eric
|
db9b6e5221
|
harvest_online_ebooks should count books actually harvested
|
2018-05-10 16:17:16 -04:00 |
|
eric
|
f80b7a8d31
|
context_instance deprecated in django 1.10
|
2018-05-02 11:13:38 -04:00 |
|
eric
|
b7df794017
|
deprecated template syntax
|
2018-05-02 11:11:16 -04:00 |
|
eric
|
486e3a5200
|
remove duplicate truncatechars
|
2018-04-27 18:03:22 -04:00 |
|
eric
|
c7ffd3361a
|
removed patterns from imports
|
2018-04-27 11:42:39 -04:00 |
|
eric
|
6dc97209ae
|
Merge remote-tracking branch 'Gluejar/master' into dj111
|
2018-04-27 11:25:59 -04:00 |
|
eric
|
8a9260532e
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-27 11:10:09 -04:00 |
|
eshellman
|
7863fbfe0e
|
Merge pull request #776 from Gluejar/fix-hathi-scraper
provide fallback for hathi scraper
|
2018-04-27 10:55:17 -04:00 |
|
eric
|
6585bdd52a
|
provide fallback for hathi scraper
It turns out http://hdl.handle.net/2027/ is used for all of umich, not
just hathitrust
|
2018-04-27 10:54:41 -04:00 |
|
eric
|
67f8895f5f
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-26 16:27:37 -04:00 |
|
eshellman
|
35ca77a601
|
Merge pull request #775 from Gluejar/fix-endless
quick bugfix
|
2018-04-26 16:26:49 -04:00 |
|
eric
|
463cbe9d89
|
quick bugfix
|
2018-04-26 16:26:14 -04:00 |
|
eric
|
62819e05d9
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-26 16:01:25 -04:00 |
|
eshellman
|
965ab887de
|
Merge pull request #774 from Gluejar/dj19deprecations
Dj 1.9 deprecated in 1.7
|
2018-04-26 15:04:23 -04:00 |
|
eric
|
20a5fe3770
|
linewrap misled me
|
2018-04-26 15:03:32 -04:00 |
|
eric
|
a0dc106f6d
|
fix issue with merged works coming back from related editions
|
2018-04-26 14:57:55 -04:00 |
|
eric
|
8f600f1556
|
make it work in django 1.8
|
2018-04-25 17:20:44 -04:00 |
|
eric
|
120c0eea5a
|
Merge branch 'dj111' into dj19deprecations
|
2018-04-25 16:29:02 -04:00 |
|
eric
|
3337de9a2e
|
Merge remote-tracking branch 'Gluejar/master' into dj111
# Conflicts:
# core/tests.py
# payment/tests.py
|
2018-04-25 16:23:00 -04:00 |
|
eric
|
e331b7118b
|
update pdf modules
|
2018-04-25 15:30:36 -04:00 |
|
eric
|
d40896f270
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-25 12:22:36 -04:00 |
|
eshellman
|
2192b2b0ea
|
Merge pull request #773 from Gluejar/reduce_xx
facebook url, synchronous doab
|
2018-04-25 11:26:03 -04:00 |
|
eric
|
1589c997ea
|
fix facebook url
|
2018-04-25 11:23:29 -04:00 |
|
eric
|
8d5da39e5f
|
make populate edition synchronous for doab
|
2018-04-25 11:21:02 -04:00 |
|
eric
|
fede42751e
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-23 16:31:19 -04:00 |
|
eshellman
|
0cf8b19b5f
|
Merge pull request #772 from Gluejar/doab-nits
don't load chapters
|
2018-04-23 15:42:52 -04:00 |
|
eric
|
fa82411921
|
don't load chapters
|
2018-04-23 15:41:42 -04:00 |
|
eshellman
|
3058991a30
|
Merge pull request #770 from Gluejar/remove-regluit-datetime
rip out dead code
|
2018-04-23 14:52:59 -04:00 |