fa4573a74d
authlist cleaner, definition lists
2017-09-28 13:25:56 -04:00
467ab8a425
add scraper selector
2017-09-27 19:20:14 -04:00
db03b59fb4
add code for pressbooks scraping
2017-09-27 17:54:44 -04:00
d5425b38cc
Merge pull request #703 from Gluejar/update-gb-fixtures
...
update hamilton fixture
2017-09-27 11:42:00 -04:00
fffab6c5e9
update hamilton fixture
2017-09-27 11:43:20 -04:00
49c3dab38e
Merge branch 'master' into production
2017-09-26 11:00:43 -04:00
a27d522ecf
Merge pull request #702 from Gluejar/fix-ebook-upload
...
fix ebook upload
2017-09-26 10:34:50 -04:00
4077127f3f
guess I didn't test this!
2017-09-26 10:36:51 -04:00
e4ac20c036
Merge branch 'master' into production
2017-09-23 10:58:45 -04:00
d4ecca00ba
Merge pull request #701 from Gluejar/social-auth-reset
...
Social auth reset
2017-09-22 18:29:54 -04:00
2651afd02f
old test book not in GB anymore
2017-09-22 18:31:06 -04:00
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
d968a800ae
don't require old password if social auth
2017-09-22 16:02:43 -04:00
c3fd4347a5
use single quotes
2017-09-22 14:53:32 -04:00
19266d35ee
remove social_auth_reset_password
2017-09-22 14:50:35 -04:00
9249ea565b
Merge branch 'master' into production
2017-09-15 17:50:02 -04:00
3a2fcf53c5
Merge pull request #700 from Gluejar/fix-messy-subjects
...
Fix messy subjects
2017-09-15 16:54:04 -04:00
326dc6442f
tg for tests
2017-09-15 16:50:31 -04:00
1ce4323bc4
precheck every new subject
...
fix bug with '/' in subject
interpret ';' as list delimiter
add cleaner script
2017-09-15 15:55:37 -04:00
29df43156b
Merge remote-tracking branch 'Gluejar/master'
2017-09-14 12:42:42 -04:00
e161d28ee4
Merge branch 'master' into production
2017-09-14 12:41:19 -04:00
ec39eff244
Merge pull request #699 from Gluejar/fix-regressions
...
fix missing book-cover class
2017-09-14 12:15:32 -04:00
5ba314c0ab
fix missing book-cover class
...
(made that change too quickly!
2017-09-14 11:42:27 -04:00
edf328418d
Merge branch 'master' into production
2017-09-06 22:34:04 -04:00
2be016ba67
Merge pull request #698 from Gluejar/bugfix
...
Bugfixes
2017-09-06 18:11:15 -04:00
26ddf79945
add filesize to mobi ebooks
2017-09-06 18:04:09 -04:00
fc23d6bbab
fixed issue with no ebook on ebf
2017-09-06 18:02:40 -04:00
d891a61bcd
uniform edition cover images
2017-09-04 17:10:23 -04:00
ef90e901f1
add to bisac
2017-09-04 16:52:06 -04:00
302f70c2fb
bad variable reference
2017-09-04 16:10:55 -04:00
5bbeb45053
improve merge_works
...
work_relations were not being updated
2017-09-04 16:10:24 -04:00
91ae62e757
fix onix feed for work
2017-09-04 14:28:47 -04:00
f476295b7b
Merge branch 'master' into production
2017-08-28 10:09:40 -04:00
68804d6b4c
Merge pull request #697 from Gluejar/fix-work-template
...
incorrect usage of purchased tag
2017-08-27 14:18:51 -04:00
c49281b84c
incorrect usage
...
Not sure why the error (tag not loaded) didn't occur on my local
machine.
the purchased tag is executed on the work template, no need to execute
on work_action. It adds values into the context object.
2017-08-27 14:18:50 -04:00
0f51886f72
remove unneeded requirements
2017-08-25 17:34:25 -04:00
bb0d7e4324
Merge pull request #695 from Gluejar/supress-xx
...
Suppress xx relation display
2017-08-25 16:16:49 -04:00
99d619fc2e
update template map
2017-08-25 16:16:28 -04:00
607c63914c
move right column to separate file
2017-08-25 16:16:04 -04:00
a52fd4a013
suppress xx relation display
2017-08-25 14:52:36 -04:00
4c5d4872e7
Merge branch 'master' into production
2017-08-24 15:15:07 -04:00
0265142021
Merge pull request #694 from Gluejar/pandata-loader-merge-works
...
Pandata loader merge works
2017-08-24 14:45:31 -04:00
6895302338
add OpenGraph type, title, and cover to scraper
2017-08-24 14:43:31 -04:00
e2e1eac41e
merge works when appropriate
...
pandata bookloader was not merging works
2017-08-24 14:42:35 -04:00
3c1cfedcf9
Merge branch 'master' into production
2017-08-23 12:59:13 -04:00
b68ad58cc6
Merge pull request #693 from Gluejar/scrape-sitemap
...
add command to load from sitemaps
2017-08-23 12:28:32 -04:00
e7847ae349
remove debug code
2017-08-23 12:24:04 -04:00
0c687fdad4
add command to load from sitemaps
2017-08-23 12:21:56 -04:00
1ebe75f9f7
remove questionnaire duplicate
2017-08-21 12:03:38 -04:00
84da8bde94
Merge remote-tracking branch 'Gluejar/master'
...
# Conflicts:
# frontend/views/__init__.py
# questionnaire/admin.py
# questionnaire/urls.py
# questionnaire/utils.py
# questionnaire/views.py
2017-08-21 12:02:48 -04:00
eric