eric
|
66af82f43d
|
Merge branch 'master' into production
|
2017-10-30 13:31:30 -04:00 |
|
eshellman
|
9216f40356
|
Merge pull request #713 from EbookFoundation/master
Master
|
2017-10-30 12:57:45 -04:00 |
|
eshellman
|
74216ed45c
|
Merge pull request #42 from EbookFoundation/jkelly/update-devpy
Change dev.py defaults and update README
|
2017-10-30 12:51:51 -04:00 |
John Kelly
|
4a617363fe
|
Change defaults in dev.py to use mysql and redis, and add more detail to README
|
2017-10-29 18:40:35 -04:00 |
|
eshellman
|
23ebaa3fd6
|
Merge pull request #712 from Gluejar/optimize-id-queries
optimize id access
|
2017-10-29 15:45:14 -04:00 |
|
eric
|
b5e52effd9
|
optimize id access
See
https://docs.djangoproject.com/en/1.11/topics/db/optimization/#use-forei
gn-key-values-directly
|
2017-10-28 18:33:58 -04:00 |
|
eshellman
|
f6cf56fae3
|
Merge pull request #711 from Gluejar/celery-admin-set-free
Celery admin, set free
|
2017-10-27 17:40:59 -04:00 |
|
eric
|
ff51103e3d
|
fix setting is_free
|
2017-10-27 17:38:55 -04:00 |
|
eric
|
e5c9864c16
|
fix celery admin
|
2017-10-27 15:13:53 -04:00 |
|
eric
|
5f2d7f4f2f
|
Merge branch 'master' into production
|
2017-10-27 12:29:23 -04:00 |
|
eshellman
|
e23a885f8a
|
Merge pull request #710 from Gluejar/hathitrust-scrape
Hathitrust scraper
|
2017-10-27 12:09:40 -04:00 |
|
eric
|
2a7773fafa
|
add hathitrust scraper
|
2017-10-27 12:09:03 -04:00 |
|
eric
|
12bd17497b
|
fix exception, refine auth parsing
|
2017-10-27 12:08:27 -04:00 |
|
eshellman
|
a1ab17f150
|
Merge pull request #709 from Gluejar/open-edition-edit
Open edition editing
|
2017-10-26 13:34:10 -04:00 |
|
eric
|
10e4ea1eba
|
don't require last add author
|
2017-10-26 13:32:15 -04:00 |
|
eric
|
efbffa683c
|
Open up editing privileges
keep track of who has added the work with a many-to-many table
|
2017-10-26 13:03:05 -04:00 |
|
eshellman
|
6ff3e20544
|
Merge pull request #708 from Gluejar/fix-locale-isbn
fix locale test
|
2017-10-26 10:57:32 -04:00 |
|
eric
|
7e190f7e96
|
fix locale test
The isbn we were using has inexplicably fallen out of google books
index. now testing a zh-CN book
|
2017-10-26 10:44:26 -04:00 |
|
eshellman
|
8da877a813
|
Merge pull request #41 from NicholasAntonov/master
Fix readme and errors preventing running project
|
2017-10-23 10:26:25 -04:00 |
Nicholas Antonov
|
fa26ae2d38
|
Upgrade what needs to be installed
|
2017-10-21 21:25:12 -04:00 |
|
Nicholas Antonov
|
9aab5dae69
|
Fix merge conflict
|
2017-10-21 21:18:32 -04:00 |
|
Nicholas Antonov
|
4a46bc3154
|
Fix migrate command in readme
|
2017-10-21 20:29:24 -04:00 |
|
eric
|
3602c3c964
|
fix bug where ids weren't cleaned
|
2017-10-17 15:44:44 -04:00 |
|
eric
|
86e38d08bb
|
improve namelist parsing
|
2017-10-06 16:04:59 -04:00 |
|
eric
|
170a6b7b16
|
Merge remote-tracking branch 'Gluejar/master'
|
2017-10-06 15:36:29 -04:00 |
|
eric
|
4e7f45e903
|
Merge branch 'master' into production
|
2017-09-28 14:18:07 -04:00 |
|
eshellman
|
c00d616c77
|
Merge pull request #706 from Gluejar/pressbooks
fix bug
|
2017-09-28 14:14:19 -04:00 |
|
eric
|
f2fb171708
|
fix bug
|
2017-09-28 14:17:12 -04:00 |
|
eric
|
2d6c374816
|
Merge branch 'master' into production
|
2017-09-28 14:07:19 -04:00 |
|
eric
|
5426926fbb
|
fix "my faves" link
|
2017-09-28 13:36:20 -04:00 |
|
eric
|
0ef4d4c297
|
handle " and "
|
2017-09-28 13:36:03 -04:00 |
|
eshellman
|
2974bdd5fb
|
Merge pull request #705 from Gluejar/pressbooks
Pressbooks
|
2017-09-28 13:34:37 -04:00 |
|
eshellman
|
d5cf83bc89
|
Merge pull request #704 from Gluejar/pressbooks
add a scraper for pressbooks
|
2017-09-28 13:29:57 -04:00 |
|
eric
|
fa4573a74d
|
authlist cleaner, definition lists
|
2017-09-28 13:25:56 -04:00 |
|
eric
|
467ab8a425
|
add scraper selector
|
2017-09-27 19:20:14 -04:00 |
|
eric
|
db03b59fb4
|
add code for pressbooks scraping
|
2017-09-27 17:54:44 -04:00 |
|
eshellman
|
d5425b38cc
|
Merge pull request #703 from Gluejar/update-gb-fixtures
update hamilton fixture
|
2017-09-27 11:42:00 -04:00 |
|
eric
|
fffab6c5e9
|
update hamilton fixture
|
2017-09-27 11:43:20 -04:00 |
|
eric
|
49c3dab38e
|
Merge branch 'master' into production
|
2017-09-26 11:00:43 -04:00 |
|
eshellman
|
a27d522ecf
|
Merge pull request #702 from Gluejar/fix-ebook-upload
fix ebook upload
|
2017-09-26 10:34:50 -04:00 |
|
eric
|
4077127f3f
|
guess I didn't test this!
|
2017-09-26 10:36:51 -04:00 |
|
eric
|
e4ac20c036
|
Merge branch 'master' into production
|
2017-09-23 10:58:45 -04:00 |
|
eshellman
|
d4ecca00ba
|
Merge pull request #701 from Gluejar/social-auth-reset
Social auth reset
|
2017-09-22 18:29:54 -04:00 |
|
eric
|
2651afd02f
|
old test book not in GB anymore
|
2017-09-22 18:31:06 -04:00 |
|
eric
|
4aa968a523
|
change behavior of reset password
- send email even if password is unusable
- tell user if there's no user with that email
|
2017-09-22 16:54:16 -04:00 |
|
eric
|
d968a800ae
|
don't require old password if social auth
|
2017-09-22 16:02:43 -04:00 |
|
eric
|
c3fd4347a5
|
use single quotes
|
2017-09-22 14:53:32 -04:00 |
|
eric
|
19266d35ee
|
remove social_auth_reset_password
|
2017-09-22 14:50:35 -04:00 |
|
eric
|
9249ea565b
|
Merge branch 'master' into production
|
2017-09-15 17:50:02 -04:00 |
|
eshellman
|
3a2fcf53c5
|
Merge pull request #700 from Gluejar/fix-messy-subjects
Fix messy subjects
|
2017-09-15 16:54:04 -04:00 |