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
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
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
ff1eb6ef0e
Merge pull request #371 from Gluejar/opds_2
...
Opds 2
2014-07-25 14:17:27 -07:00
5a5b47b180
Also catch Transaction.DoesNotExist in FundCompleteView
2014-07-23 10:07:49 -07:00
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
3d2980f9a1
make pledge complete page more forgiving
2014-07-21 17:37:28 -07:00
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
806e24dc80
Merge pull request #367 from Gluejar/OPDS
...
Opds
2014-07-11 14:13:13 -07:00
84a102c640
Merge pull request #368 from Gluejar/featured_ebook
...
Featured ebook
2014-07-09 10:19:01 -07:00
bf61227429
Add featured book to landing page
2014-07-03 15:43:49 -04:00
773b6a0912
simple admin interface for featured
2014-07-01 14:09:21 -04:00
bc7850a2a9
add featured column, use it
2014-07-01 10:07:07 -07:00
b356699c9b
First pass at /opds/{facet} --> now with active_campaigns too
2014-06-25 18:05:57 -07:00
49133935a0
First draft of opds/creativecommons.xml
2014-06-24 15:27:40 -07:00
e3f32da12b
Put framework for both the navigation and crawlable feeds
2014-06-20 16:53:25 -04:00
420cbdf448
send rh to rh page after claiming work
2014-06-20 15:37:23 -04:00
03f3dd1287
can now edit language via edition edit
...
Also, the language field is widened to support language ids such as
"zh-tw".
Migration required.
2014-06-06 14:32:34 -04:00
1074afd6bf
Merge pull request #354 from Gluejar/revise_landing
...
landing page now shows three categories
2014-05-23 14:51:41 -07:00
c497502766
this time I remembered to check the test
2014-05-22 22:38:42 -04:00
12cf531e7b
purchased copies need full url
2014-05-22 22:35:29 -04:00
fa221f484e
landing page now shows three categories
...
site favorites is now omitted.
useless "withs" removed
category removed if no campaigns
category labels now are calls to action
2014-05-22 14:08:15 -04:00
314847459b
remove readmill, add dropbox
2014-05-20 12:19:34 -04:00
b6c58c4e35
add in active campaigns that match specific license
2014-05-08 13:10:57 -04:00
052f5adbc0
add license descriptions and badges to the pages
2014-05-08 11:54:09 -04:00
d102854d02
add license-specific view to CC display
2014-05-08 10:22:35 -04:00
10bfb0ca27
Merge pull request #345 from Gluejar/refix_b2u_calculator
...
Refix b2u calculator [#70704708 ] and [#70681088 ]
2014-05-05 14:25:18 -07:00
a7b9581919
fix calculator
...
update_left() was setting current_total to zero
2014-05-05 15:55:20 -04:00
da7d6ccfc5
fix send_to_kindle
2014-05-05 12:21:59 -04:00
935c7b4a4c
fix issue when an anonymous user logs in (rare)
2014-05-05 12:21:44 -04:00
c85a13b05c
acq shouldn't be in context for THANKS
2014-05-05 10:15:29 -04:00
53ea120aae
acknowledgement missing for logged in users
2014-05-05 10:15:05 -04:00
8e39548740
Merge pull request #336 from Gluejar/rh_create_work
...
rights holder can create new work
2014-04-29 18:16:25 -07:00
0934984f8f
rights holder can create new work
2014-04-29 21:07:24 -04:00
5ee4f7c4df
Merge pull request #335 from Gluejar/improve_lists
...
Improve lists and landing page for launch
2014-04-29 18:01:27 -07:00
958d963f75
add campaign list for each campaign type
2014-04-29 20:03:33 -04:00
6e034c58e0
unclutter the bottom of the landing page
2014-04-29 16:16:00 -04:00
59997cfda1
reset selected edition on campaign save
2014-04-29 14:51:49 -04:00
2ee1a1d34d
one more thing - indicate that download page is missing ebook links
2014-04-28 15:14:46 -04:00
1c783f2e4a
make sure goal is retotled when campaign is modified
2014-04-09 15:02:25 -04:00
c2fae4c16f
fix the calculator- it was broken
2014-04-09 14:32:25 -04:00
1d12fbf74d
kwarg, not arg
2014-04-07 12:17:21 -04:00
d2cca9ff93
look before leaping
2014-03-21 09:49:49 -04:00
9122be280b
OMG I broke the downloads
2014-03-20 09:23:17 -04:00
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
f7fea1874e
wish list was not getting set because of vestigial transaction type check
...
[fix #67399604 ]
2014-03-14 13:04:11 -04:00
b8409a815b
forgot to set status in new_edition
2014-03-12 19:32:56 -04:00
fd896c8916
Merge branch 'improve_t4u_campaign' into improve_editions
2014-03-12 18:08:54 -04:00
d2dd926f80
let campaign manager edit work description in campaign management
...
also, revise documentation for campaigns
2014-03-12 18:03:50 -04:00
d49925d26c
errata
...
1. distinguish title for editions page
2. reset earliest_publication on save new edition
2014-03-12 12:54:32 -04:00
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
58b664bc2b
fix bug when creating new edition
2014-03-07 16:58:53 -05:00
db6648cc07
edition editor can now delete authors [ #66337430 ]
2014-03-07 16:42:57 -05:00
38764a12d3
Merge pull request #302 from Gluejar/add_marvin
...
Add marvin, update ibooks, readmill instructions
2014-03-05 19:47:41 -08:00
7fba1a212b
Give more prominence to CC books on landing page
2014-03-05 14:02:12 -05:00
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
54cd6a42c6
Merge branch 't4u_download' into add_marvin
2014-03-03 11:37:25 -08:00
256c60fbfc
Merge branch 'master' into t4u_download
...
Conflicts:
core/models.py
2014-03-03 11:08:50 -08:00
c292a6b3be
Merge branch 'master' into add_marvin
2014-02-25 19:32:31 -08:00
ae531e0d7d
Merge branch 'master' into t4u_download
2014-02-25 19:10:01 -08:00
ccafd90625
Add ebookfile status and links to info page.
2014-02-25 14:47:16 -05:00
e72f55f919
it turns out that offer editing didn't quite work
2014-02-25 14:29:54 -05:00
bd829aff25
On reflection, files_reviewed was a bad idea
2014-02-25 12:54:14 -05:00
7fda4abd1c
Merge branch 'master' into unglued_b2u_mobi
2014-02-24 14:44:13 -08:00
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
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
5547a54332
Merge branch 'master' into better_sendtokindle
2014-02-24 10:30:24 -08:00
1c9c953e30
fix email notice
2014-02-21 15:23:56 -05:00
665fd94e73
decrudify and update emailshare
2014-02-21 14:12:20 -05:00
e66c54e3dc
fix test failures
2014-02-21 13:16:55 -05:00
e8dc4121fa
show beg always with an offer id; auto set the price for libraries
2014-02-20 16:53:30 -05:00
678eb02847
Thanks works with anonymous user
2014-02-20 15:56:10 -05:00
b5fd630bfc
Thanks mostly works.
2014-02-19 22:18:23 -05:00
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
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
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
234982796e
improve unglue.it iadmin
...
move accepted rh and claims to their own pages
2014-02-08 13:28:52 -05:00
87387baa32
add file review requirement for b2u and t4u campaigns
...
migration needed!
2014-02-05 19:33:55 -05:00
fe931c7835
uploader now generates mobi for unglued b2u files
2014-02-05 17:02:21 -05:00
ba3c85d8ac
Merge branch 'master' into t4u_file_upload
2014-02-04 13:14:20 -05:00
b5eccac247
make use of default_storage.url to get URL for cover
2014-02-01 15:47:37 -08:00
ca4471ff55
added cover upload
2014-01-30 23:16:06 -05:00
3bfbbd7653
Merge branch 'master' into t4u_file_upload
2014-01-30 11:53:20 -05:00
b3465ea084
search code for dependence on deadline being not null
2014-01-15 17:59:45 -05:00
66ca501327
temp commit
2014-01-15 08:32:55 -05:00
40aa1ba79e
finished, I think, with t4u public documentation (except contrib page)
2014-01-05 20:43:18 -05:00
b8c7b8afa7
add a page that lets rhs see the premiums earned by ungluers
2013-12-30 21:51:32 -05:00
706a0d1fc6
A list just for creative commons
2013-12-25 19:38:18 -05:00
e51c3ad106
this list was just duplicating the unglued list
2013-12-25 19:37:54 -05:00
eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
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
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
b9c54ead8b
deny registration to robots that try to search for the registration page.
2013-12-16 16:27:19 -05:00
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
223c005b86
simplify and update slideshow
2013-12-14 13:24:29 -05:00
2892a22824
change terminology from "donation" to "gift"
2013-12-13 15:15:35 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
c6edd83884
Merge branch 'master' into b2u_ungluify
2013-11-14 14:58:22 -05:00
5d4539b305
enable ebookfile download and secure ebookfile storage
2013-11-14 14:48:16 -05:00
8bb514a401
somehow the "borrow" function wasn't tested in "reserves"
2013-11-12 17:28:07 -05:00
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
0840a1fd71
implement holds. Also fix borrow view that didn't specify work.
2013-11-08 12:13:34 -05:00
275f299f81
campaign setup cleanup: was broken when more than one claim existed
2013-11-07 13:35:35 -05:00
e6692f7932
This was causing reserved licenses to be immediately borrowed
2013-11-07 13:32:00 -05:00
499378ccf7
improve bad epub error handling
2013-11-05 00:57:15 -05:00
dd84c36418
subsume calculator view into faq view
2013-11-03 00:27:52 -04:00
b5db02e1d0
incorporate AM suggestions into FAQs
2013-11-03 00:07:52 -04:00
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
53d9f2c8be
library ungluer list is library members
2013-10-19 21:01:10 -04:00
6e7344d8a4
and now, you can borrow a library book! yay!
2013-10-18 15:35:48 -04:00
60cd2f626b
borrowability reflected on work page
2013-10-18 13:33:47 -04:00
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
6910f1aa0c
cleanup of supporter view
2013-10-17 12:44:47 -04:00
b9b5f9e389
download changes a reserve to a borrow
2013-10-16 22:53:47 -04:00
e6573ac0c5
library user can buy a library license
2013-10-15 16:18:30 -04:00
99c7b73d4a
purchase page reflects library membership and purchased status
2013-10-14 22:51:48 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
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
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
2f703a7815
Merge branch 'master' into add_libraries
2013-10-07 12:35:55 -04:00
ec7a3155b2
exclude incomplete transactions from event display on landing page
2013-10-05 11:41:12 -04:00
19101a3109
ungluing date calculator and many documetation improvements
2013-10-03 22:54:25 -04:00
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
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
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
2e58255e6c
readmill downloads can't have mixed redirects
2013-09-11 11:31:20 -04:00
4038ea53e7
fix Kindle_config 404
2013-09-09 15:48:27 -04:00
4509cea6dd
only 2 o's in ebook
2013-09-09 15:20:58 -04:00
63f0ee3794
Remove pledge form error when campaign is not active. [ #56565596 ]
2013-09-09 09:54:16 -04:00
6294c15aad
TGFT
2013-09-06 00:14:06 -04:00
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
5bb359fb1e
safe_get_work not used everywhere it should have been
2013-09-05 16:14:51 -04:00
0ba5c9a00e
cleanup, plus tests
2013-08-27 18:03:35 -04:00
e51fa1190e
wired watermarker into file uploads. migration needed
2013-08-26 23:56:01 -04:00
cbc34db3d7
fix bug found by luc
2013-08-22 16:12:27 -04:00
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
3bdb755419
move constant to params file to improve import
2013-08-22 14:22:54 -04:00
80d78e624f
remove amazon cruft to get current_total correct
2013-08-19 23:23:27 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
91f7c5f23d
Remove some payment dependence on campaign details
2013-08-19 22:52:22 -04:00
26c4d522b4
made the cc_date and test consistent whether its a date or a datetime
2013-08-19 16:01:32 -04:00
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
d5b9f88380
move "extra data" into a json field dict to improve payment code tidieness
...
need to install jsonfield
note: this is https://bitbucket.org/schinckel/django-jsonfield
I tried https://github.com/bradjasper/django-jsonfield but it was not
compatible with South
2013-08-18 15:21:55 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
c2f3910fe8
set approriate open campaign params
2013-08-08 22:32:12 -04:00
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
a5cc59d6f9
filter marc records based on a user's wishlist
2013-07-29 17:59:52 -04:00
eric
Raymond Yee