5d50e85fd8
Merge pull request #593 from Gluejar/more-survey
...
More survey improvements
2016-06-15 11:45:28 -10:00
bc5c7a383b
Merge pull request #590 from Gluejar/author-search
...
add link to author name [#25583953 ]
2016-06-15 09:17:26 -10:00
8c21a124b4
added to claim faq
2016-06-14 11:37:13 -04:00
2b091e28e7
redirect to next on survey completion
...
Also, tweak style on complete page.
2016-06-13 17:34:51 -04:00
3330677b47
display number of surveys completed
2016-06-13 14:32:29 -04:00
a189b0a8c2
add link to author name
2016-06-06 13:49:22 -04:00
9c59b701ed
Merge pull request #587 from Gluejar/fix-survey-runinfo
...
Improve survey app
2016-05-31 16:13:34 -07:00
4df440ae46
fix survey completion
2016-05-31 17:46:08 -04:00
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
a40160f191
quick display and creation of landings
2016-05-26 12:19:33 -04:00
959c5aa187
remove signin link
2016-05-25 11:53:29 -04:00
f3d30615bb
remove unused blocktrans
...
Must have been a django version change
2016-05-25 09:12:37 -04:00
bf220c5c6f
Merge branch 'master' into push
...
# Conflicts:
# settings/common.py
2016-05-20 16:44:13 -04:00
66c0d84029
add work.formats()
2016-05-16 16:43:03 -04:00
8f3efc95ad
update aldiko logo and add to iOS views
2016-05-12 11:02:57 -04:00
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
c5ee01df57
its the future!
2016-05-11 10:41:50 -04:00
240564e75b
remove template workaround for testing
2016-05-11 10:36:20 -04:00
f662920c2a
Merge branch 'master' into push
2016-05-10 17:33:54 -04:00
28291d436e
Merge branch 'master' into isbn-in-search
2016-05-10 17:32:45 -04:00
795364a86e
Decimal is imported as D
2016-05-10 11:27:24 -07:00
af7d0e867c
add isbn querey
...
if query is a valid isbn, then search on the identifier table
2016-05-09 21:48:23 -04:00
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
ba516cd08d
Merge branch 'master' into dj16
2016-05-04 13:52:25 -07:00
574854ec5a
Merge pull request #565 from Gluejar/add-questionnaire
...
add the questionnaire module
2016-04-29 09:57:00 -07:00
730c46c02a
Merge branch 'master' into dj16
2016-04-27 12:03:41 -04:00
cf64d43811
add the questionnaire module
2016-04-26 14:38:32 -04:00
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
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
20102ffc12
remove assumption that successful campaign is last
2016-04-25 14:56:17 -04:00
c5886e5584
allow thanks campaign after success
2016-04-23 17:55:01 -04:00
616e8b3c9d
Wordpress is magically HTTPS
2016-04-12 14:32:22 -04:00
ef62d59dd0
bugfix unrelated to 1.6
2016-04-09 13:26:05 -04:00
3949947277
unsafe value in session
2016-04-09 13:25:31 -04:00
bca17837a0
add fixtures in testcases
2016-04-09 13:21:12 -04:00
a4e9855b35
revert to older, patched Notification
2016-04-08 18:45:50 -04:00
7a952f09cf
patch form exclude syntax
2016-04-07 20:39:23 -04:00
356207bc5d
patch django.conf.urls.defaults
2016-04-07 20:38:53 -04:00
562be5f12d
patch django-notification
2016-04-07 20:37:54 -04:00
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
26520d92e6
Merge pull request #555 from Gluejar/fix-mobi-making
...
Fix mobi making
2016-03-30 17:26:06 -07:00
a72ac07dcf
add function to generate mobi from the active epub
2016-03-29 13:06:23 -04:00
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
dfb7422857
some SEO
2016-03-28 09:54:57 -04:00
a8ab510c61
set edition in initial
2016-03-25 23:37:32 -04:00
60bc236ab4
init mimetypes
2016-03-25 14:13:39 -04:00
bac02db88a
Merge pull request #540 from Gluejar/missing-work-title
...
fixed work title in templates
2015-12-19 15:32:17 -05:00
c662da6a32
Merge pull request #538 from Gluejar/fix-merge-ui
...
Fix merge ui
2015-12-19 15:04:09 -05:00
91d783d6e4
one more
2015-12-18 12:56:14 -05:00
a52f7a9ec5
fixed work title in templates
...
at some point we changed work.__unicode__ causing this issue
2015-12-18 12:53:12 -05:00
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
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
9086cd77ec
I little bug I recently noticed
2015-12-08 11:02:26 -05:00
a9d7608128
update last changed
2015-11-25 15:46:42 -05:00
1a21da11c1
update news link
2015-11-18 15:32:58 -05:00
67b6b6e954
errata for new edition editing
2015-11-18 10:04:01 -05:00
57f0d57c12
Merge pull request #530 from Gluejar/fix-new-subject
...
set the default
2015-11-17 14:23:49 -08:00
5544aeb70c
Merge pull request #531 from Gluejar/pubdate-range
...
Pubdate range
2015-11-17 13:56:59 -08:00
5eb74149c1
Update faq.html
...
'a a' -> 'a'
2015-11-17 08:16:05 -08:00
3387dfa118
change gluejar to Free Ebook Foundation
2015-11-16 15:07:21 -05:00
7b7d7cf174
Merge branch 'master' into pubdate-range
2015-11-16 11:06:21 -05:00
462ce137f0
set the default
2015-11-13 16:49:01 -05:00
457fc67045
use https for eric's blog
2015-10-27 17:08:19 -04:00
a13e04a5b7
forgot this
2015-10-05 19:29:07 -04:00
1ccdc144ba
display publication range
...
needs a migration
2015-10-05 19:17:16 -04:00
e7c2cf1b3a
add rich text editor
2015-09-21 16:54:53 -04:00
cf9e6f9104
fix add-edition
2015-09-21 16:42:46 -04:00
6f4a27d409
fix for non staff user
2015-09-21 16:19:31 -04:00
893d0c3c62
split edition edition from ebook submission
2015-09-21 16:07:41 -04:00
e20b58b656
fix when new edition
2015-09-21 15:08:51 -04:00
1e4177766b
Enable subject editing on editions
2015-09-21 15:01:45 -04:00
b5bae66f08
bisac adding now works
2015-09-21 13:01:27 -04:00
d4c2257511
Merge pull request #520 from Gluejar/onix-feed
...
Implement ONIX 3.0 feed
2015-08-28 21:57:18 -04:00
2b9793e2d6
tests, links and documentation
2015-08-27 15:23:52 -04:00
5f7b2997e1
Merge pull request #517 from Gluejar/booxtream-to-https
...
Booxtream to https
2015-08-26 14:04:06 -04:00
809ee36093
Merge pull request #516 from Gluejar/rejigger-home
...
include user faves on landing page
2015-08-25 19:38:59 -04:00
fb28d5b34f
unused import
2015-08-25 13:53:30 -04:00
ff39129674
include user faves on landing page
...
and stop redirecting / to supporter page
2015-08-24 10:27:39 -04:00
ea4e0c4c3f
tweak upload instructions
2015-08-22 12:04:40 -04:00
c34ffdd883
implement sorel-thumbnail
...
uses thumbnail for all non-google covers
2015-08-21 17:54:39 -04:00
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
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
3d923407e4
replace email support links with form
2015-08-18 11:03:49 -04:00
148c2b1021
add notes about meta referrer
2015-08-18 09:53:51 -04:00
d252199dec
Merge branch 'master' into publisher-opds
2015-08-06 12:57:43 -07:00
06c23db9cd
that was an easy fix
2015-08-06 14:49:41 -04:00
11cf5b2869
Merge branch 'master' into publisher-opds
...
Conflicts:
api/urls.py
2015-08-06 13:39:16 -04:00
cc21ac2edb
add publisher feed
...
but don't expose it
2015-08-03 16:58:02 -04:00
5185410825
get tests to pass
2015-07-28 09:41:55 -04:00
44cd1eb19b
add relation support to edition edit
2015-07-28 00:52:21 -04:00
7c31bb115e
fix authors.remove
2015-07-27 23:44:34 -04:00
e386dccb49
show non-author relations
2015-07-27 23:21:11 -04:00
7b3360b235
Merge pull request #497 from Gluejar/catch_stk_timeouts
...
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
f19a1551e4
add redirect for new users
2015-07-09 16:32:52 -04:00
449f38fe7d
move mock ebook class to acq
2015-07-09 15:08:16 -04:00
e147b3fea6
Merge pull request #494 from Gluejar/catch_stk_timeouts
...
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
9ffb96559b
rewrote the mock ebook to make the logic behind it clearer
2015-07-08 13:31:35 -07:00
685229ae4c
Merge pull request #495 from Gluejar/fix_subjects_template
...
forgot about admin urls
2015-07-03 09:50:53 -07:00
741763e8b6
handle connection timeout
2015-07-01 22:07:04 -04:00
df2706993d
mock ebook for stk
2015-07-01 22:06:33 -04:00
13093c9c4b
forgot about admin urls
...
when updating url tag syntax
2015-07-01 20:57:25 -04:00
153a582cf0
Merge pull request #484 from Gluejar/add_yahoo
...
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
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
f1c74fe7da
made search easier
...
when no local results, automatically invoke google books search
2015-06-07 18:55:49 -04:00
e6eaa24440
eliminate referrer leakage
2015-06-04 15:15:59 -04:00
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
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
499b67d3e1
handle the bad link error
2015-06-02 23:45:30 -04:00
15f6599331
reorder sections
2015-05-11 15:46:17 -04:00
afbe8ced90
edits
2015-05-11 11:35:44 -04:00
dda48c1161
opinionated rewrite
2015-05-08 13:22:25 -04:00
4272c8ddb2
update welcome message
2015-05-06 16:14:13 -04:00
07cfe361b2
add yahoo signin
2015-05-06 16:13:55 -04:00
266378b7ed
fix dotted url names
2015-04-28 14:13:18 -04:00
877eac1af2
stray file?
2015-04-27 23:24:19 -04:00
29108128a5
global change url syntax
2015-04-27 23:24:02 -04:00
fe6d880957
Merge pull request #477 from Gluejar/view_as_plain
...
View as plain
2015-04-17 13:57:47 -07:00
f676d116aa
Merge pull request #476 from Gluejar/purchase_button
...
fix exception when no radio
2015-04-17 13:36:39 -07:00
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
43ff601def
I was in a hurry
2015-04-17 13:00:26 -04:00
bc16323652
fix profile link
2015-04-17 12:37:44 -04:00
f7bfdfbbc4
fix exeption when no radio
...
The exception we've seen is caused by clicking purchase for b2u without
picking a radio button; before gifting there was always a button
checked.
2015-04-15 18:31:46 -04:00
5644d0ea37
add "view_as parameter"
2015-04-11 08:25:41 -04:00
e87294d442
twitter and facebook settings
2015-04-09 11:44:48 -04:00
db457a948f
fixed user menu, bootstrapized learn more
2015-04-09 09:21:59 -04:00
9e24dfaf7d
change all signin buttons to bootstrap buttons
2015-04-08 23:32:36 -04:00
a8cab6c0ae
get google oauth2 working
2015-04-07 22:55:30 -04:00
27af1780ab
month summary was including previous year
2015-03-31 13:51:22 -04:00
78c2bb2dfc
add free count
2015-03-31 13:50:39 -04:00
85d057eb7d
Merge pull request #469 from Gluejar/improve_redemption
...
add case for correct user already has redeemed
2015-03-19 10:41:31 -07:00
8c7d99c8d7
Merge pull request #468 from Gluejar/subject_mapping
...
add keyword mapping
2015-03-19 10:37:05 -07:00
afb6885572
added comment line with example for subject/onto_subject
2015-03-19 10:34:26 -07:00
9d2b343c74
Merge branch 'google_books_button' of github.com:Gluejar/regluit into google_books_button
2015-03-18 11:36:49 -07:00
8ac6d03723
off by one error
2015-03-18 14:34:58 -04:00
eb034013eb
Merge branch 'master' into google_books_button
2015-03-18 11:20:28 -07:00
e76bb39069
add case for correct user already has redeemed
2015-03-17 22:11:55 -04:00
519cad0083
add sanity check
...
usually you don't want to add a broad category to a small one
2015-03-12 12:25:03 -04:00
576eb6d872
add keyword mapping
2015-03-12 11:58:49 -04:00
3bdec13270
display ebook errors for first ebook
2015-03-10 14:19:05 -04:00
c3896b70d4
allow ebook creation without filesize
2015-03-10 14:18:34 -04:00
b0550999e1
incorporate changes from kindle safe title changes.
...
Merge branch 'master' into kindle_file_size
Conflicts:
frontend/views.py
2015-03-09 10:56:20 -07:00
c9fd007654
Merge pull request #461 from Gluejar/warn_kindle_address
...
flag kindle email addressed that don't contain "kindle" in them
2015-03-09 10:14:12 -07:00
387c8d43e2
Merge pull request #460 from Gluejar/fix_kindle_bugs
...
provide a title that's kindle-safe
2015-03-06 15:06:21 -08:00
8fd3e88622
don't need ungluer list for search
...
javascript was trying to download user avatars even when they're not in
the results
2015-03-06 17:35:16 -05:00
351b9df768
add link that triggers the Google Books search
2015-03-06 17:28:21 -05:00
c442861322
fix javascript bugs
2015-03-06 17:00:07 -05:00
a444055912
inline endless scroll for better performance
2015-03-06 16:59:20 -05:00
355e50b297
update news link
2015-03-06 16:32:21 -05:00
0c4550fe4a
save ebook file size on send_to_kindle
...
don't deal with booxtream (b2u) ebooks at a all, only deal with free
ebooks
2015-03-05 22:30:03 -05:00
5057820f30
update for mac yosemite
2015-03-05 22:26:25 -05:00
94d9571e25
flag kindle email addressed that don't contain "kindle" in them
...
only valid kindle addresses we've seen not in kindle.com domain are
kindle.cn. Wanted to allow other addresses just in case.
2015-03-05 17:35:55 -05:00
f05b276118
provide a title that's kindle-safe
2015-03-03 17:39:23 -05:00
9c4d609579
Merge pull request #459 from Gluejar/download-nits
...
add inactive download counts in rh tools [fix #88928040 ]
2015-02-25 11:21:08 -08:00
2390c322a4
Merge pull request #458 from Gluejar/email_message
...
sharing issues [fix #88552056 ][fix #88631150 ]
2015-02-25 11:19:26 -08:00
84227748db
add inactive download counts in rh tools
2015-02-23 16:52:55 -05:00
1c549173f4
vanish scroll down on scroll, leave more space for list
2015-02-19 14:09:13 -05:00
cb8fc2feec
add scroll-down hint
2015-02-19 12:03:42 -05:00
11b9d5da3e
make widget work with work ids
2015-02-18 13:09:43 -05:00
53ecbfcb5f
DRY for safe_get_work
2015-02-18 12:47:19 -05:00
06dcebc3be
stop using first_ebook where it means is_free
2015-02-17 17:06:10 -05:00
386d541acc
share email message now considers is_free
2015-02-17 16:59:51 -05:00
b467c185eb
improve test coverage
2015-02-12 13:37:51 -05:00
97fc3f9322
remove most google books branding
2015-02-12 10:00:01 -05:00
23099a0b21
search now looks at all the free books
2015-02-12 09:46:58 -05:00
f552fda1a7
set_featured should redirect to landing
...
the previous behavior caused some accidental re-featuring because the
url has an effect in addition to the display
2015-01-29 14:25:55 -05:00
bff7866b67
change work title when edition is selected
2015-01-29 14:19:02 -05:00
32ec6b0a03
Merge pull request #449 from Gluejar/improve_gifts
...
Improve gifts
2015-01-28 11:59:27 -08:00
6f43bef7b5
fix small stylistic issues in notices for purchase_notgotgift
2015-01-28 11:48:28 -08:00
269fe21706
add link to subject admin
2015-01-26 14:46:51 -05:00
a422022499
add list of works needing keywords
2015-01-26 14:46:37 -05:00
ea5adba871
add notifications for unredeemed gifts
2015-01-23 13:11:19 -05:00
bbeb2d2008
improve gift notifications
...
put line breaks in the html notices
try to make subject line less spammy
move ungluit description down in the email message
2015-01-23 13:09:58 -05:00
42d85d0ef8
make sure campaign success doesn't wipe description
2015-01-19 17:30:49 -05:00
5634e37b33
about rights
...
The message we were send was unclear
2015-01-19 17:21:16 -05:00
551ea0e423
show add-keywords even if there are no keywords
2015-01-16 08:57:08 -05:00
073040d7ca
add keywords!
2015-01-15 14:34:43 -05:00
4f0cc87b48
temp add kw
2015-01-14 15:07:54 -05:00
a5c38d9354
subject deletion
2015-01-12 20:24:32 -05:00
bbcad0a7e2
add delete button style
2015-01-12 20:20:52 -05:00
62daa67880
coming together! (needs migration)
2015-01-09 17:05:34 -05:00
ad2017e054
update press page
2015-01-02 00:33:32 -05:00
56d0020839
update news item
2014-12-30 11:23:35 -05:00
f77ef95a64
prevent self-redemption
2014-12-22 18:08:13 -05:00
2db4516505
rip out useless code
2014-12-22 14:24:49 -05:00
fb878094d1
new test for established user
2014-12-22 14:21:40 -05:00
c060ae17e0
Put a gift note in the ebook
2014-12-22 08:22:34 -05:00
ae208286f0
handle case of double gifts
...
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
220d2871c1
display gift status instead of "Purchased!"
2014-12-20 13:03:20 -05:00
b01562b630
Properly handle gifts to existing users
2014-12-20 12:47:15 -05:00
24f1686aec
nit
2014-12-19 15:15:36 -05:00
f18acfc091
notify the giver when the gift is redeemed
...
migration needed
2014-12-19 15:13:54 -05:00
e9a708bd9a
add faq
2014-12-19 14:24:17 -05:00
09994ee1fc
fix missing site
2014-12-18 18:10:04 -05:00
2c44a29aa7
regifting
2014-12-18 13:37:28 -05:00
c2b170c801
the password prompt now works
2014-12-18 11:41:06 -05:00
1c651f2458
everything more or less works except resifting
2014-12-18 01:07:59 -05:00
3182078ac9
more cents untruncation
2014-12-17 23:43:53 -05:00
05b5031784
improved pledge failed
2014-12-17 23:42:37 -05:00
12877dada9
untruncated the cents
2014-12-17 12:50:23 -05:00
41163d81a2
purchase and provisioning the gift
2014-12-16 14:18:51 -05:00
Raymond Yee
eric