Commit Graph

811 Commits (c713f790b9deeb2b9995c8774c55c829b63051dc)

Author SHA1 Message Date
Raymond Yee 5ee4f7c4df Merge pull request #335 from Gluejar/improve_lists
Improve lists and landing page for launch
2014-04-29 18:01:27 -07:00
eric 958d963f75 add campaign list for each campaign type 2014-04-29 20:03:33 -04:00
eric 6e034c58e0 unclutter the bottom of the landing page 2014-04-29 16:16:00 -04:00
eric 59997cfda1 reset selected edition on campaign save 2014-04-29 14:51:49 -04:00
eric 2ee1a1d34d one more thing - indicate that download page is missing ebook links 2014-04-28 15:14:46 -04:00
eric 1c783f2e4a make sure goal is retotled when campaign is modified 2014-04-09 15:02:25 -04:00
eric c2fae4c16f fix the calculator- it was broken 2014-04-09 14:32:25 -04:00
eric 1d12fbf74d kwarg, not arg 2014-04-07 12:17:21 -04:00
eric d2cca9ff93 look before leaping 2014-03-21 09:49:49 -04:00
eric 9122be280b OMG I broke the downloads 2014-03-20 09:23:17 -04:00
eric 5661377207 if library supports t4u book, members of library don't see the ask
instead they see “your library has supported this free ebook!
2014-03-18 22:30:21 -04:00
eric f7fea1874e wish list was not getting set because of vestigial transaction type check
[fix #67399604]
2014-03-14 13:04:11 -04:00
eric b8409a815b forgot to set status in new_edition 2014-03-12 19:32:56 -04:00
eric fd896c8916 Merge branch 'improve_t4u_campaign' into improve_editions 2014-03-12 18:08:54 -04:00
eric d2dd926f80 let campaign manager edit work description in campaign management
also, revise documentation for campaigns
2014-03-12 18:03:50 -04:00
eric d49925d26c errata
1. distinguish title for editions page
2. reset earliest_publication on save new edition
2014-03-12 12:54:32 -04:00
eric cce7c43d8f revamp edition display and editing
1. created editions display view (work(action=editions))
2. moved split function to new editions page (staff only)
3. added edition selector (staff only)
4. moved ebook link addition to edit edition page
5. standard work display shows only 10 newest editions (much faster!)
6. campaign managers should be able to edit editions
7. ebook links can’t be added when there’s a campaign.
8. more room for edition description editing
2014-03-11 17:34:27 -04:00
eric 58b664bc2b fix bug when creating new edition 2014-03-07 16:58:53 -05:00
eric db6648cc07 edition editor can now delete authors [#66337430] 2014-03-07 16:42:57 -05:00
Raymond Yee 38764a12d3 Merge pull request #302 from Gluejar/add_marvin
Add marvin, update ibooks, readmill instructions
2014-03-05 19:47:41 -08:00
eric 7fba1a212b Give more prominence to CC books on landing page 2014-03-05 14:02:12 -05:00
eric 4d0d42f5ae the request for money is only shown if the campaign is active, or in test mode 2014-03-04 15:49:59 -05:00
Raymond Yee 54cd6a42c6 Merge branch 't4u_download' into add_marvin 2014-03-03 11:37:25 -08:00
Raymond Yee 256c60fbfc Merge branch 'master' into t4u_download
Conflicts:
	core/models.py
2014-03-03 11:08:50 -08:00
Raymond Yee c292a6b3be Merge branch 'master' into add_marvin 2014-02-25 19:32:31 -08:00
Raymond Yee ae531e0d7d Merge branch 'master' into t4u_download 2014-02-25 19:10:01 -08:00
eric ccafd90625 Add ebookfile status and links to info page. 2014-02-25 14:47:16 -05:00
eric e72f55f919 it turns out that offer editing didn't quite work 2014-02-25 14:29:54 -05:00
eric bd829aff25 On reflection, files_reviewed was a bad idea 2014-02-25 12:54:14 -05:00
Raymond Yee 7fda4abd1c Merge branch 'master' into unglued_b2u_mobi 2014-02-24 14:44:13 -08:00
eric acfeb35c39 added an image of Facebook embedded browser in iPhone iOS7
we should probably be looking as adding iPhone stylesheets, but…
2014-02-24 17:18:05 -05:00
eric cc0f5d9fdb update for marvin, mavericks, read mill on android
for mavericks- ibooks should be pre-installed.
Readmill now available on Android.
Marvin is linking to us, we’re reciprocating
2014-02-24 16:58:16 -05:00
Raymond Yee 5547a54332 Merge branch 'master' into better_sendtokindle 2014-02-24 10:30:24 -08:00
eric 1c9c953e30 fix email notice 2014-02-21 15:23:56 -05:00
eric 665fd94e73 decrudify and update emailshare 2014-02-21 14:12:20 -05:00
eric e66c54e3dc fix test failures 2014-02-21 13:16:55 -05:00
eric e8dc4121fa show beg always with an offer id; auto set the price for libraries 2014-02-20 16:53:30 -05:00
eric 678eb02847 Thanks works with anonymous user 2014-02-20 15:56:10 -05:00
eric b5fd630bfc Thanks mostly works. 2014-02-19 22:18:23 -05:00
eric 9a4ebe135a improved send-to-kindle
reworded instructions when file is too big
reworded sen-to-kindle promise
removed daft view invoked by redirect so context can be passed
2014-02-08 18:32:11 -05:00
eric a4488c45ce make campaign creation really work the way it should
Problem was that rh_tools forms were not being updated correctly after
creating a campaign.
2014-02-08 15:29:27 -05:00
eric f0bf0a266d set the rh as the default campaign manager
Users had difficulty figuring out how to add themselves
2014-02-08 14:05:18 -05:00
eric 234982796e improve unglue.it iadmin
move accepted rh and claims to their own pages
2014-02-08 13:28:52 -05:00
eric 87387baa32 add file review requirement for b2u and t4u campaigns
migration needed!
2014-02-05 19:33:55 -05:00
eric fe931c7835 uploader now generates mobi for unglued b2u files 2014-02-05 17:02:21 -05:00
eric ba3c85d8ac Merge branch 'master' into t4u_file_upload 2014-02-04 13:14:20 -05:00
Raymond Yee b5eccac247 make use of default_storage.url to get URL for cover 2014-02-01 15:47:37 -08:00
eric ca4471ff55 added cover upload 2014-01-30 23:16:06 -05:00
eric 3bfbbd7653 Merge branch 'master' into t4u_file_upload 2014-01-30 11:53:20 -05:00
eric b3465ea084 search code for dependence on deadline being not null 2014-01-15 17:59:45 -05:00
eric 66ca501327 temp commit 2014-01-15 08:32:55 -05:00
eric 40aa1ba79e finished, I think, with t4u public documentation (except contrib page) 2014-01-05 20:43:18 -05:00
eric b8c7b8afa7 add a page that lets rhs see the premiums earned by ungluers 2013-12-30 21:51:32 -05:00
eric 706a0d1fc6 A list just for creative commons 2013-12-25 19:38:18 -05:00
eric e51c3ad106 this list was just duplicating the unglued list 2013-12-25 19:37:54 -05:00
Raymond Yee eb416e75dd Merge branch 'master' into switch_watermarking 2013-12-19 18:02:43 -05:00
eric 4927801a77 fix bug in OpenCampaign
I had added a prefix to this form, neglected thorough testing, did
better testing this time.
2013-12-18 13:02:57 -05:00
Raymond Yee 0d28fbab7e Merge branch 'master' into ban_disposable_emails 2013-12-18 08:54:11 -08:00
eric b9c54ead8b deny registration to robots that try to search for the registration page. 2013-12-16 16:27:19 -05:00
eric 40e611bac5 revive the gift/donation credit funtionality, at least for b2u campaigns
The reason for doing this is so a library can put in money with one
check, then use it up gradually. (we get to pocket the fees that would
go to stripe) One change here- in b2u there is an extra click to get to
download page, even if no gift credit is involved - this way the user
knows what and how he's bee charged
2013-12-15 00:31:06 -05:00
eric 223c005b86 simplify and update slideshow 2013-12-14 13:24:29 -05:00
eric 2892a22824 change terminology from "donation" to "gift" 2013-12-13 15:15:35 -05:00
eric efea7d0198 on success, add a cc license, watermark (and generate mobi), and save 2013-11-14 23:16:55 -05:00
eric c6edd83884 Merge branch 'master' into b2u_ungluify 2013-11-14 14:58:22 -05:00
eric 5d4539b305 enable ebookfile download and secure ebookfile storage 2013-11-14 14:48:16 -05:00
eric 8bb514a401 somehow the "borrow" function wasn't tested in "reserves" 2013-11-12 17:28:07 -05:00
eric 00693f7a23 Merge branch 'master' into reserves
Conflicts:
	core/models.py
2013-11-08 16:07:29 -05:00
eric 0840a1fd71 implement holds. Also fix borrow view that didn't specify work. 2013-11-08 12:13:34 -05:00
eric 275f299f81 campaign setup cleanup: was broken when more than one claim existed 2013-11-07 13:35:35 -05:00
eric e6692f7932 This was causing reserved licenses to be immediately borrowed 2013-11-07 13:32:00 -05:00
eric 499378ccf7 improve bad epub error handling 2013-11-05 00:57:15 -05:00
eric dd84c36418 subsume calculator view into faq view 2013-11-03 00:27:52 -04:00
eric b5db02e1d0 incorporate AM suggestions into FAQs 2013-11-03 00:07:52 -04:00
eric 143b24c368 acquired ebooks failed to show if wishlist empty [#59972462]
some complicated interaction with wishlists because this template
copies a user's
2013-11-01 14:33:52 -04:00
eric 53d9f2c8be library ungluer list is library members 2013-10-19 21:01:10 -04:00
eric 6e7344d8a4 and now, you can borrow a library book! yay! 2013-10-18 15:35:48 -04:00
eric 60cd2f626b borrowability reflected on work page 2013-10-18 13:33:47 -04:00
eric 93d128102e display of borrowability and library holdings
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
eric 6910f1aa0c cleanup of supporter view 2013-10-17 12:44:47 -04:00
eric b9b5f9e389 download changes a reserve to a borrow 2013-10-16 22:53:47 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 99c7b73d4a purchase page reflects library membership and purchased status 2013-10-14 22:51:48 -04:00
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric d99aaa97c9 card number authentication!
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
eric 439169a1ab Implemented IP authentication
libraries get associated with a library_block table (IP ranges)
moved superlogin here
IP stuff mostly copied from
https://github.com/benliles/django-ipauth/blob/master/ipauth/models.py
The model is that you need to be in an allowed IP range to "join" a
library. Once you've joined, you can use your login from anywhere. to
use that library.
Asign IP ranges in admin
2013-10-08 15:37:22 -04:00
eric 2f703a7815 Merge branch 'master' into add_libraries 2013-10-07 12:35:55 -04:00
eric ec7a3155b2 exclude incomplete transactions from event display on landing page 2013-10-05 11:41:12 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric ab473f5411 libraries, phase 1.
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric be711e142d cleaned up marc file storage issues before implementing b2u
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
eric 2e58255e6c readmill downloads can't have mixed redirects 2013-09-11 11:31:20 -04:00
eric 4038ea53e7 fix Kindle_config 404 2013-09-09 15:48:27 -04:00
eric 4509cea6dd only 2 o's in ebook 2013-09-09 15:20:58 -04:00
eric 63f0ee3794 Remove pledge form error when campaign is not active. [#56565596] 2013-09-09 09:54:16 -04:00
eric 6294c15aad TGFT 2013-09-06 00:14:06 -04:00
eric b801eb4927 add acq handling to download
needs migration. should migrate core back to 0052 to refresh acq table

download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
eric 5bb359fb1e safe_get_work not used everywhere it should have been 2013-09-05 16:14:51 -04:00
eric 0ba5c9a00e cleanup, plus tests 2013-08-27 18:03:35 -04:00
eric e51fa1190e wired watermarker into file uploads. migration needed 2013-08-26 23:56:01 -04:00