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
f607ab026d
Make sign-up box validate and make error notices less in-your-face
2013-08-15 12:43:20 -04:00
d941686c50
now does password reset for a socialauth account
2013-08-14 17:29:38 -04:00
c415340356
change Pledge button to Purchase
2013-08-13 23:47:55 -04:00
40bcf62f99
edition.ebooks is always true
2013-08-12 17:22:55 -04:00
2c06139a6f
make dollar/day a float validate cc_date_initial, max target prevent changes after launch
2013-08-10 16:29:58 -04:00
7f325c0775
Finish B2U Campaign setup
2013-08-09 19:00:54 -04:00
75c32569e2
B2U campaign percentages
2013-08-08 22:32:58 -04:00
587323196a
Merge branch 'master' into ebook_selling
2013-08-08 20:02:25 -04:00
e64c128f7e
Merge branch 'master' into ebook_selling
...
Conflicts:
frontend/forms.py
2013-08-08 19:59:29 -04:00
613c3770e0
Bake in CC Date concept according to blog post, up to campaign creation
...
http://blog.unglue.it/2013/08/06/a-new-kind-of-ungluing-campaign/
moving the migration...
2013-08-08 19:56:26 -04:00
27bc134fa4
Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc
2013-08-08 12:28:36 -04:00
a9b5d51b36
Merge branch 'master' into expiring_cc
2013-08-07 22:59:37 -04:00
f30d662cd9
Merge branch 'master' into marc_provision
2013-08-07 22:10:01 -04:00
1bd2918bc3
Merge branch 'master' into ebook_selling
2013-08-07 15:21:57 -04:00
69e3ec0722
Add path back to landing in faq menu
2013-08-05 17:41:38 -04:00
a1b8ac6dba
change Rghts tab to More… tab
2013-08-05 17:40:42 -04:00
e78d5c7472
clean up account update notices
2013-08-05 12:18:51 -04:00
f2fbfed79e
Merge branch 'master' into expiring_cc
2013-08-03 16:19:53 -04:00
84c18ee65d
Make sure current staff is described accurately on ungluue.it site
2013-08-01 19:28:20 -04:00
cf640baff8
fix problem found with token test
2013-07-29 21:38:16 -04:00
313e46341b
can't figure out how to get loading gif to go away, so will forget about it for now
2013-07-29 18:53:09 -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
2c75ecb9ce
html nits
2013-07-26 21:01:19 -04:00
91e2d41b67
moved the link target pref into a library prefs only table
2013-07-26 18:30:45 -04:00
767733ea26
anon user friendly
2013-07-26 16:12:10 -04:00
32f6546a04
spinny thing should go away if they want to use the form again
2013-07-26 08:59:31 -04:00
8281d99563
edge cases
2013-07-25 10:25:14 -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
9cb3dcdadf
documenting how you get MARCXML from LOC
2013-07-19 09:56:47 -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
fe2e3b72c5
argh
2013-07-16 11:42:17 -04:00
e3b6288e23
iterating unglify script, starting to integrate into front end
2013-07-15 16:35:41 -04:00
5f10047691
clarifying
2013-07-15 08:38:20 -04:00
bbeb086cbc
bugfixing
2013-07-08 15:54:36 -04:00
46d1d4f767
Merge branch 'master' into expiring_cc
...
Conflicts:
payment/models.py
payment/tests.py
2013-07-08 10:52:44 -07: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
c88e002ccb
get manage campaign to work a second time
2013-07-01 03:20:58 -04:00
7eeb114d03
tweek status messages
2013-06-29 23:14:33 -04: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
a6879ac20d
unbind send-to-kindle action after send, don't display options not available without javascript to non-js users
2013-06-26 09:43:15 -04:00
8395a4afb4
other things have logos, readmill should too
2013-06-26 09:31:26 -04:00
bb5bc2112d
add readmill and send to kindle instructions
2013-06-25 17:42:06 -04:00
6dd6d7de5a
add instructions and png for embedded browser
2013-06-25 17:41:14 -04:00
e92532524f
merge session.next_page into cookie.next functionality
2013-06-25 16:02:12 -04:00
fbe37359f2
simplify kindle_config view and add link to the work page
2013-06-25 16:01:08 -04:00
ff65b6b7dd
validation nit
2013-06-25 15:59:00 -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
e33077138f
move ebook id to title attribute
2013-06-25 01:09:36 -04:00
bcec6d4914
no smtp auth failures for you
2013-06-24 15:42:51 -04:00
aa7e5bfe5e
kindle instructions
2013-06-24 14:52:03 -04:00
50fce4bb1a
sharing->email
2013-06-24 14:28:01 -04:00
1380040bd2
Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download
2013-06-24 13:56:39 -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
5fe6f5d3a0
no campaigns *right now*
2013-06-18 09:39:57 -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
1ea77acf09
move latest ending logic from form to model/settings
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
8fd153f085
rewiring to remove buttons
2013-06-17 18:53:28 -04:00
1e310e8896
fix overzealous global replace
2013-06-14 23:09:55 -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
0819c77312
rewiring to remove buttons
2013-06-12 14:05:30 -04:00
e21b002b6a
Merge branch 'master' into simpler_download
2013-06-10 11:59:19 -04:00
3b159db315
email validation
2013-06-10 11:57:59 -04:00
afe7e3ca54
kindle sending should only fire if we have an address on file
2013-06-10 11:23:06 -04:00
eric
Raymond Yee
Andromeda Yelton