Commit Graph

2724 Commits (b68ad58cc62c7b9512c354eae75c26952fad6430)

Author SHA1 Message Date
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
eric 60bc236ab4 init mimetypes 2016-03-25 14:13:39 -04:00
Raymond Yee bac02db88a Merge pull request #540 from Gluejar/missing-work-title
fixed work title in templates
2015-12-19 15:32:17 -05:00
Raymond Yee c662da6a32 Merge pull request #538 from Gluejar/fix-merge-ui
Fix merge ui
2015-12-19 15:04:09 -05:00
eric 91d783d6e4 one more 2015-12-18 12:56:14 -05:00
eric a52f7a9ec5 fixed work title in templates
at some point we changed work.__unicode__ causing this issue
2015-12-18 12:53:12 -05:00
eric 5f07c4d87f fix edit permissions
we were letting rightsholders create editions but not edit them, and
the display of the link didn't match the edit permission. now
rightsholders can edit any edition for any work not in a campaign
2015-12-17 10:29:35 -05:00
eric deb6fcc322 use local version of ui-lightness css uniformly
this is not fixing a bug, just making the invocation uniform accross
the site.
2015-12-14 11:52:41 -05:00
eric 9086cd77ec I little bug I recently noticed 2015-12-08 11:02:26 -05:00
eric a9d7608128 update last changed 2015-11-25 15:46:42 -05:00
eric 1a21da11c1 update news link 2015-11-18 15:32:58 -05:00
eric 67b6b6e954 errata for new edition editing 2015-11-18 10:04:01 -05:00
Raymond Yee 57f0d57c12 Merge pull request #530 from Gluejar/fix-new-subject
set the default
2015-11-17 14:23:49 -08:00