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
1872180c22
add upload MARC link to work page
2013-07-29 16:35:50 -04:00
8576a7fb7b
Make marc records accessible from work page
2013-07-29 15:57:33 -04:00
1307ae7091
move 856 documentation to template from settings
2013-07-26 22:31:41 -04:00
eff880ce0b
get license from database, not from the record submitter
2013-07-26 19:52:15 -04:00
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
d2f3a2547e
change default
2013-07-26 16:12:24 -04:00
3a9e588fc7
replacing confusing field names
2013-07-25 10:18:36 -04:00
da08afd0b8
now users can select the MARC records they want and get as single download
2013-07-24 14:52:01 -04:00
ec57b7efee
user preference affects which MARC records we make available
2013-07-23 16:07:47 -04:00
bb5c1079b6
user can now change marc preferences
2013-07-23 12:23:04 -04:00
287f017551
documentation for CC/PD MARC records
2013-07-22 14:23:59 -04:00
4c62a2b555
catch bad file errors
2013-07-19 12:47:36 -04:00
516c8c768a
I can harvest files from the db instead of tempting error by entering them twice
2013-07-18 16:36:01 -04:00
0e143b15ba
persist information about where to find AWS files
2013-07-18 15:49:54 -04:00
54e422e217
parametrizing formats and license choices, bugfixing
2013-07-17 13:03:35 -04:00
87c27cecee
wiring ungluify_record to front end and s3
2013-07-17 10:34:01 -04:00
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
214467e8f1
display available MARC records
2013-07-08 11:14:09 -04:00
6e853fc8f9
exclude google books, align error message with page text
2013-07-05 09:05:26 -04:00
8ff9bfc52f
filesize under Amazon SES 10MB limit
2013-07-05 08:43:02 -04:00
9205dd6f3d
patch to limit attempts to send to kindle files that are on the order of the size of OLA --> Amazon SES has 10 MB limit
2013-06-27 14:14:54 -07:00
221a4bbfd2
Merge pull request #186 from Gluejar/fix_worklist_ordering
...
remove conflicting "order by"
2013-06-27 13:22:21 -07:00
2a7a42fbfe
Merge branch 'master' into ebook_selling
...
Resolved Conflicts:
frontend/templates/download.html
frontend/views.py
static/css/enhanced_download.css
static/css/enhanced_download_ie.css
static/css/sitewide4.css
static/js/download_page.js
static/less/enhanced_download.less
static/less/enhanced_download_ie.less
static/less/sitewide4.less
2013-06-27 15:26:04 -04:00
b0f4eda221
show offers on work page
2013-06-27 13:10:33 -04:00
98ba975eec
remove conflicting "order by"
2013-06-27 12:00:47 -04:00
51c86867a0
don't pop a param that isn't there
2013-06-27 10:31:01 -04:00
f2f02237a8
fix KeyError at source, not in test
2013-06-26 14:36:04 -04:00
14051e2f21
pop kindle email from session after use
2013-06-26 09:46:56 -04:00
fbe37359f2
simplify kindle_config view and add link to the work page
2013-06-25 16:01:08 -04:00
f79c456f53
I don't like putting None in a dict, especially when it bloats the code
2013-06-25 01:35:09 -04:00
3407b7cec4
add helpful link to response from send-to-kindle
...
also, move the kindle result messages into a template
2013-06-25 01:11:43 -04:00
bcec6d4914
no smtp auth failures for you
2013-06-24 15:42:51 -04:00
69f0451bea
segregate flows of one-click and information-seeking options, address feedback
2013-06-24 13:53:28 -04:00
3c950966bc
Merge branch 'master' into simpler_download
2013-06-24 08:36:51 -04:00
5d1f6fa224
quick fix for readmill
2013-06-20 14:34:44 -04:00
835ff4be8e
Rightsholder can upload ebook files and set buy-to unglue prices [ #51733385 ][ #51745045 ]
...
note that to test file upload loacal, you need to set up file storage
in local settings. for example,
MEDIA_ROOT = '/Documents/media/'
DEFAULT_FILE_STORAGE = 'django.core.files.storage.FileSystemStorage'
2013-06-17 18:53:28 -04:00
9e5f41968b
download options should be sensitive to filetype
2013-06-17 18:53:28 -04:00
cd504780e6
redesigning information flow to address feedback
2013-06-17 18:53:28 -04:00
7070f033e7
download options should be sensitive to filetype
2013-06-12 15:24:26 -04:00
2337676e1c
redesigning information flow to address feedback
2013-06-12 15:11:43 -04:00
a5af94be7a
add user agent inspection
2013-06-10 12:58:19 -04:00
e21b002b6a
Merge branch 'master' into simpler_download
2013-06-10 11:59:19 -04:00
704fdc5b60
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-10 11:58:03 -04:00
3b159db315
email validation
2013-06-10 11:57:59 -04:00
1a6107d025
this is how you log an exception
2013-06-10 11:12:54 -04:00
778983efb5
see if this fixes the formatting error
2013-06-10 11:08:48 -04:00
8eb45252b6
correctly log exception
2013-06-10 09:57:12 -04:00
2fb93dbbef
login or account creation after kindle sending now adds kindle email to profile
2013-06-10 09:29:18 -04:00
e71ccfcfa5
add kindle email to user profile after login or account creation
2013-06-07 11:22:54 -04:00
b23b617e4b
prompt not-logged-in users for kindle delivery email
2013-06-07 10:19:06 -04:00
b98a36d8e8
should be a view for coming-soon campaigns
2013-06-05 15:08:29 -04:00
6dbdc243e3
prevent overflow of books onto second line
2013-06-05 15:06:07 -04:00
c8ff245e80
show coming soon campaigns if none active, or skip section if none initialized either
2013-06-05 15:05:14 -04:00
2f3f8997ad
make sure graceful degradation works, fix bugs
2013-06-05 11:06:07 -04:00
f4ffd5da6f
Merge branch 'master' into simpler_download
2013-06-04 10:48:49 -04:00
8a859e6757
provide feedback, protect against file-too-big error
2013-06-04 10:22:11 -04:00
0273a907da
skeleton of error handling
2013-06-03 17:18:42 -04:00
ad69580b2d
PEP 8, PEP 328. I feel better now.
2013-06-03 12:31:39 -04:00
4354d3abee
now kindle sending usually works
2013-06-03 11:17:25 -04:00
b3181f0e22
first pass at sending kindle files as attachments
2013-05-31 17:15:22 -04:00
236302342e
users can add and change kindle email
2013-05-31 15:19:58 -04:00
e75a7b9642
skeleton of send-to-kindle support
2013-05-31 11:34:51 -04:00
830e1248c3
probably more efficient
2013-05-17 11:30:22 -04:00
2ecf4d94e4
work lists with active campaigns should highlight them
2013-05-16 11:43:25 -04:00
1788705bd7
fix bad links from stupid robots [ #49219467 ]
2013-05-03 14:48:36 -04:00
6b7fb7fd00
fix ebook url in reverse method
2013-04-26 17:49:57 -04:00
babeb9e4aa
Merge pull request #164 from Gluejar/manage_book_data
...
Manage book data
2013-04-24 11:31:07 -07:00
08d4adf50b
implement adromeda suggestions
2013-04-24 11:14:25 -04:00
fb77f5a372
fixed ebook admin to allow setting of counts, etc
2013-04-20 10:34:44 -04:00
de442c8f63
count downloads. migrate schemas!
2013-04-20 00:02:36 -04:00
31a1f46666
add split works funtionality
2013-04-16 16:46:25 -04:00
3c61e292d9
Fix edition editing, add other identifiers
2013-04-13 10:59:11 -04:00
97e750867b
Merge pull request #160 from Gluejar/press_updater
...
point press page at new version, tidy up submitterator
2013-04-09 05:46:05 -07:00
74c8d52176
Restored mistakenly deleted import: 6cf42b1a67 (L0L43)
2013-04-08 13:51:08 -07:00
71306108b0
point press page at new version, tidy up submitterator
2013-04-08 14:16:08 -04:00
2bb69d9e82
Merge pull request #149 from Gluejar/verify_email_change
...
Verify email change
2013-04-08 07:28:32 -07:00
6cf42b1a67
resolve conflict
2013-04-05 13:10:03 -04:00
a3ca1d3867
press coverage should be ordered by date
2013-04-04 11:40:44 -04:00
57f7c81ec0
adds press item submission functionality
2013-04-04 11:09:18 -04:00
db0a967963
new press template and view
2013-04-04 10:15:29 -04:00
d861aafdc3
Merge branch 'master' into landing_page
2013-04-02 07:55:42 -07:00
6505384a1a
Merge pull request #152 from Gluejar/improve_login_to_add
...
"login to add" now adds, uses triple login page [#30497175 ]
2013-04-01 07:15:25 -07:00
f029da02c6
Merge pull request #154 from Gluejar/fix_null_search
...
fix error when search has no q
2013-03-30 10:31:36 -07:00
d19b9e7d8e
fix error when search has no q
2013-03-29 21:11:01 -04:00
2aabf09161
merge from master
2013-03-29 19:41:28 -04:00
097127ab7c
resolve conficts in merge from master
2013-03-29 12:03:15 -04:00
1ace0a5479
"login to add" now adds, uses triple login page [ #30497175 ]
2013-03-29 11:50:07 -04:00
520beedfc7
made it faster
2013-03-28 11:38:40 -04:00
9661c97bf3
whoops ordering queryset on wrong thing
2013-03-28 11:12:55 -04:00
3a81db3804
Implement publisher and feedback email in campaign management
...
(feedback view made more flexible)
2013-03-27 12:22:30 -04:00
6e801e6841
adding bookish activity to main content area
2013-03-26 14:55:50 -04:00
2b28add6a8
first pass at publisher page
...
in admin created publisher "De Gruyter" url=http://degruyter.com/ "
logo_url=https://www.degruyter.com/skin/20130326/images/logo.png
description=For more than two-hundred and sixty years the name De
Gruyter has been synonymous with high-quality, landmark publications in
the humanities and natural sciences. The scope of our publishing
program includes theology and philosophy, biology and chemistry,
linguistics and literature, mathematics and physics, history and
archaeology, as well as law and medicine. In all these areas De Gruyter
has consistently partnered with exceptional scholars to establish
itself as a key international publisher.
page at http://localhost:8000/bypub/all/de%20gruyter and
http://localhost:8000/pid/all/4702 (my db pubname id for de gruyter is
4702)
2013-03-26 14:53:48 -04:00
7f59be6ada
kill crowdfunding graphic and slideshow
2013-03-26 13:55:14 -04:00
998f33c770
more exciting news feed for home page
2013-03-26 13:54:03 -04:00
1881660089
intoduce Publisher and PublisherName Models
...
Also change our by publisher lists to key on the new name ids rather
than the names, which was yucky.
Migrations!
Data migration takes a while, don't be allarmed if it sits a while.
2013-03-25 23:41:19 -04:00
d905f288d7
merge from master
2013-03-22 16:45:41 -04:00
c26f9e1505
merge from master
2013-03-22 16:39:23 -04:00
e4a39647b9
expand and rename who's ungluing what area
2013-03-22 15:47:03 -04:00
1fcd0e54ed
fixed bug that broke return path to pledge
2013-03-21 10:14:23 -04:00
cc48ef8362
merge from master
2013-03-21 08:44:43 -04:00
eric
Raymond Yee
Andromeda Yelton
