Commit Graph

6104 Commits (foundationworkpage)

Author SHA1 Message Date
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
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
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
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
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
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
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
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
eric 0ebbb21d47 add source to EbookFile
Want to be able to avoid downloading duplicate ebooks
2017-08-08 10:02:25 -04:00
eric f9d31b0f51 fix glue resolution 2017-08-07 21:46:21 -04:00
eric 489790fa2f add ebook loading code 2017-08-07 16:17:00 -04:00
eric 389e9a1749 'format' is a built-in
test_file was not doing anything because format parameter not passed.
Didn't raise error because 'format' is a built-in function
2017-08-07 16:13:22 -04:00
eric e8bd8725cc handle edition ids better
also, allow contributor to request unglue.it id
2017-08-04 17:12:05 -04:00
eric d9979ff45b delint, pass tests 2017-08-03 17:31:12 -04:00
eric ada73a909c nits and tests 2017-08-03 17:09:42 -04:00
eric d5980bfd5b Merge branch 'master' into edit-editions 2017-08-03 16:15:14 -04:00
eric 08702a7b08 scrapes the metadata
also moves id validation to core
2017-08-03 16:15:06 -04:00
eric 7bc72692c5 add exception handling 2017-07-30 13:55:46 -04:00
eric 758e307516 Merge branch 'master' into edit-editions
# Conflicts:
#	frontend/tests.py
2017-07-29 20:47:28 -04:00
eric aaef670798 add scraper for webpages
gets title, description, language

adds beautiful soup to requirements
updates gitenberg.metadata import
2017-07-29 20:46:22 -04:00
eshellman 86b108364b Merge pull request #689 from Gluejar/fix-stripe-tests
Fix stripe tests again
2017-07-28 13:13:24 -04:00
eric b59ed38344 Fix stripe tests again 2017-07-28 13:13:18 -04:00
eric 05af45d13e delint 2017-07-28 12:45:17 -04:00
eshellman 075c2d7734 Merge pull request #688 from Gluejar/fix-stripe-tests
Fix stripe tests
2017-07-28 12:42:05 -04:00
eric f1dd40fe00 delint 2017-07-28 12:40:34 -04:00
eric a745223e3c fix brittle tests 2017-07-28 12:26:26 -04:00
eric 2adf3cc7cd handle isbn and goog lookups 2017-07-27 15:13:04 -04:00