Commit Graph

2936 Commits (c142533898b3f8e2763d2ec5d4d7a3ceee91b4fa)

Author SHA1 Message Date
eric ec5aa5f599 don't do google books search for bad robots 2018-01-12 12:05:57 -05:00
eric a3aab48ea7 simplified response for work HEAD 2018-01-12 12:05:13 -05:00
eric 4802eea09d Disallow: /search/ 2018-01-12 11:53:10 -05:00
eric 48de8408a6 add metas on landing page 2018-01-05 16:37:52 -05:00
eric 11445f8a30 delint 2018-01-05 16:24:12 -05:00
eric f92f469e48 add extra metadata 2018-01-05 16:23:56 -05:00
eric 95e19e5971 enable easy ebook rights setting 2018-01-03 17:50:21 -05:00
eric 2db2c499b8 fix bookpanel 2018-01-02 20:08:11 -05:00
eric 19a005bfa6 tweak campaign setup 2017-12-19 10:48:26 -05:00
eric 4b8a5cbc80 updates 2017-12-18 11:28:06 -05:00
eric 1611ebe82a poorly conceived test 2017-12-15 18:24:19 -05:00
eric af2034da77 add form validation of donation restriction 2017-12-15 14:04:32 -05:00
eric 4d398fb419 typo 2017-12-15 14:04:11 -05:00
eric 184aab1b43 add static test 2017-12-15 14:03:54 -05:00
eric c896fdeba4 add handing for pledge->donation 2017-12-14 21:38:14 -05:00
eric 4aeae6e67c implement donation options 2017-12-14 16:24:26 -05:00
eric 877affd8bf implement sass for only pledge.css 2017-12-12 13:26:01 -05:00
eshellman 76dc6d010c
Merge pull request #731 from EbookFoundation/newfoundation
try scss off production
2017-12-11 16:23:46 -05:00
eric 886068a6ee clean up after change to work id
doi and http_id were changed to work only
2017-12-10 17:05:58 -05:00
eric 22870a4350 harden object retrieval against unexpected input 2017-12-08 20:58:37 -05:00
eric 816b0a1099 how did that ever work? 2017-12-08 11:04:00 -05:00
Nicholas Antonov 7438b5c217 Fix names and add scss for work page 2017-12-07 16:55:16 -05:00
Nicholas Antonov 893d8abc4a Make django scss preprocessor work 2017-12-07 16:33:10 -05:00
eric 82784778c4 add springer scraper 2017-12-06 18:13:46 -05:00
eric 3889259fd8 wrong template 2017-12-06 13:59:05 -05:00
Nicholas Antonov 9513514beb Start adding sass preprocessor 2017-12-05 18:46:18 -05:00
eric 20902c7676 fix identifier validation 2017-12-02 18:02:47 -05:00
eric 132d87f8e4 clean up campaign-manage 2017-11-27 21:45:45 -05:00
eric a957706c23 clean up campaign creation 2017-11-27 20:12:42 -05:00
eshellman 36385ffc54
Merge pull request #719 from Gluejar/revise-new-rh
Revise new rh process and docs
2017-11-18 16:36:03 -05:00
eric 12cbac63b3 revise documentation, faq 2017-11-18 16:35:19 -05:00
eric bb29fc3d1f remove gluejar.com 2017-11-18 16:34:56 -05:00
eric ce003c5607 revise rh signup workflow 2017-11-13 15:30:00 -05:00
eric 50a0296eee add supporter facet 2017-11-08 17:29:41 -05:00
eric 96f40a8514 add rh agreement form 2017-11-07 10:43:40 -05:00
eric 980e28eb54 deleting author should return to edit page 2017-11-06 11:22:31 -05:00
eric a345566680 add file input handling to filetype js 2017-10-30 21:13:38 -04:00
eric b4184b4ddc also save the work title 2017-10-30 19:23:11 -04:00
eshellman 9216f40356
Merge pull request #713 from EbookFoundation/master
Master
2017-10-30 12:57:45 -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
eric ff51103e3d fix setting is_free 2017-10-27 17:38:55 -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
Nicholas Antonov 9aab5dae69 Fix merge conflict 2017-10-21 21:18:32 -04:00
eric 3602c3c964 fix bug where ids weren't cleaned 2017-10-17 15:44:44 -04:00
eric 170a6b7b16 Merge remote-tracking branch 'Gluejar/master' 2017-10-06 15:36:29 -04:00
eric 5426926fbb fix "my faves" link 2017-09-28 13:36:20 -04:00
eric 4077127f3f guess I didn't test this! 2017-09-26 10:36:51 -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 19266d35ee remove social_auth_reset_password 2017-09-22 14:50:35 -04:00
eric 29df43156b Merge remote-tracking branch 'Gluejar/master' 2017-09-14 12:42:42 -04:00
eric 5ba314c0ab fix missing book-cover class
(made that change too quickly!
2017-09-14 11:42:27 -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 5bbeb45053 improve merge_works
work_relations were not being updated
2017-09-04 16:10:24 -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 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 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 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 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 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 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 758e307516 Merge branch 'master' into edit-editions
# Conflicts:
#	frontend/tests.py
2017-07-29 20:47:28 -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
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
eric db97a98ae8 https 2017-07-27 10:33:13 -04:00
eric 52127faec9 put id creation at start of new edition form
this reworks the identifier creation UI
2017-07-26 17:33:38 -04:00
eric d85a272576 reorg forms module 2017-07-25 09:28:14 -04:00
eric 85c4c3601c small refactor 2017-07-25 08:21:26 -04:00
eric 5c46c70fb1 delint and fix 2017-07-25 08:14:05 -04:00
eric d3eaf43228 start views reorg 2017-07-25 07:29:23 -04:00
eric 3f9f84218e update admin style 2017-07-19 14:26:04 -04:00
eric 4cc0e0fe4f delete regluit.questionnaire 2017-06-20 11:08:14 -04:00
eric 75887aa789 eliminate bad template errors 2017-06-12 12:05:49 -04:00
eric eae65d7467 updates from gluejar/reqluit 2017-06-08 17:35:48 -04:00
eric 8d7b2f7417 add completion date column 2017-05-19 13:46:12 -04:00
eric d3874e1ad7 wire up answer summaries 2017-05-02 17:10:06 -04:00
eric d7917a24d1 add oapen to supported targets 2017-04-17 13:47:51 -04:00
eric 097d9db9b6 fix exception with missing format 2017-04-17 13:47:40 -04:00
Raymond Yee 5756f171dc Merge pull request #665 from Gluejar/donations
add donation box to homepage
2017-04-03 16:59:52 -07:00
eric e9e38fa104 don't show links to search engines 2017-03-04 23:00:19 -05:00
eric 7294a5c679 update doi regexp and display
https://www.crossref.org/display-guidelines/
2017-02-22 11:21:24 -05:00
eric d5c7a016ee 3 more instances of checking truth of a method 2017-02-13 13:48:17 -05:00
eric 417f9eac58 add donation box to homepage 2017-02-13 13:33:26 -05:00
eric beaedc3210 add OS announce 2017-02-01 14:20:25 -05:00
eric 5eebeae378 frontend tests run on fixtures 2016-12-29 14:11:17 -05:00
eric 7d749f068a revive settings files 2016-12-20 14:55:53 -05:00
eric 9d5fe5e678 change target of links to PG/DOAB
and add facet links to explore panel
2016-12-09 14:58:19 -05:00
Raymond Yee 405af3b2e7 Merge pull request #646 from Gluejar/id-facets
Id facets
2016-11-14 11:21:40 -08:00
eric 59e92b8efc add facets for doab and gtbg 2016-11-10 16:21:57 -05:00
eric ab57985b33 expose gutenberg and doab status on work page
also, refactor id properties on work
2016-11-10 16:21:21 -05:00
eric c393740999 not sure when this slipped in 2016-11-09 16:21:31 -05:00
eric d95f81030f add sanitization code to edition form 2016-10-20 15:24:47 -04:00
eric e31163164a add distinct.
Needed to test this with multiple landings configured.
2016-10-17 13:37:22 -04:00
Raymond Yee 724f6f112e Merge pull request #639 from Gluejar/fix-upload-doi
fix two form bugs
2016-10-11 14:02:32 -07:00
eric 41d8f53268 fix two form bugs
1. fix doi regexp
2. supress validation error when file is uploaded, not url
2016-10-05 18:02:03 -04:00
eric b0663d435b Merge branch 'master' into questionnaire_export 2016-10-05 15:43:51 -04:00
eric 0e7320d4e8 integrate exports into unglue.it surveys 2016-10-05 15:36:20 -04:00
Raymond Yee e0e96da968 Merge branch 'master' into versions-relations-ednotes 2016-09-29 14:02:23 -07:00
eric 5fc4d631ff split version into label and iter 2016-09-23 14:53:58 -04:00
Raymond Yee 81524ac5f0 work.authors() returns list of all authors 2016-09-23 10:16:26 -07:00
eric c730d70ea1 copy html template to txt 2016-09-20 08:18:38 -04:00
Raymond Yee a2cb58800c Merge branch 'master' into versions-relations-ednotes 2016-09-12 09:27:08 -07:00
Raymond Yee 40971359a7 put production into maintenance 2016-09-08 18:28:33 -07:00
Raymond Yee 24dc3c578d Merge branch 'master' into dj18 2016-09-07 09:59:19 -07:00
Raymond Yee 6a86ffae07 put just into MAINTENANCE_MODE 2016-09-07 09:37:54 -07:00
Raymond Yee 62f44bee19 Merge branch 'master' into dj18 2016-09-06 17:18:28 -07:00
Raymond Yee 708634b99a put just in maintenance mode (to remind myself how to do so) before doing so for production 2016-09-03 14:51:07 -07:00
eric dcda9f8f89 add format setting javascript 2016-08-26 12:27:48 -04:00
eric d1951bab75 add file upload to ebook submission form 2016-08-26 10:28:23 -04:00
eric 7ad0d7f494 implemented ebook versions
It turned out that ebookfile handling needed revamping with the
addition of ebook versions; so this change turned out to be rather big.
2016-08-24 15:41:29 -04:00
eric 221efdec6c make it easier to find and edit ebook editions 2016-08-16 17:17:24 -04:00
eric 363c86fd94 implement EditionNote 2016-08-16 17:16:44 -04:00
eric 8f71b24b1b make adding editions easier 2016-08-16 11:04:37 -04:00
eric b3cefc2d3c implement related works 2016-08-15 18:28:39 -04:00
eric 95fd91e283 pylint the forms 2016-08-15 16:12:27 -04:00
eric f6bbc5a548 pylint the views 2016-08-15 15:22:32 -04:00
eric 9b0c91a439 implement age_level 2016-08-15 13:47:00 -04:00
eric abedff089c add direct support for doi 2016-08-08 16:27:12 -04:00
eric 33a1482cc7 refactor libraryauth
try to keep all the user reg stuff in libraryauth, in prep for
splitting it off
2016-07-28 15:28:05 -04:00
eric 006aeaf66f reverse by path is deprecated
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-id3
2016-07-27 14:01:22 -04:00
eric ac541ec1a0 patterns in urlpatterns are deprecated
https://docs.djangoproject.com/en/1.9/releases/1.8/#s-django-conf-urls-p
atterns

Also, moved edit_user to libraryauth module with the rest of our user
reg and auth.
2016-07-27 13:02:47 -04:00
eric c457b268ec modernize some heavily used templates 2016-07-25 14:50:19 -04:00
eric cd9e2cf8ea fix more tests 2016-07-25 11:32:24 -04:00
eric e6c3b226f9 REQUEST is deprecated 2016-07-25 11:32:04 -04:00
eric 8f4ca12483 fixed premium editing as validation is triggered by data 2016-07-24 18:50:48 -04:00
eric 09fe1a5d32 switch from deprecated get_model a app registry 2016-07-24 18:39:36 -04:00
eric f28b4b2e6b remove stray "url from future" 2016-07-24 14:00:25 -04:00
eric cafd163f77 deprecate profile 2016-07-23 12:09:18 -04:00
eric b1e6dcec4f update tests for explicit fixture loading 2016-07-23 12:08:28 -04:00
eric f3cb6c9edf switch to contrib_comments
removed in 1.8
2016-07-21 16:05:57 -04:00
eric 05af9db11c model forms need at least exclude 2016-07-21 15:52:07 -04:00
eric c01459c059 fixed kw editing for non-staff, added tests 2016-07-14 12:25:18 -04:00
Raymond Yee 5eaf6f5c73 Merge pull request #608 from Gluejar/remove-nonprofit
Remove nonprofit
2016-07-12 09:42:18 -07:00
eric 0c3c9fa818 fix bug in buy as a gift
A bugfix broke "buy as a gift"
https://github.com/Gluejar/regluit/commit/f7bfdfbbc4cec73e0608f3fef5c335
ce0113078c
2016-07-12 09:00:32 -04:00
eric a6c1371ba5 remove the "nonprofit" campaign functionality 2016-07-08 10:57:01 -04:00
eric ca08c5caef add googlebooks virtual urls to disallow
after we added author links, robots started creating db entries by
following links in search page
2016-06-28 14:56:59 -04:00
eric 6d3c5f2aca also harden the view 2016-06-20 13:16:37 -04:00
eric bb9bd032b1 fix unencoded queries in urls 2016-06-20 13:08:23 -04:00
eric 12f298ee54 html nits 2016-06-16 18:20:48 -04:00
eric aa8189cd97 add alt text 2016-06-16 17:58:11 -04:00
Raymond Yee 5d50e85fd8 Merge pull request #593 from Gluejar/more-survey
More survey improvements
2016-06-15 11:45:28 -10:00
Raymond Yee bc5c7a383b Merge pull request #590 from Gluejar/author-search
add link to author name [#25583953]
2016-06-15 09:17:26 -10:00
eric 8c21a124b4 added to claim faq 2016-06-14 11:37:13 -04:00
eric 2b091e28e7 redirect to next on survey completion
Also, tweak style on complete page.
2016-06-13 17:34:51 -04:00
eric 3330677b47 display number of surveys completed 2016-06-13 14:32:29 -04:00
eric a189b0a8c2 add link to author name 2016-06-06 13:49:22 -04:00
Raymond Yee 9c59b701ed Merge pull request #587 from Gluejar/fix-survey-runinfo
Improve survey app
2016-05-31 16:13:34 -07:00
eric 4df440ae46 fix survey completion 2016-05-31 17:46:08 -04:00
eshellman f99b621c19 Merge pull request #585 from Gluejar/push
FTP Push seconds on the onix file is a good idea
2016-05-30 10:30:34 -04:00
eric a40160f191 quick display and creation of landings 2016-05-26 12:19:33 -04:00
eric 959c5aa187 remove signin link 2016-05-25 11:53:29 -04:00
eric f3d30615bb remove unused blocktrans
Must have been a django version change
2016-05-25 09:12:37 -04:00
eric bf220c5c6f Merge branch 'master' into push
# Conflicts:
#	settings/common.py
2016-05-20 16:44:13 -04:00
eric 66c0d84029 add work.formats() 2016-05-16 16:43:03 -04:00
eric 8f3efc95ad update aldiko logo and add to iOS views 2016-05-12 11:02:57 -04:00
eric 1a2da6c523 Add dsr and aui marc relators
"designer" and "author of introduction" are the additional roles we
could have used
2016-05-12 11:02:22 -04:00
eric c5ee01df57 its the future! 2016-05-11 10:41:50 -04:00
eric 240564e75b remove template workaround for testing 2016-05-11 10:36:20 -04:00
eric f662920c2a Merge branch 'master' into push 2016-05-10 17:33:54 -04:00
eric 28291d436e Merge branch 'master' into isbn-in-search 2016-05-10 17:32:45 -04:00
Raymond Yee 795364a86e Decimal is imported as D 2016-05-10 11:27:24 -07:00
eric af7d0e867c add isbn querey
if query is a valid isbn, then search on the identifier table
2016-05-09 21:48:23 -04:00
eric 50930ce2b1 send kindle from s3
add file archiving code, because we needed it for push distribution.

Also use archive for kindle. tweak send-to-kindle docs.
2016-05-09 18:32:38 -04:00
Raymond Yee ba516cd08d Merge branch 'master' into dj16 2016-05-04 13:52:25 -07:00
Raymond Yee 574854ec5a Merge pull request #565 from Gluejar/add-questionnaire
add the questionnaire module
2016-04-29 09:57:00 -07:00
eric 730c46c02a Merge branch 'master' into dj16 2016-04-27 12:03:41 -04:00
eric cf64d43811 add the questionnaire module 2016-04-26 14:38:32 -04:00
Raymond Yee 3c795dfb58 add a clarifying comment and restore raise Http404 for the case for ebfs.count() is 0 2016-04-26 11:24:46 -07:00
Raymond Yee c67f676a24 try to make looking for the at most one SUCCESSFUL buy-to-unglue campaign for the work a bit clearer 2016-04-26 10:54:55 -07:00
eric 20102ffc12 remove assumption that successful campaign is last 2016-04-25 14:56:17 -04:00
eric c5886e5584 allow thanks campaign after success 2016-04-23 17:55:01 -04:00
eric 616e8b3c9d Wordpress is magically HTTPS 2016-04-12 14:32:22 -04:00
eric ef62d59dd0 bugfix unrelated to 1.6 2016-04-09 13:26:05 -04:00
eric 3949947277 unsafe value in session 2016-04-09 13:25:31 -04:00
eric bca17837a0 add fixtures in testcases 2016-04-09 13:21:12 -04:00
eric a4e9855b35 revert to older, patched Notification 2016-04-08 18:45:50 -04:00
eric 7a952f09cf patch form exclude syntax 2016-04-07 20:39:23 -04:00
eric 356207bc5d patch django.conf.urls.defaults 2016-04-07 20:38:53 -04:00
eric 562be5f12d patch django-notification 2016-04-07 20:37:54 -04:00
eric d951cca966 Merge branch 'master' into django15
# Conflicts:
#	api/models.py
#	api/onix.py
#	api/opds.py
#	api/tests.py
#	api/urls.py
#	api/views.py
#	bisac/__init__.py
#	core/bookloader.py
#	core/facets.py
#
core/migrations/0072_auto__add_relator__add_relation__add_field_subject_
authority.py
#	core/models.py
#	core/tests.py
#	fabfile.py
#	frontend/forms.py
#	frontend/templates/new_edition.html
#	frontend/templates/notification/rights_holder_claim/notice.html
#	frontend/templates/privacy.html
#	frontend/views.py
#	requirements_versioned.pip
#	settings/common.py
#	test/raw/master/metadata.yaml
2016-04-07 14:26:45 -04:00
Raymond Yee 26520d92e6 Merge pull request #555 from Gluejar/fix-mobi-making
Fix mobi making
2016-03-30 17:26:06 -07:00
eric a72ac07dcf add function to generate mobi from the active epub 2016-03-29 13:06:23 -04:00
eric c902d6503c can add asks to non-ebf ebooks
(and can start a thanks campaign with non-ebf ebooks
2016-03-28 17:53:33 -04:00
eric dfb7422857 some SEO 2016-03-28 09:54:57 -04:00
eric a8ab510c61 set edition in initial 2016-03-25 23:37:32 -04:00