Commit Graph

2660 Commits (e623f6d31f0a2a5657f3a1b80aded8e40ab82c01)

Author SHA1 Message Date
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
Raymond Yee 5544aeb70c Merge pull request #531 from Gluejar/pubdate-range
Pubdate range
2015-11-17 13:56:59 -08:00
Raymond Yee 5eb74149c1 Update faq.html
'a a' -> 'a'
2015-11-17 08:16:05 -08:00
eric 3387dfa118 change gluejar to Free Ebook Foundation 2015-11-16 15:07:21 -05:00
eric 7b7d7cf174 Merge branch 'master' into pubdate-range 2015-11-16 11:06:21 -05:00
eric 462ce137f0 set the default 2015-11-13 16:49:01 -05:00
eric 457fc67045 use https for eric's blog 2015-10-27 17:08:19 -04:00
eric a13e04a5b7 forgot this 2015-10-05 19:29:07 -04:00
eric 1ccdc144ba display publication range
needs a migration
2015-10-05 19:17:16 -04:00
eric e7c2cf1b3a add rich text editor 2015-09-21 16:54:53 -04:00
eric cf9e6f9104 fix add-edition 2015-09-21 16:42:46 -04:00
eric 6f4a27d409 fix for non staff user 2015-09-21 16:19:31 -04:00
eric 893d0c3c62 split edition edition from ebook submission 2015-09-21 16:07:41 -04:00
eric e20b58b656 fix when new edition 2015-09-21 15:08:51 -04:00
eric 1e4177766b Enable subject editing on editions 2015-09-21 15:01:45 -04:00
eric b5bae66f08 bisac adding now works 2015-09-21 13:01:27 -04:00
Raymond Yee d4c2257511 Merge pull request #520 from Gluejar/onix-feed
Implement ONIX 3.0 feed
2015-08-28 21:57:18 -04:00
eric 2b9793e2d6 tests, links and documentation 2015-08-27 15:23:52 -04:00
Raymond Yee 5f7b2997e1 Merge pull request #517 from Gluejar/booxtream-to-https
Booxtream to https
2015-08-26 14:04:06 -04:00
Raymond Yee 809ee36093 Merge pull request #516 from Gluejar/rejigger-home
include user faves on landing page
2015-08-25 19:38:59 -04:00
eric fb28d5b34f unused import 2015-08-25 13:53:30 -04:00
eric ff39129674 include user faves on landing page
and stop redirecting / to supporter page
2015-08-24 10:27:39 -04:00
eric ea4e0c4c3f tweak upload instructions 2015-08-22 12:04:40 -04:00
eric c34ffdd883 implement sorel-thumbnail
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
eric 86ef74662b add author role selector
Previously, to change an author role, you had to delete and add the
author.
2015-08-21 13:47:04 -04:00
Raymond Yee c6eff142ae Merge pull request #512 from Gluejar/feedback-by-webpage
replace email support links with form [finish #86803178]
2015-08-19 08:01:12 -07:00
eric 3d923407e4 replace email support links with form 2015-08-18 11:03:49 -04:00
eric 148c2b1021 add notes about meta referrer 2015-08-18 09:53:51 -04:00
Raymond Yee d252199dec Merge branch 'master' into publisher-opds 2015-08-06 12:57:43 -07:00
eric 06c23db9cd that was an easy fix 2015-08-06 14:49:41 -04:00
eric 11cf5b2869 Merge branch 'master' into publisher-opds
Conflicts:
	api/urls.py
2015-08-06 13:39:16 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
eric f19a1551e4 add redirect for new users 2015-07-09 16:32:52 -04:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee e147b3fea6 Merge pull request #494 from Gluejar/catch_stk_timeouts
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
Raymond Yee 9ffb96559b rewrote the mock ebook to make the logic behind it clearer 2015-07-08 13:31:35 -07:00
Raymond Yee 685229ae4c Merge pull request #495 from Gluejar/fix_subjects_template
forgot about admin urls
2015-07-03 09:50:53 -07:00
eric 741763e8b6 handle connection timeout 2015-07-01 22:07:04 -04:00
eric df2706993d mock ebook for stk 2015-07-01 22:06:33 -04:00
eric 13093c9c4b forgot about admin urls
when updating url tag syntax
2015-07-01 20:57:25 -04:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
eric f1c74fe7da made search easier
when no local results, automatically invoke google books search
2015-06-07 18:55:49 -04:00
eric e6eaa24440 eliminate referrer leakage 2015-06-04 15:15:59 -04:00
Raymond Yee 90df82954e Merge pull request #491 from Gluejar/handle_bad_ebook_links
handle the bad link error  (Se test run locally -- so at the very least, this PR should not be destabilizing...will deploy and then test on some links.)
2015-06-03 07:24:03 -07:00
Raymond Yee 6ec36e001d adding a colon to error message
"Well, this is awkward our ebook link is bad" to "Well, this is awkward: our ebook link is bad"
2015-06-03 07:02:49 -07:00
eric 499b67d3e1 handle the bad link error 2015-06-02 23:45:30 -04:00
eric 15f6599331 reorder sections 2015-05-11 15:46:17 -04:00
eric afbe8ced90 edits 2015-05-11 11:35:44 -04:00
eric dda48c1161 opinionated rewrite 2015-05-08 13:22:25 -04:00
eric 4272c8ddb2 update welcome message 2015-05-06 16:14:13 -04:00
eric 07cfe361b2 add yahoo signin 2015-05-06 16:13:55 -04:00
eric 266378b7ed fix dotted url names 2015-04-28 14:13:18 -04:00
eric 877eac1af2 stray file? 2015-04-27 23:24:19 -04:00
eric 29108128a5 global change url syntax 2015-04-27 23:24:02 -04:00
Raymond Yee fe6d880957 Merge pull request #477 from Gluejar/view_as_plain
View as plain
2015-04-17 13:57:47 -07:00
Raymond Yee f676d116aa Merge pull request #476 from Gluejar/purchase_button
fix exception when no radio
2015-04-17 13:36:39 -07:00
Raymond Yee 46574801f7 I think now we have a Facebook profile link that works for both the global Facebook user ids and app scoped user ids. 2015-04-17 11:15:07 -07:00
eric 43ff601def I was in a hurry 2015-04-17 13:00:26 -04:00
eric bc16323652 fix profile link 2015-04-17 12:37:44 -04:00