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 |
nicholas antonov
|
7150ae812a
|
Fix header levels and styles
|
2018-04-25 16:16:52 -04:00 |
|
nicholas antonov
|
9c4817419f
|
some fixes for download page
|
2018-04-25 16:13:27 -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 |
|
nicholas antonov
|
3a63d5a243
|
merge newfoundation
|
2018-04-24 20:28:23 -04:00 |
|
nicholas antonov
|
c185b017ea
|
Fix how css was being imported
|
2018-04-24 20:25:41 -04:00 |
|
nicholas antonov
|
fe18b14f3e
|
Fix some rendering quirks
|
2018-04-24 20:05:01 -04:00 |
|
nicholas antonov
|
568183d3e4
|
Make download page work on mobile
|
2018-04-24 19:42:52 -04:00 |
jonahmania
|
52957407ad
|
Merge in master
|
2018-04-24 09:24:58 -04:00 |
|
Jonah Mania
|
bfae2e8ecb
|
Merge pull request #66 from EbookFoundation/foundation/reader
Add online reader
|
2018-04-24 09:16:14 -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 |
|
eric
|
725c8e44e8
|
update reguirements for django 1.9
|
2018-04-19 21:28:46 -04:00 |
|
eric
|
680caad71d
|
deprecations
|
2018-04-19 21:27:20 -04:00 |
|
eric
|
146f26c5f8
|
deprecate django unittest
|
2018-04-19 21:26:29 -04:00 |
|
eric
|
d710f8e25f
|
new endless
|
2018-04-19 21:25:12 -04:00 |
|
eric
|
0a9d3c4cd5
|
delint
|
2018-04-19 21:23:40 -04:00 |
|
eric
|
42ccc01255
|
no models loaded with app
|
2018-04-19 21:23:24 -04:00 |
|
eric
|
968c7e384d
|
TEST_ settings deprecated
|
2018-04-19 21:19:40 -04:00 |
|
eshellman
|
8f822105fb
|
Merge pull request #771 from Gluejar/dj18deprecations
Dj18deprecations
|
2018-04-19 13:29:51 -04:00 |
|
eric
|
518ac07ae1
|
lint
|
2018-04-19 13:18:06 -04:00 |
|
eric
|
f35122ec51
|
IPAddressField is deprecated
|
2018-04-19 13:13:02 -04:00 |
|
eric
|
39fdd9683a
|
rip out dead code
|
2018-04-19 12:24:34 -04:00 |
|
eric
|
bd3d2287bd
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-18 22:38:30 -04:00 |
|
eshellman
|
f549231d21
|
Merge pull request #769 from Gluejar/doab
forgot to remove debugging break
|
2018-04-18 22:21:59 -04:00 |
|
eric
|
d0ffa6a002
|
forgot to remove debugging break
|
2018-04-18 22:21:41 -04:00 |
|
eric
|
0e52849a5f
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-18 22:16:43 -04:00 |
|
eshellman
|
2ae99c6854
|
Merge pull request #768 from Gluejar/doab
fix test
|
2018-04-18 22:01:13 -04:00 |
|
eric
|
29ca00277d
|
fix test
|
2018-04-18 22:00:36 -04:00 |
|
eshellman
|
806f32b1c4
|
Merge pull request #767 from Gluejar/doab
Doab update #2
|
2018-04-18 21:40:04 -04:00 |
|
eric
|
6bca7f0983
|
bugs
|
2018-04-18 21:39:40 -04:00 |
|
eric
|
bbd421d1f2
|
fix various bugs
|
2018-04-18 17:53:21 -04:00 |
|
eric
|
c9e7d5d5ac
|
avoid errors with using string methods on content_type
|
2018-04-18 14:56:26 -04:00 |
|
eric
|
8c1799ebc4
|
freshen clean_subjects
|
2018-04-18 14:55:26 -04:00 |
|
eric
|
b0abceb678
|
deal with more punctuation in isbn string
|
2018-04-18 14:54:09 -04:00 |
|
eric
|
3590c1a59f
|
default load_doab to last 45 days
|
2018-04-18 14:53:42 -04:00 |
|
eric
|
1d6af73cf2
|
handle isbns separated by '/'
|
2018-04-18 11:29:57 -04:00 |
|
eric
|
fd02b5e66c
|
allow unicode dashes in isbns
|
2018-04-18 11:15:46 -04:00 |
|
eric
|
78d66a247e
|
don't fail if null edition
|
2018-04-17 14:21:21 -04:00 |
|
eric
|
447ed4b2d5
|
fix cover loading
|
2018-04-17 14:20:44 -04:00 |
|
eric
|
89b4221dcd
|
Merge remote-tracking branch 'Gluejar/master' into production
|
2018-04-16 20:10:26 -04:00 |
|
eshellman
|
28c9aaa9b9
|
Merge pull request #766 from Gluejar/doab
Doab OAI harvest
|
2018-04-16 13:47:08 -04:00 |
|
eric
|
5671856daa
|
... and the management command
|
2018-04-16 13:46:33 -04:00 |
|
eric
|
8dd1fb1822
|
remove doab author loader
now uses oai functionality
|
2018-04-16 13:44:10 -04:00 |