Commit Graph

2635 Commits (387a4607e734198d3e5aba1dbd94b817a295d777)

Author SHA1 Message Date
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