3b4b836e6c
add marc download tools
2014-10-27 11:55:46 -04:00
78ddf22c18
Merge branch 'master' into stub-marc
2014-10-22 02:04:00 +00:00
892b970ae1
can download all records
2014-10-20 23:30:20 -04:00
be294aa8f0
Merge branch 'master' into stub-marc
2014-10-17 11:36:35 -04:00
fbe96bcfc7
basic stub records
2014-10-14 10:08:08 -04:00
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
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
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
28434b06a1
now do the same for epubs
2014-09-05 16:35:57 -04:00
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
8d71f65351
update landing page news
2014-08-30 13:38:53 -04:00
40831b6161
incorporate add_ask into campaign management
2014-08-30 12:04:50 -04:00
73c616092d
campaign.add_ask_to_ebfs for pdfs
2014-08-28 15:29:41 -04:00
7b7c050fb2
Merge pull request #379 from Gluejar/edition_errata
...
Edition editing errata
2014-08-13 22:30:49 -07:00
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
ff7ffdf4e1
just get rid of the silly status icon
2014-08-06 17:44:11 -04:00
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
229301d4df
add "feature this" to edit tools
2014-08-06 15:59:57 -04:00
ff1eb6ef0e
Merge pull request #371 from Gluejar/opds_2
...
Opds 2
2014-07-25 14:17:27 -07:00
aa84366418
no contrib form if the ask is all zero
2014-07-25 14:43:54 -04:00
8642a9d7ca
update news
2014-07-24 15:25:33 -04:00
0971a8c7ba
corrected the label
2014-07-24 15:22:26 -04:00
81e5b28a32
make the description edit note context sensitive
2014-07-24 15:20:59 -04:00
fa2c50dfea
there's no publisher in edition edit form
2014-07-24 15:17:36 -04:00
3d7b56248d
fix bad html
2014-07-24 15:01:29 -04:00
632b7efdc8
set width of publisher logo
2014-07-24 14:57:14 -04:00
2aed378814
fix the root problem
2014-07-22 16:20:44 -04: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
776f343fd7
forgot to add opds.xml
2014-07-11 15:13:09 -07:00
84a102c640
Merge pull request #368 from Gluejar/featured_ebook
...
Featured ebook
2014-07-09 10:19:01 -07:00
3cdae2d6bb
Merge pull request #366 from Gluejar/improve_rh_experience
...
Improve rh experience
2014-07-08 13:32:18 -07:00
e216728ab8
campaigns -> campaign(s) in case only 1 campaign.
2014-07-08 13:28:49 -07:00
9e98651039
improve open campaign UI
2014-07-03 21:36:52 -04:00
461321c0bb
Added dynamic contents to assist in navigation
2014-07-03 21:20:36 -04:00
908bb7974f
make the rest of the checklist dynamic
2014-07-03 21:07:50 -04:00
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
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
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
0b918fabe0
notice changed to reflect that we're not checking each claim
2014-06-20 15:39:20 -04:00
6cb8daf1b4
clean up instruction on rh tools page
2014-06-20 15:30:46 -04:00
eeb018df4f
show pricing in buy-2-unglue panel view
2014-06-17 14:39:16 -04:00
d3e21944b0
uniform display of pice, with cents
2014-06-17 12:21:22 -04:00
f7a5195ac3
one more try!
2014-05-27 14:24:27 -04:00
8d1a9f44b0
fix dropbox on second load
...
The problem was that the dropbox saver checks to see if it's already
run before adding buttons. the lightbox was actually running the saver
a second time. on pages with multiple download buttons, the buttons
would get added only on the first lightbox.
2014-05-25 00:26:47 -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
12cf531e7b
purchased copies need full url
2014-05-22 22:35:29 -04:00
aa70595842
close the anchor tags!
2014-05-22 16:36:26 -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
ba3878a4b3
remove call-to-action color on send-to-kindle if user not logged in
2014-05-21 15:24:00 -04:00
314847459b
remove readmill, add dropbox
2014-05-20 12:19:34 -04:00
358a67928a
add rights for ebooks without campaigns that we list
2014-05-15 15:18:11 -04:00
4d359b53c1
Merge pull request #348 from Gluejar/list_by_license
...
List by license [#70951010 ]
2014-05-14 09:14:03 -07:00
62c1538a76
refresh press links
2014-05-08 23:32:23 -04:00
8ea10de26a
bold the active license type
2014-05-08 13:17:00 -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
c92219f673
Revert "Reverting changes made to fix double click problem -- and moving changes to fix_double_click"
...
This reverts commit 643d8d358d
2014-05-07 15:37:19 -07:00
362890e313
improve wording about revenue goal on campaign management page
2014-05-05 16:26:48 -04:00
643d8d358d
Reverting changes made to fix double click problem -- and moving changes to fix_double_click
...
Revert "move post monkey subscribe into a task"
This reverts commit 9556c4a792
2014-05-02 13:59:04 -07:00
e4cb8f741c
prevent double clicks on reg button
...
This definitely prevents to problem from occurring!
2014-05-02 14:09:01 -04:00
810882ac0f
point to launch announce on blog
2014-05-01 14:19:49 -04:00
10256e9eb5
remove extra links
...
in b2u, it was assumed that an acq=> mobi and epub, but t4u uses acqs
just for recording a contribution
2014-04-30 17:29:41 -04:00
0b4d670226
keep the book panels where they belong
2014-04-29 21:51:52 -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
af17403e97
add links to campaigns from campaign faqs
2014-04-29 20:04:29 -04: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
ece091b812
edition editing and file upload was very confusing
...
hope this is an improvement
2014-04-29 14:53:18 -04:00
390e6864f5
missed a commit
2014-04-28 16:31:31 -04:00
2ee1a1d34d
one more thing - indicate that download page is missing ebook links
2014-04-28 15:14:46 -04:00
9287825d6e
pdf and mobi not displayed in campaign management
2014-04-28 10:59:03 -04:00
d45bea58b0
add offers
...
needed to move book itemscope so it contains the offers
2014-04-16 16:15:19 -04:00
a78fdc4239
fix markup error
2014-04-16 16:14:22 -04:00
e12fa3f52c
no-epub download page was showing bad ibooks button
2014-04-16 12:32:39 -04:00
679263faa1
Merge branch 'master' into faq_revision
2014-04-11 13:09:25 -04:00
7b96102e01
faq revision
2014-04-11 13:08:44 -04:00
325dff59f2
fix repeated Fave button
2014-04-10 15:52:25 -04:00
bdde5f57e5
only meant to have explainer for landing page
2014-04-10 13:29:58 -04:00
bd0a315540
and the panel flipper script
2014-04-10 13:19:37 -04:00
29207b7c89
update the template map
2014-04-10 13:16:11 -04:00
2245e816b9
other doc pages needing added css
2014-04-10 13:15:08 -04:00
fc0670595a
doc pages use learn more, need more css
2014-04-10 11:08:09 -04:00
90493d080e
Merge pull request #323 from Gluejar/display_nits
...
Display nits
2014-04-09 13:58:38 -07:00
ed9b9953a5
html nit
2014-04-09 16:53:41 -04:00
72bc22d1be
Add rh link to top menu
2014-04-09 15:11:34 -04:00
f45f054755
bump landing page css version, tweaks
...
tweaks:
darker buy buttons in learn more
header for 3 ways section
2014-03-31 14:18:16 -04:00
14759ac546
always show learn more to anonymous users
...
logged in users get still get the drop-down
2014-03-30 21:28:32 -04:00
7f171c95ed
revise learn_more to have dual creater/ungluer messages
2014-03-30 21:23:13 -04:00
59f36bf194
noticed mistake in faq
2014-03-27 22:33:59 -04:00
345b0d1682
replaced learn more block with explanation of 3 ways to free ebooks
...
could hire someone to make cute pictures in place of the words, but
should try this, first
2014-03-27 22:32:49 -04:00
b00b0b2c09
add font-awesome to landing page
2014-03-27 22:10:06 -04:00
4f383c67c5
eliminate css duplication
2014-03-27 17:49:16 -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
b8e06d04d1
re-expose the ebook adding links, add link to work on editing page
2014-03-17 10:32:43 -04:00
ef1fa6b860
add t4u context sensitive exclamation in panel view
2014-03-16 21:29:00 -04:00
434d3f9129
make the download ask insensitive to its length
2014-03-16 20:06:01 -04:00
d2ae3c2e2d
more manage campaign tweaks
2014-03-16 18:28:47 -04:00
13bd024f1f
b2u for libraries
...
1. library license is autochecked when user is the library
2. the library owner is automatically made a member of the library
2014-03-14 15:12:23 -04:00
878970df4b
notification cleanup
2014-03-14 14:28:21 -04:00
275dfb1068
show new edition link to campaign managers on work page
...
also, improve wording of ebook links
2014-03-13 15:22:03 -04:00
437f9d0eac
better wording
2014-03-13 08:39:58 -04:00
b8409a815b
forgot to set status in new_edition
2014-03-12 19:32:56 -04:00
4109778855
add link for campaign manager to create edition
2014-03-12 18:17:29 -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
708d257b35
make short asks less ugly
...
Jake’s test exposed this issue
2014-03-11 22:06:36 -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
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
a1d5f5f5d9
various improvements in documentation
2014-03-03 22:11:43 -05:00
6bcbf05095
assorted references to "wish list"
...
Still need work on press page
2014-03-03 18:21:01 -05:00
a3ec4b062d
fix bugs found by Raymond
2014-03-03 16:51:33 -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
482d9be31d
add b2u test links to campaign management page
2014-02-25 13:58:33 -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
62737954cb
Merge branch 'master' into useability_tweaks
2014-02-24 10:07:09 -08:00
a87065f70e
Merge branch 'master' into unglued_b2u_mobi
2014-02-21 13:24:20 -08:00
665fd94e73
decrudify and update emailshare
2014-02-21 14:12:20 -05:00
92e870d2b7
Merge branch 'master' into t4u_download
2014-02-21 13:18:04 -05:00
e8dc4121fa
show beg always with an offer id; auto set the price for libraries
2014-02-20 16:53:30 -05:00
c7abcb357b
report anonymous contributions
2014-02-20 16:31:13 -05:00
678eb02847
Thanks works with anonymous user
2014-02-20 15:56:10 -05:00
737cf91c66
complete switch to "Faves/Favorites" language
2014-02-19 23:16:28 -05:00
b5fd630bfc
Thanks mostly works.
2014-02-19 22:18:23 -05:00
d826f43ba0
typos
2014-02-13 21:22:13 -05:00
4490fa7de9
Merge branch 'master' into t4u_download
2014-02-11 16:16:29 -05:00
57eaf44133
use group divs to make the forms less confusing
2014-02-11 12:56:47 -05:00
36ebc83a5b
adapt work and book panel to t4u
...
also: start migration to “Fave”
also: start showing faves on ready to read books
also: on panel view, fixed the num-wishes link was unclickable
but: the fave count looks ugly
2014-02-11 11:37:39 -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
3246aa9d2f
some css tweaks and wording improvements
2014-02-08 15:55:30 -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
0cd6798bb5
Add work id to rights emails [ #16897275 ]
2014-02-08 13:39:31 -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
d03e8d5097
Merge branch 'master' into unglued_b2u_mobi
2014-02-05 17:02:48 -05:00
fe931c7835
uploader now generates mobi for unglued b2u files
2014-02-05 17:02:21 -05:00
277968acaa
update link for QED
2014-02-05 15:28:00 -05:00
ee45b5d198
Merge pull request #290 from Gluejar/hide_emailshare
...
webmaster tools didn't like emailshare links it couldn't use
2014-02-05 09:36:49 -08:00
ba3c85d8ac
Merge branch 'master' into t4u_file_upload
2014-02-04 13:14:20 -05:00
c25adf2c68
webmaster tools didn't like emailshare links it couldn't use
2014-02-03 21:45:50 -05:00
4948a7961f
Upload for T4U is fixed
2014-01-31 15:45:02 -05:00
ca4471ff55
added cover upload
2014-01-30 23:16:06 -05:00
075219ace2
fix the corresponding bug in subjects, for when subjects get exposed
2014-01-30 13:05:43 -05:00
3f80d24424
bug in creating new authors
2014-01-30 13:02:50 -05:00
3bfbbd7653
Merge branch 'master' into t4u_file_upload
2014-01-30 11:53:20 -05:00
255d2613f8
Merge pull request #284 from Gluejar/alert_off
...
keep alerts up to date
2014-01-21 08:17:58 -08:00
3a0b4fc4de
keep alerts up to date
...
1. time to rest the banner alert
2. Lagos_2060 review link
3. move CC search to explore
2014-01-21 11:11:59 -05:00
13d02b958d
removed whitespace before comma
2014-01-21 10:52:57 -05:00
e540bb7a56
all authors now display
...
had to harden the work model against works without editions to pass
tests
Lagos 2060 will need 1st author to change back
added work.authors_short to work model and to search work mock model
used work #415 as an example of a work with 3 authors
2014-01-17 21:37:19 -05:00
1b656ad76a
fix missing launch button
...
t4u work removed the deadline in b2u campaigns, resulting in a failed
criterion for shooing the launch button. Have moved all the
launchability logic to the campaign model
2014-01-15 10:19:57 -05:00
66ca501327
temp commit
2014-01-15 08:32:55 -05:00
909f8c017d
campaign type on rh tools page
2014-01-10 16:03:26 -05:00
b841c5697b
T4U aware claim notices
2014-01-10 15:32:51 -05:00
40aa1ba79e
finished, I think, with t4u public documentation (except contrib page)
2014-01-05 20:43:18 -05:00
0e88f06a6a
proof read
2014-01-05 15:53:30 -05:00
d046d645d1
More t4u documentation
2014-01-05 15:44:28 -05:00
8f1eeb8aa6
more edits for thanks4u documentation
2014-01-04 20:57:04 -05:00
7b2134c2d4
faq
2014-01-03 19:59:27 -05:00
f3a04aff99
Merge branch 'master' into thanks4u_
2014-01-03 18:47:51 -05:00
70004a0f0f
can create a THANKS campaign
2014-01-03 14:15:26 -05:00
b8c7b8afa7
add a page that lets rhs see the premiums earned by ungluers
2013-12-30 21:51:32 -05:00
65098b2e31
ebookday!
2013-12-25 19:38:37 -05:00
706a0d1fc6
A list just for creative commons
2013-12-25 19:38:18 -05:00
b8a2b564f6
not noticed because never loaded properly
...
must have had fried brain when doing this
2013-12-20 18:01:15 -05:00
eb416e75dd
Merge branch 'master' into switch_watermarking
2013-12-19 18:02:43 -05:00
a05c3d27f1
Merge branch 'switch_watermarking' into thanks4u
2013-12-18 16:06:30 -05:00
973d2c3bc0
made watermarking optional [ #62120182 ]
...
apply migrations
2013-12-18 12:34:53 -05:00
0d28fbab7e
Merge branch 'master' into ban_disposable_emails
2013-12-18 08:54:11 -08:00
2d9a50051b
fix raymond's nits
2013-12-18 11:17:54 -05:00
dd30ed81c2
Merge branch 'master' into test_credit
2013-12-17 15:53:54 -08:00
84d1410f1c
in metrics, give better info on new users
2013-12-17 00:19:56 -05:00
a68da46b96
make library admin easier to use
2013-12-15 02:33:16 -05:00
5a43c46675
consolidated and renamed libraryauth template tags
2013-12-15 01:43:17 -05:00
440153f5dc
Merge branch 'master' into test_credit
2013-12-15 01:27:59 -05:00
82443593ea
make zeros show
2013-12-15 00:46:50 -05:00
1598f181d8
assorted updates
2013-12-15 00:31:43 -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
8c974ca343
moved library list generation into a template tag
...
previously, if you created or updated a library, the list
(/libraryauth/list/ )would not get updated
2013-12-13 14:25:18 -05:00
4836c6f8df
add info
2013-12-12 10:52:42 -05:00
c7e1d6a674
fix typo
2013-12-12 10:27:33 -05:00
9440f88d67
https://ahrefs.com/robot/ got stuck in our site.
2013-12-11 11:52:48 -05:00
314a8d6eb4
Merge pull request #256 from Gluejar/creat_library
...
ask user to sign in before showing them library validation --> ok let's merge to try out on just
2013-12-03 14:07:45 -08:00
4d2f2b4fed
ask user to sign in before showing them library validation
2013-12-03 13:50:12 -05:00
a7db1790e7
Merge pull request #255 from Gluejar/creat_library
...
Create library
2013-12-03 08:28:26 -08:00
02103a8a29
show approval status
2013-12-02 10:28:58 -05:00
8b53581169
clean up instructions
2013-12-02 10:12:22 -05:00
45d96f21bc
Add explanation of verification options
2013-12-02 00:46:25 -05:00
8a9b29946c
spelling correction
2013-12-01 19:42:19 -05:00
36df27cbc2
surface admin links
2013-12-01 19:22:42 -05:00
ff0f7e5446
can now create and admin user validation
2013-11-30 15:40:45 -05:00
ccb1f0dd86
create and edit Library objects, which now have names and owners
2013-11-27 22:14:52 -05:00
42694299e5
Add missing {{ acq.work.title }} to library_reserve/full.txt
2013-11-26 16:53:26 -08:00
af553056e8
update pledge_failed notices
2013-11-25 13:29:31 -05:00
dd83434282
Fix error handling in Pay
2013-11-25 13:01:16 -05:00
2959b68549
Merge pull request #246 from Gluejar/b2u_ungluify
...
B2u ungluify
2013-11-15 15:59:05 -08:00
6787ccd5d8
faq: Why don't you use Paypal or Amazon?
2013-11-15 13:43:38 -05:00
47dd298a78
update campaign successful notifications
2013-11-15 12:06:06 -05:00
efea7d0198
on success, add a cc license, watermark (and generate mobi), and save
2013-11-14 23:16:55 -05:00
c5eee08034
edit wording
2013-11-14 14:58:02 -05:00
0875482611
Merge pull request #242 from Gluejar/library_agreement
...
added docracy links
2013-11-12 10:55:14 -08:00
dd5d1630b5
Merge pull request #238 from Gluejar/fix_email_change
...
didn't have a template for a failed email-change
2013-11-12 10:49:15 -08:00
510f0a2d41
added docracy links
2013-11-12 11:35:12 -05:00
1713a9fbb2
prettier
2013-11-11 14:09:41 -05:00
264c7c9946
didn't have a template for a failed email-change
2013-11-11 14:01:40 -05:00
4582537f05
add onhover explainers to ungluing date and amount to go
...
on work and purchase pages
2013-11-09 20:34:13 -05:00
00693f7a23
Merge branch 'master' into reserves
...
Conflicts:
core/models.py
2013-11-08 16:07:29 -05:00
e5a9b5384f
change alert messages
2013-11-08 13:38:07 -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
30f7f2c4ba
Raymond's editis
2013-11-06 15:34:11 -05:00
43ea692802
It turns out that "congratulations" triggers spam filters
2013-11-06 15:22:30 -05:00
ca540c4cb4
wired up claim notifications [ #37257639 ]
2013-11-06 14:58:50 -05:00
1944f1dd9e
Address AM 11/4 comments
2013-11-04 13:24:43 -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
ebea84427a
repeated "visited the" typo
2013-11-02 15:31:28 -04:00
0f38e35368
no empty-list slideshows on library page
2013-11-02 13:31:39 -04:00
f1a5a89ba7
update purchase notification to indicate multiple copies
2013-11-01 16:32:10 -04:00
6bdbe1d046
user can buy multiple library licenses [ #59827932 ]
...
also, some logic needed cleaning for setting expires on reserves
2013-11-01 16:15:01 -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
6ce980810e
library_join notification to library should differ from not to user
2013-11-01 14:30:41 -04:00
c79572e8e4
notifications when user joins library or user borrows a book
2013-10-31 12:26:43 -04:00
0d103f2768
Merge pull request #225 from Gluejar/library_inserted_page
...
added cases for library licenses
2013-10-30 14:55:14 -07:00
75ef87a11a
added cases for library licenses
2013-10-30 11:44:02 -04:00
a73e62f5d0
add links to calculator
2013-10-30 09:53:02 -04:00
2f8d4bc0c4
[finish #59785084 ] review campaign instructions
2013-10-30 09:12:04 -04:00
7254dcd55e
list of library users
...
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
eacb801af9
Merge pull request #221 from Gluejar/add_libraries
...
Add libraries
2013-10-22 16:02:26 -07:00
0d81e22ff1
add "reserve" to purchase page
2013-10-20 14:18:17 -04:00
cc8375bf4a
bookpanel reflects in-library and out on loan state
2013-10-19 16:54:09 -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
90e1e56405
<pre> section was causing width overflow, added calculator link
2013-10-17 08:39:21 -04:00
c2649f6ab2
implemented borrowing methods, "BORROWED" license acq, RESERVES
...
includes a schema migration!
2013-10-16 22:48:29 -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
4710c5d413
Merge branch 'master' into add_libraries
2013-10-14 18:20:14 -04:00
6e5eab447c
whoops! more tou changes
2013-10-14 13:43:08 -04:00
882feda6c3
now reviewed by attorney
2013-10-14 11:22:42 -04:00
b1d8b2338a
list of unlguit libraries at libraryauth/list/
2013-10-12 22:39:47 -04:00
c552057291
comments page gets some small tweaks
...
Going to use this page as a model for the library list.
2013-10-12 20:31:05 -04:00
29d000b39b
fix test for libraries
2013-10-12 19:14:17 -04:00
157d41eead
make the purchase options reflect user libraries
2013-10-11 17:50:54 -04:00
a57fa7e822
one more nit
2013-10-11 15:19:56 -04:00
fcc1876859
Revisit manage_campaign page for b2u
2013-10-11 12:50:59 -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
56a4856080
wording tweak
2013-10-07 12:35:26 -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
076ce51efd
draft of revised TOU
2013-10-02 17:21:22 -04:00
b7393e7825
change copyright notice per lawyer
2013-10-02 12:09:26 -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
6b5dbc16c0
we haven't used some info and will have better conversion as we ask for less info
2013-09-27 14:03:01 -04:00
0d14b9ac3e
mis-spellings, we're not selling pdf yet
2013-09-27 14:01:10 -04:00
b091612605
Merge branch 'master' into b2u_errata
...
Conflicts:
frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
93b7ffc951
Improve language on campaign pages, make text bigger
2013-09-26 09:49:39 -04:00
5976803cb4
fix bug in kindle config, improve doumentation
2013-09-26 09:36:03 -04:00
9b5a254f1d
Adapt marc record machinery to B2U titles
2013-09-23 12:39:47 -04:00
99fe9f9011
rewrite license page
2013-09-20 17:46:06 -04:00
ed341884ea
add license page to epub before sending it for watermarking
2013-09-15 21:43:58 -04:00
2329f9b088
Merge branch 'master' into preview_pledge
2013-09-09 08:32:56 -07:00
2b11153fc6
Merge pull request #205 from Gluejar/messages_notices
...
Notices, not Messages
2013-09-09 08:30:38 -07:00
63f0ee3794
Remove pledge form error when campaign is not active. [ #56565596 ]
2013-09-09 09:54:16 -04:00
de17f02298
[ #56528504 ] fixed lanfing page for purchases
2013-09-06 22:19:46 -04:00
f98684e1f8
Notices, not Messages
...
A review of the entire site reveals that we use "Messages" in only one
place, the sitewide menu item leading to the notices page. Most of our
Notices are more acurately described as notices than as messages, so
will change the menu item.
2013-09-06 16:06:10 -04:00
4b3c899088
[ #55666760 ] make fund-complete page sensetive to action
2013-09-06 13:58:23 -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
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
1c33c34f21
purchase complete notification, contextual wishlist active, fulfillment in signal handler
2013-08-22 14:30:56 -04:00
bec85ff82e
1st crack at faq revision
2013-08-20 14:11:11 -04:00
ff2d995cd5
minor wording changes
2013-08-20 12:41:39 -04:00
18c836d6cd
connect purchases to the new Acq table which records purchases
2013-08-19 22:54:43 -04:00
4a3cfc6840
Merge branch 'master' into ebook_selling
2013-08-18 18:11:13 -04:00
94eb6aeab0
Demphasize "wishes" on the website in preparation for B2U
2013-08-18 18:10:25 -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
c007df0803
Merge branch 'master' into social_auth_password
2013-08-17 17:41:15 -04:00
c88f8165ba
Merge branch 'master' into ebook_selling
2013-08-16 15:50:24 -04:00
837de35375
selling now works up to purchase page
2013-08-16 15:49:44 -04:00
eric
Raymond Yee
Raymond Yee