Commit Graph

2660 Commits (e623f6d31f0a2a5657f3a1b80aded8e40ab82c01)

Author SHA1 Message Date
eric 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
eric 5644d0ea37 add "view_as parameter" 2015-04-11 08:25:41 -04:00
eric e87294d442 twitter and facebook settings 2015-04-09 11:44:48 -04:00
eric db457a948f fixed user menu, bootstrapized learn more 2015-04-09 09:21:59 -04:00
eric 9e24dfaf7d change all signin buttons to bootstrap buttons 2015-04-08 23:32:36 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
eric 27af1780ab month summary was including previous year 2015-03-31 13:51:22 -04:00
eric 78c2bb2dfc add free count 2015-03-31 13:50:39 -04:00
Raymond Yee 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
Raymond Yee 8c7d99c8d7 Merge pull request #468 from Gluejar/subject_mapping
add keyword mapping
2015-03-19 10:37:05 -07:00
Raymond Yee afb6885572 added comment line with example for subject/onto_subject 2015-03-19 10:34:26 -07:00
Raymond Yee 9d2b343c74 Merge branch 'google_books_button' of github.com:Gluejar/regluit into google_books_button 2015-03-18 11:36:49 -07:00
eric 8ac6d03723 off by one error 2015-03-18 14:34:58 -04:00
Raymond Yee eb034013eb Merge branch 'master' into google_books_button 2015-03-18 11:20:28 -07:00
eric e76bb39069 add case for correct user already has redeemed 2015-03-17 22:11:55 -04:00
eric 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
eric 576eb6d872 add keyword mapping 2015-03-12 11:58:49 -04:00
eric 3bdec13270 display ebook errors for first ebook 2015-03-10 14:19:05 -04:00
eric c3896b70d4 allow ebook creation without filesize 2015-03-10 14:18:34 -04:00
Raymond Yee 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
Raymond Yee 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
Raymond Yee 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
eric 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
eric 351b9df768 add link that triggers the Google Books search 2015-03-06 17:28:21 -05:00
eric c442861322 fix javascript bugs 2015-03-06 17:00:07 -05:00
eric a444055912 inline endless scroll for better performance 2015-03-06 16:59:20 -05:00
eric 355e50b297 update news link 2015-03-06 16:32:21 -05:00
eric 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
eric 5057820f30 update for mac yosemite 2015-03-05 22:26:25 -05:00
eric 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
eric f05b276118 provide a title that's kindle-safe 2015-03-03 17:39:23 -05:00
Raymond Yee 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
Raymond Yee 2390c322a4 Merge pull request #458 from Gluejar/email_message
sharing issues [fix #88552056][fix #88631150]
2015-02-25 11:19:26 -08:00
eric 84227748db add inactive download counts in rh tools 2015-02-23 16:52:55 -05:00
eric 1c549173f4 vanish scroll down on scroll, leave more space for list 2015-02-19 14:09:13 -05:00
eric cb8fc2feec add scroll-down hint 2015-02-19 12:03:42 -05:00
eric 11b9d5da3e make widget work with work ids 2015-02-18 13:09:43 -05:00
eric 53ecbfcb5f DRY for safe_get_work 2015-02-18 12:47:19 -05:00
eric 06dcebc3be stop using first_ebook where it means is_free 2015-02-17 17:06:10 -05:00
eric 386d541acc share email message now considers is_free 2015-02-17 16:59:51 -05:00
eric b467c185eb improve test coverage 2015-02-12 13:37:51 -05:00
eric 97fc3f9322 remove most google books branding 2015-02-12 10:00:01 -05:00
eric 23099a0b21 search now looks at all the free books 2015-02-12 09:46:58 -05:00
eric 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
eric bff7866b67 change work title when edition is selected 2015-01-29 14:19:02 -05:00
Raymond Yee 32ec6b0a03 Merge pull request #449 from Gluejar/improve_gifts
Improve gifts
2015-01-28 11:59:27 -08:00
Raymond Yee 6f43bef7b5 fix small stylistic issues in notices for purchase_notgotgift 2015-01-28 11:48:28 -08:00
eric 269fe21706 add link to subject admin 2015-01-26 14:46:51 -05:00
eric a422022499 add list of works needing keywords 2015-01-26 14:46:37 -05:00
eric ea5adba871 add notifications for unredeemed gifts 2015-01-23 13:11:19 -05:00
eric 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
eric 42d85d0ef8 make sure campaign success doesn't wipe description 2015-01-19 17:30:49 -05:00
eric 5634e37b33 about rights
The message we were send was unclear
2015-01-19 17:21:16 -05:00
eric 551ea0e423 show add-keywords even if there are no keywords 2015-01-16 08:57:08 -05:00
eric 073040d7ca add keywords! 2015-01-15 14:34:43 -05:00
eric 4f0cc87b48 temp add kw 2015-01-14 15:07:54 -05:00
eric a5c38d9354 subject deletion 2015-01-12 20:24:32 -05:00
eric bbcad0a7e2 add delete button style 2015-01-12 20:20:52 -05:00
eric 62daa67880 coming together! (needs migration) 2015-01-09 17:05:34 -05:00
eric ad2017e054 update press page 2015-01-02 00:33:32 -05:00
eric 56d0020839 update news item 2014-12-30 11:23:35 -05:00
eric f77ef95a64 prevent self-redemption 2014-12-22 18:08:13 -05:00
eric 2db4516505 rip out useless code 2014-12-22 14:24:49 -05:00
eric fb878094d1 new test for established user 2014-12-22 14:21:40 -05:00
eric c060ae17e0 Put a gift note in the ebook 2014-12-22 08:22:34 -05:00
eric ae208286f0 handle case of double gifts
also make gift redemption experience uniform
2014-12-21 16:02:02 -05:00
eric 220d2871c1 display gift status instead of "Purchased!" 2014-12-20 13:03:20 -05:00
eric b01562b630 Properly handle gifts to existing users 2014-12-20 12:47:15 -05:00
eric 24f1686aec nit 2014-12-19 15:15:36 -05:00
eric f18acfc091 notify the giver when the gift is redeemed
migration needed
2014-12-19 15:13:54 -05:00
eric e9a708bd9a add faq 2014-12-19 14:24:17 -05:00
eric 09994ee1fc fix missing site 2014-12-18 18:10:04 -05:00
eric 2c44a29aa7 regifting 2014-12-18 13:37:28 -05:00
eric c2b170c801 the password prompt now works 2014-12-18 11:41:06 -05:00
eric 1c651f2458 everything more or less works except resifting 2014-12-18 01:07:59 -05:00
eric 3182078ac9 more cents untruncation 2014-12-17 23:43:53 -05:00
eric 05b5031784 improved pledge failed 2014-12-17 23:42:37 -05:00
eric 12877dada9 untruncated the cents 2014-12-17 12:50:23 -05:00
eric 41163d81a2 purchase and provisioning the gift 2014-12-16 14:18:51 -05:00
eric 7b5174aca6 ui and model for buy as a gift 2014-12-15 00:56:08 -05:00
eric cdfe5d99d6 add is_free annotations on subject lists 2014-12-14 10:28:58 -05:00
eric be0ab46872 use is_free in query sets 2014-12-14 10:00:10 -05:00
Raymond Yee 19dd7eadcb Merge pull request #425 from Gluejar/opds_facets
Opds facets [deliver #82001456]
2014-12-12 11:42:04 -08:00
eric cdeb13abb5 remove facet group heading when no facets 2014-12-11 16:50:06 -05:00
eric 8cd130d98a add link to unglue.it admin 2014-12-11 12:16:02 -05:00
eric 44f3fadb49 use wish list apparatus to set keywords 2014-12-10 23:27:49 -05:00
eric 7ddaa7174d link subjects page to facets. 2014-12-10 19:29:27 -05:00
eric 7a2a05c421 allow facets to have spaces 2014-12-10 17:45:19 -05:00
eric 8c9bccc1f0 keyword facets!
for example, /free/kw.Fiction/
2014-12-10 17:14:28 -05:00
eric 27dfe6e9e9 add autodiscovery 2014-12-06 15:07:19 -05:00
eric 70d4506365 move path parsing to facets 2014-12-05 18:36:45 -05:00
eric 75fab489f1 fix display of license url, title and labels 2014-12-03 13:18:29 -05:00
eric f86da03eef added tests 2014-12-03 11:47:59 -05:00
eric af83e6a8c0 Rip out CCList, replace with facets 2014-12-03 10:15:38 -05:00
eric 2f37d1d670 restyle the refine box 2014-12-02 21:56:45 -05:00
eric 8e23f937f8 auto generate refine box 2014-12-02 16:09:30 -05:00
eric 8194d3b7cb Make Facet headers look right 2014-12-02 00:10:55 -05:00
eric eefcee6f32 Merge branch 'master' into facets 2014-12-01 16:08:12 -05:00
eric 7913b7e38c wired license facet block 2014-12-01 16:07:41 -05:00
eric c4649b2d58 fix bugs in editions management auth 2014-11-28 11:12:29 -05:00
eric a7c9c5a6d7 add license art libre
Also fixed a mistake that left gfdl off of the ebook choices list.
correct spelling is "license art libre"
2014-11-23 16:44:59 -05:00
Raymond Yee a0e439db33 Merge pull request #417 from Gluejar/more_info
track more stuff:  Se tests run ok
2014-11-21 11:19:43 -08:00
eric c87004122d add GDFL to campaign choices
needed for framasoft translation of a Stallman book
2014-11-20 21:34:19 -05:00
eric 20cf22da8f add facet descriptions. 2014-11-20 21:11:15 -05:00
eric 31ca43de55 track more stuff 2014-11-19 16:03:21 -05:00
eric b04768acb2 improve styling of sort links 2014-11-18 21:54:47 -05:00
eric 5dd1d836fb add sorting 2014-11-18 16:54:19 -05:00
eric 9aa6d0c78c Merge branch 'master' into facets 2014-11-18 13:33:51 -05:00
eric 591f06a267 first pass at faceted search 2014-11-18 13:33:17 -05:00
eric 7e1c5eeec9 add github and wikibooks to allowed ebook sources 2014-11-17 11:51:36 -05:00
Raymond Yee db969f859d Merge pull request #412 from Gluejar/privacy
I will do the merge to test the dropbox functionality on just.
2014-11-14 14:43:27 -08:00
eric 3a465cf074 dash in hostname is not an edge case 2014-11-13 10:19:53 -05:00
eric bca0864d6b update news link 2014-11-11 00:39:07 -05:00
eric 080dde1dd0 might as well go all the way on avatar privacy
for download page only
2014-11-10 13:40:25 -05:00
eric 72f066ed73 self-host drm-free 2014-11-10 12:31:36 -05:00
eric 5a095c6110 self-host dropbox assets 2014-11-10 12:27:57 -05:00
eric 547adfea56 Change default avatar to one with more privacy
using a user's email in the gravatar hash can connect their account to
other sites. Stop doing this as default for new users.
2014-11-07 14:47:12 -05:00
eric 3c295a016a no need to invoke twitter tracker 2014-11-07 14:27:49 -05:00
eric e41dd676c8 add stub record indicator 2014-11-03 16:29:36 -05:00
eric c711747916 show marc download for b2u 2014-11-03 16:06:25 -05:00
eric fc261b0830 better descriptions 2014-11-03 15:22:53 -05:00
Raymond Yee a666427497 Merge pull request #404 from Gluejar/marc_package
Marc package
2014-10-31 12:55:46 -07:00
eric f9b785e69e fix user pref display
also add link to librarian settings
2014-10-31 13:52:19 -04:00
eric fafd37a973 Merge branch 'master' into marc_package
Conflicts:
	core/marc.py
	static/css/campaign2.css
2014-10-30 12:38:53 -04:00
eric 97e3260c2b [#29780355] no Why unglue this? if unglued 2014-10-29 15:41:51 -04:00
eric 5c23d888c7 always show GR, LT links 2014-10-29 15:21:06 -04:00
eric c5bb7220f2 don't link cover to google books if own cover 2014-10-29 15:18:32 -04:00
eric fa8f03eb0a pass tests 2014-10-27 20:11:23 -04:00
eric d0e305cfec rip out code 2014-10-27 19:11:44 -04:00
eric e1409ceac1 redo marc file upload 2014-10-27 16:57:35 -04:00
eric 3b4b836e6c add marc download tools 2014-10-27 11:55:46 -04:00
Raymond Yee 78ddf22c18 Merge branch 'master' into stub-marc 2014-10-22 02:04:00 +00:00
eric 892b970ae1 can download all records 2014-10-20 23:30:20 -04:00
eric 2feda33c4f records now served out of db 2014-10-20 16:57:46 -04:00
eric a5d3dfdf4f add_author method 2014-10-20 16:54:19 -04:00
eric be294aa8f0 Merge branch 'master' into stub-marc 2014-10-17 11:36:35 -04:00
eric fbe96bcfc7 basic stub records 2014-10-14 10:08:08 -04:00
Raymond Yee 08e1806db2 As suggested by Eric, we'll use a regex from https://mathiasbynens.be/demo/url-regex,
specifically the one by @imme_emosol
2014-10-13 16:21:30 -07:00
Raymond Yee 73435e399c Merge branch 'master' into allow-http-id 2014-10-09 15:21:34 -07:00
eric 05aea1b40b stop rounding the date! 2014-10-09 14:33:53 -04:00
eric 93c9b696b2 Allow staff to enter books with an http id
I'm finding LOTS of books that don't have ISBN or OCLCnum
2014-10-08 16:23:24 -04:00
eric ef6c4a659e ebook files activate and deactivate
when manager unselects 'add_ask', the system didn't revert to the files
without added ask. This fixes that. To test, toggle the add_ask
checkbox and save campaign.
2014-10-04 16:51:16 -04:00
Raymond Yee 0ddbdbc944 Merge pull request #384 from Gluejar/fix_optional_token
Fix optional token
2014-09-29 13:22:49 -07:00
Raymond Yee a02463c117 Merge pull request #388 from Gluejar/fix-inactive-ebooks
let ebook go to default
2014-09-29 11:44:12 -07:00
eric 5a6582ae66 let ebook go to default 2014-09-26 10:40:20 -04:00
eric cd162905fa fix the data instead of complaining 2014-09-25 13:32:01 -04:00
eshellman 2223446f36 Merge pull request #386 from Gluejar/pdf_ask
Insert Pdf/epub ask into served files [Take 2]
2014-09-17 04:48:46 -04:00
eric 93bba18b79 Merge branch 'master' into fix_optional_token 2014-09-13 16:24:22 -04:00
eric b72e0a1fe1 made a form that doesn't have Stripe Token 2014-09-13 16:19:47 -04:00
eric 9ae4ce42da this is even more correct, and the tests pass 2014-09-12 10:21:06 -04:00
eric 28434b06a1 now do the same for epubs 2014-09-05 16:35:57 -04:00
eric 30e50260a3 make ebooks when new files are uploaded, clean up old
the download bits are suppressed when the ask comes from the pdf
seems we weren't making new ebooks when new files were uploaded
old ebooks now deactivated so we don't loase download counts and history
add ask to pdf is triggered by file upload or THANKS campaign save
2014-09-04 18:33:20 -04:00
eric 8d71f65351 update landing page news 2014-08-30 13:38:53 -04:00
eric 8ce1550ea2 [fix #77927246] CCForm really should require a token
I think forms were still mysterious to me when I made it not required.
I think I set it to not required because I didn't know how to keep it
from reporting an error on initial render.
Need to make sure nothing else depends on allowing null stripe token
2014-08-30 13:28:13 -04:00
eric 40831b6161 incorporate add_ask into campaign management 2014-08-30 12:04:50 -04:00
eric 73c616092d campaign.add_ask_to_ebfs for pdfs 2014-08-28 15:29:41 -04:00
Raymond Yee 7b7c050fb2 Merge pull request #379 from Gluejar/edition_errata
Edition editing errata
2014-08-13 22:30:49 -07:00
Raymond Yee edb769317d Merge pull request #375 from Gluejar/new_campaign_options
no contrib form if the ask is all zero
2014-08-07 15:58:22 -07:00
eric ff7ffdf4e1 just get rid of the silly status icon 2014-08-06 17:44:11 -04:00
eric 5a2a3e60b6 add PD and GDFL to license choices; add pd-us
also all make list display facets for PD-US and GDFL; don't expose them
until we have content we like in them
2014-08-06 17:14:09 -04:00
eric 229301d4df add "feature this" to edit tools 2014-08-06 15:59:57 -04:00
eric 8f3957dc14 allow blank ISBN
version in production throws invalid isbn exception
made sure you can't delete an id if the edition is left id-les
fixed bug where using an existing id omits admin setting
2014-08-06 10:59:16 -04:00
eric 74e98b37c2 download button causes a fave
also adjusted "latest ungluing" to be less-creepy; only explicit faves
are reported
2014-07-28 18:22:26 -04:00
Raymond Yee ff1eb6ef0e Merge pull request #371 from Gluejar/opds_2
Opds 2
2014-07-25 14:17:27 -07:00
eric aa84366418 no contrib form if the ask is all zero 2014-07-25 14:43:54 -04:00
eric 8642a9d7ca update news 2014-07-24 15:25:33 -04:00
eric 0971a8c7ba corrected the label 2014-07-24 15:22:26 -04:00
eric 81e5b28a32 make the description edit note context sensitive 2014-07-24 15:20:59 -04:00
eric fa2c50dfea there's no publisher in edition edit form 2014-07-24 15:17:36 -04:00
eric 3d7b56248d fix bad html 2014-07-24 15:01:29 -04:00
eric 632b7efdc8 set width of publisher logo 2014-07-24 14:57:14 -04:00
Raymond Yee 5a5b47b180 Also catch Transaction.DoesNotExist in FundCompleteView 2014-07-23 10:07:49 -07:00
eric 7377063b2c catch the exception actually thrown by bad tie
pass transaction on the object; not in context (style only)
move the redirect logic into get
2014-07-22 16:27:55 -04:00
eric 2aed378814 fix the root problem 2014-07-22 16:20:44 -04:00
Raymond Yee 3d2980f9a1 make pledge complete page more forgiving 2014-07-21 17:37:28 -07:00
eric 6aa3e458ea move opds to api
and simplify code.
view no longer passing site and protocol to opds methods
facets now in a list
url adds /api/ in front
2014-07-16 16:47:32 -07:00
Raymond Yee 776f343fd7 forgot to add opds.xml 2014-07-11 15:13:09 -07:00
Raymond Yee 806e24dc80 Merge pull request #367 from Gluejar/OPDS
Opds
2014-07-11 14:13:13 -07:00
Raymond Yee 1a40583a44 Merge pull request #369 from Gluejar/isbn_input
isbn input now accepts dashes and isbn10, fixes bad check digits
2014-07-10 13:03:52 -07:00
Raymond Yee 84a102c640 Merge pull request #368 from Gluejar/featured_ebook
Featured ebook
2014-07-09 10:19:01 -07:00
Raymond Yee 3cdae2d6bb Merge pull request #366 from Gluejar/improve_rh_experience
Improve rh experience
2014-07-08 13:32:18 -07:00
Raymond Yee e216728ab8 campaigns -> campaign(s) in case only 1 campaign. 2014-07-08 13:28:49 -07:00
eric 21ac432d09 isbn input now accepts dashes and isbn10, fixes bad check digits 2014-07-04 20:29:42 -04:00
eric 9e98651039 improve open campaign UI 2014-07-03 21:36:52 -04:00
eric 461321c0bb Added dynamic contents to assist in navigation 2014-07-03 21:20:36 -04:00
eric 908bb7974f make the rest of the checklist dynamic 2014-07-03 21:07:50 -04:00
eric 77a4ef1c09 address "opening a campaign" comments
"hastens" isn't quite right; adding a tooltip to the delete function
would require mucking with django-selectable, and that will take more
time than its worth.
2014-07-03 20:26:36 -04:00
eric 6a9c89efb2 no more creencasts in rh tools
they were out of date; the embed instructions are still in faq
2014-07-03 20:05:47 -04:00
eric c105b0839d fix test 2014-07-03 16:36:36 -04:00
eric bf61227429 Add featured book to landing page 2014-07-03 15:43:49 -04:00
eric 773b6a0912 simple admin interface for featured 2014-07-01 14:09:21 -04:00
eric bc7850a2a9 add featured column, use it 2014-07-01 10:07:07 -07:00
Raymond Yee b356699c9b First pass at /opds/{facet} --> now with active_campaigns too 2014-06-25 18:05:57 -07:00
Raymond Yee 49133935a0 First draft of opds/creativecommons.xml 2014-06-24 15:27:40 -07:00
Raymond Yee e3f32da12b Put framework for both the navigation and crawlable feeds 2014-06-20 16:53:25 -04:00
eric 0b918fabe0 notice changed to reflect that we're not checking each claim 2014-06-20 15:39:20 -04:00
eric 420cbdf448 send rh to rh page after claiming work 2014-06-20 15:37:23 -04:00
eric 6cb8daf1b4 clean up instruction on rh tools page 2014-06-20 15:30:46 -04:00
eric eeb018df4f show pricing in buy-2-unglue panel view 2014-06-17 14:39:16 -04:00
eric d3e21944b0 uniform display of pice, with cents 2014-06-17 12:21:22 -04:00