Commit Graph

6373 Commits (ba7b02b939bb495a09668c1cf88a96349bd599fd)

Author SHA1 Message Date
eric 326dc6442f tg for tests 2017-09-15 16:50:31 -04:00
eric 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
eric 29df43156b Merge remote-tracking branch 'Gluejar/master' 2017-09-14 12:42:42 -04:00
eric e161d28ee4 Merge branch 'master' into production 2017-09-14 12:41:19 -04:00
eshellman ec39eff244 Merge pull request #699 from Gluejar/fix-regressions
fix missing book-cover class
2017-09-14 12:15:32 -04:00
eric 5ba314c0ab fix missing book-cover class
(made that change too quickly!
2017-09-14 11:42:27 -04:00
eric edf328418d Merge branch 'master' into production 2017-09-06 22:34:04 -04:00
eshellman 2be016ba67 Merge pull request #698 from Gluejar/bugfix
Bugfixes
2017-09-06 18:11:15 -04:00
eric 26ddf79945 add filesize to mobi ebooks 2017-09-06 18:04:09 -04:00
eric fc23d6bbab fixed issue with no ebook on ebf 2017-09-06 18:02:40 -04:00
eric d891a61bcd uniform edition cover images 2017-09-04 17:10:23 -04:00
eric ef90e901f1 add to bisac 2017-09-04 16:52:06 -04:00
eric 302f70c2fb bad variable reference 2017-09-04 16:10:55 -04:00
eric 5bbeb45053 improve merge_works
work_relations were not being updated
2017-09-04 16:10:24 -04:00
eric 91ae62e757 fix onix feed for work 2017-09-04 14:28:47 -04:00
eric f476295b7b Merge branch 'master' into production 2017-08-28 10:09:40 -04:00
eshellman 68804d6b4c Merge pull request #697 from Gluejar/fix-work-template
incorrect usage of purchased tag
2017-08-27 14:18:51 -04:00
eric 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
eric 0f51886f72 remove unneeded requirements 2017-08-25 17:34:25 -04:00
eshellman bb0d7e4324 Merge pull request #695 from Gluejar/supress-xx
Suppress xx relation display
2017-08-25 16:16:49 -04:00
eric 99d619fc2e update template map 2017-08-25 16:16:28 -04:00
eric 607c63914c move right column to separate file 2017-08-25 16:16:04 -04:00
eric a52fd4a013 suppress xx relation display 2017-08-25 14:52:36 -04:00
eric 4c5d4872e7 Merge branch 'master' into production 2017-08-24 15:15:07 -04:00
eshellman 0265142021 Merge pull request #694 from Gluejar/pandata-loader-merge-works
Pandata loader merge works
2017-08-24 14:45:31 -04:00
eric 6895302338 add OpenGraph type, title, and cover to scraper 2017-08-24 14:43:31 -04:00
eric e2e1eac41e merge works when appropriate
pandata bookloader was not merging works
2017-08-24 14:42:35 -04:00
eric 3c1cfedcf9 Merge branch 'master' into production 2017-08-23 12:59:13 -04:00
eshellman b68ad58cc6 Merge pull request #693 from Gluejar/scrape-sitemap
add command to load from sitemaps
2017-08-23 12:28:32 -04:00
eric e7847ae349 remove debug code 2017-08-23 12:24:04 -04:00
eric 0c687fdad4 add command to load from sitemaps 2017-08-23 12:21:56 -04:00
eric 1ebe75f9f7 remove questionnaire duplicate 2017-08-21 12:03:38 -04:00
eric 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 6460fa2cd4 Merge branch 'master' into production 2017-08-19 13:46:26 -04:00
eshellman 7639bf8597 Merge pull request #692 from Gluejar/edit-editions
fix bug in edition assignment
2017-08-18 16:39:38 -04:00
eric 1bd1f943f6 fix bug in edition assignment 2017-08-18 16:39:11 -04:00
eric 800ef4db4e Merge branch 'master' into production 2017-08-16 17:47:44 -04:00
eshellman 11f06226a7 Merge pull request #691 from Gluejar/edit-editions
Edit editions
2017-08-16 16:24:44 -04:00
eric 591fd23853 add ebook rights 2017-08-16 16:20:43 -04:00
eric 3993ffa04a add id links, refactor 2017-08-16 15:46:19 -04:00
eric 218aef87f7 link to edit form for new ebookfiles 2017-08-15 16:53:27 -04:00
eric 256f566a8b omit the make id checkbox 2017-08-15 16:52:15 -04:00
eric 2a8dff4336 loader shouldn't always believe metadata 2017-08-15 16:51:35 -04:00
eric ca5d9e1053 fix edition note aignment 2017-08-09 21:14:38 -04:00
eric 4d7e087ef5 Merge branch 'master' into production 2017-08-08 15:48:18 -04:00
eshellman 6bd1aec374 Merge pull request #690 from Gluejar/edit-editions
revamp editing editions
2017-08-08 14:09:48 -04:00
eric 22e2b8587e fix edition asignment, add doi 2017-08-08 14:06:29 -04:00
eric 2514dfa08d ebookfile admin 2017-08-08 13:08:18 -04:00
eric 711f2880fa add ebook activation on edition edit 2017-08-08 12:39:23 -04:00
eric 8de43cfda8 set user on ebooks loaded from webpage 2017-08-08 12:38:54 -04:00