Commit Graph

2278 Commits (810882ac0f7579f2e96f0ddc86e5bd385825ce08)

Author SHA1 Message Date
eric dd84c36418 subsume calculator view into faq view 2013-11-03 00:27:52 -04:00
eric b5db02e1d0 incorporate AM suggestions into FAQs 2013-11-03 00:07:52 -04:00
eric ebea84427a repeated "visited the" typo 2013-11-02 15:31:28 -04:00
eric 0f38e35368 no empty-list slideshows on library page 2013-11-02 13:31:39 -04:00
eric f1a5a89ba7 update purchase notification to indicate multiple copies 2013-11-01 16:32:10 -04:00
eric 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
eric 143b24c368 acquired ebooks failed to show if wishlist empty [#59972462]
some complicated interaction with wishlists because this template
copies a user's
2013-11-01 14:33:52 -04:00
eric 6ce980810e library_join notification to library should differ from not to user 2013-11-01 14:30:41 -04:00
eric c79572e8e4 notifications when user joins library or user borrows a book 2013-10-31 12:26:43 -04:00
Raymond Yee 0d103f2768 Merge pull request #225 from Gluejar/library_inserted_page
added cases for library licenses
2013-10-30 14:55:14 -07:00
eric 75ef87a11a added cases for library licenses 2013-10-30 11:44:02 -04:00
eric a73e62f5d0 add links to calculator 2013-10-30 09:53:02 -04:00
eric 2f8d4bc0c4 [finish #59785084] review campaign instructions 2013-10-30 09:12:04 -04:00
eric 7254dcd55e list of library users
visible to other library users and unglue.it staff
2013-10-27 13:15:18 -04:00
Raymond Yee eacb801af9 Merge pull request #221 from Gluejar/add_libraries
Add libraries
2013-10-22 16:02:26 -07:00
eric 0d81e22ff1 add "reserve" to purchase page 2013-10-20 14:18:17 -04:00
eric 53d9f2c8be library ungluer list is library members 2013-10-19 21:01:10 -04:00
eric 76562f83ad fix test errors 2013-10-19 17:27:53 -04:00
eric cc8375bf4a bookpanel reflects in-library and out on loan state 2013-10-19 16:54:09 -04:00
eric 6e7344d8a4 and now, you can borrow a library book! yay! 2013-10-18 15:35:48 -04:00
eric 60cd2f626b borrowability reflected on work page 2013-10-18 13:33:47 -04:00
eric 93d128102e display of borrowability and library holdings
needed another date column on acqs to manage this
bookpanel getting complicated- moved some logic into tempalte tags
library page now shows b2u books it owns
"library" has its own view now
2013-10-18 12:36:55 -04:00
eric 6910f1aa0c cleanup of supporter view 2013-10-17 12:44:47 -04:00
eric 90e1e56405 <pre> section was causing width overflow, added calculator link 2013-10-17 08:39:21 -04:00
eric b9b5f9e389 download changes a reserve to a borrow 2013-10-16 22:53:47 -04:00
eric c2649f6ab2 implemented borrowing methods, "BORROWED" license acq, RESERVES
includes a schema migration!
2013-10-16 22:48:29 -04:00
eric e6573ac0c5 library user can buy a library license 2013-10-15 16:18:30 -04:00
eric 99c7b73d4a purchase page reflects library membership and purchased status 2013-10-14 22:51:48 -04:00
eric 4710c5d413 Merge branch 'master' into add_libraries 2013-10-14 18:20:14 -04:00
eric 6e5eab447c whoops! more tou changes 2013-10-14 13:43:08 -04:00
eric 882feda6c3 now reviewed by attorney 2013-10-14 11:22:42 -04:00
eric b1d8b2338a list of unlguit libraries at libraryauth/list/ 2013-10-12 22:39:47 -04:00
eric 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
eric 29d000b39b fix test for libraries 2013-10-12 19:14:17 -04:00
eric 157d41eead make the purchase options reflect user libraries 2013-10-11 17:50:54 -04:00
eric a57fa7e822 one more nit 2013-10-11 15:19:56 -04:00
eric fcc1876859 Revisit manage_campaign page for b2u 2013-10-11 12:50:59 -04:00
eric d99aaa97c9 card number authentication!
create libraries and administer them in admin.
card patterns mimc ezproxy format
http://www.oclc.org/support/services/ezproxy/documentation/usr/number.en
.html
after you join a library, it appears in your explore bar
2013-10-10 02:41:50 -04:00
eric 439169a1ab Implemented IP authentication
libraries get associated with a library_block table (IP ranges)
moved superlogin here
IP stuff mostly copied from
https://github.com/benliles/django-ipauth/blob/master/ipauth/models.py
The model is that you need to be in an allowed IP range to "join" a
library. Once you've joined, you can use your login from anywhere. to
use that library.
Asign IP ranges in admin
2013-10-08 15:37:22 -04:00
eric 2f703a7815 Merge branch 'master' into add_libraries 2013-10-07 12:35:55 -04:00
eric 56a4856080 wording tweak 2013-10-07 12:35:26 -04:00
eric ec7a3155b2 exclude incomplete transactions from event display on landing page 2013-10-05 11:41:12 -04:00
eric 19101a3109 ungluing date calculator and many documetation improvements 2013-10-03 22:54:25 -04:00
eric 076ce51efd draft of revised TOU 2013-10-02 17:21:22 -04:00
eric b7393e7825 change copyright notice per lawyer 2013-10-02 12:09:26 -04:00
eric ab473f5411 libraries, phase 1.
admin can create a library connected to a user
other users can "join" the library
2013-10-02 12:02:08 -04:00
eric 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
eric 0d14b9ac3e mis-spellings, we're not selling pdf yet 2013-09-27 14:01:10 -04:00
eric b091612605 Merge branch 'master' into b2u_errata
Conflicts:
	frontend/views.py (kindle config bug already fixed)
2013-09-26 09:57:06 -04:00
eric 93b7ffc951 Improve language on campaign pages, make text bigger 2013-09-26 09:49:39 -04:00
eric 5976803cb4 fix bug in kindle config, improve doumentation 2013-09-26 09:36:03 -04:00
eric 9b5a254f1d Adapt marc record machinery to B2U titles 2013-09-23 12:39:47 -04:00
eric be711e142d cleaned up marc file storage issues before implementing b2u
MIGRATION!
1. multi-record marc files no longer saved, sent to user directly
2. works with both s3 and file system- default storage by name used for
both read and write.
3. stupid storage of computed filenames/urls eliminated
4. removed verbose logging
5. no need to have pymarc write to a StringIO
6. the MARCRecord.clean method didn't do anything
2013-09-23 00:34:51 -04:00
eric 99fe9f9011 rewrite license page 2013-09-20 17:46:06 -04:00
eric ed341884ea add license page to epub before sending it for watermarking 2013-09-15 21:43:58 -04:00
eric 2e58255e6c readmill downloads can't have mixed redirects 2013-09-11 11:31:20 -04:00
eric 4038ea53e7 fix Kindle_config 404 2013-09-09 15:48:27 -04:00
eric 4509cea6dd only 2 o's in ebook 2013-09-09 15:20:58 -04:00
Raymond Yee 2329f9b088 Merge branch 'master' into preview_pledge 2013-09-09 08:32:56 -07:00
Raymond Yee 2b11153fc6 Merge pull request #205 from Gluejar/messages_notices
Notices, not Messages
2013-09-09 08:30:38 -07:00
eric 63f0ee3794 Remove pledge form error when campaign is not active. [#56565596] 2013-09-09 09:54:16 -04:00
eric de17f02298 [#56528504] fixed lanfing page for purchases 2013-09-06 22:19:46 -04:00
eric 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
eric 4b3c899088 [#55666760] make fund-complete page sensetive to action 2013-09-06 13:58:23 -04:00
eric 6294c15aad TGFT 2013-09-06 00:14:06 -04:00
eric b801eb4927 add acq handling to download
needs migration. should migrate core back to 0052 to refresh acq table

download page no longer passes ebook ids to send_to_kindle, url
calculations are now done in view
2013-09-05 22:54:11 -04:00
eric 5bb359fb1e safe_get_work not used everywhere it should have been 2013-09-05 16:14:51 -04:00
eric 0ba5c9a00e cleanup, plus tests 2013-08-27 18:03:35 -04:00
eric e51fa1190e wired watermarker into file uploads. migration needed 2013-08-26 23:56:01 -04:00
eric e5a162061d only epub files to be uploaded for now 2013-08-26 23:54:19 -04:00
eric cbc34db3d7 fix bug found by luc 2013-08-22 16:12:27 -04:00
eric 1c33c34f21 purchase complete notification, contextual wishlist active, fulfillment in signal handler 2013-08-22 14:30:56 -04:00
eric 3bdb755419 move constant to params file to improve import 2013-08-22 14:22:54 -04:00
eric bec85ff82e 1st crack at faq revision 2013-08-20 14:11:11 -04:00
eric ff2d995cd5 minor wording changes 2013-08-20 12:41:39 -04:00
eric 159ad0db05 fix tests, fix bugs found by tests 2013-08-20 01:01:36 -04:00
eric 80d78e624f remove amazon cruft to get current_total correct 2013-08-19 23:23:27 -04:00
eric 18c836d6cd connect purchases to the new Acq table which records purchases 2013-08-19 22:54:43 -04:00
eric 91f7c5f23d Remove some payment dependence on campaign details 2013-08-19 22:52:22 -04:00
eric 26c4d522b4 made the cc_date and test consistent whether its a date or a datetime 2013-08-19 16:01:32 -04:00
eric 4a3cfc6840 Merge branch 'master' into ebook_selling 2013-08-18 18:11:13 -04:00
eric 94eb6aeab0 Demphasize "wishes" on the website in preparation for B2U 2013-08-18 18:10:25 -04:00
eric 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
Raymond Yee c007df0803 Merge branch 'master' into social_auth_password 2013-08-17 17:41:15 -04:00
eric c88f8165ba Merge branch 'master' into ebook_selling 2013-08-16 15:50:24 -04:00
eric 837de35375 selling now works up to purchase page 2013-08-16 15:49:44 -04:00
eric f607ab026d Make sign-up box validate and make error notices less in-your-face 2013-08-15 12:43:20 -04:00
eric d941686c50 now does password reset for a socialauth account 2013-08-14 17:29:38 -04:00
eric c415340356 change Pledge button to Purchase 2013-08-13 23:47:55 -04:00
eric 40bcf62f99 edition.ebooks is always true 2013-08-12 17:22:55 -04:00
eric 2c06139a6f make dollar/day a float validate cc_date_initial, max target prevent changes after launch 2013-08-10 16:29:58 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric 75c32569e2 B2U campaign percentages 2013-08-08 22:32:58 -04:00
eric c2f3910fe8 set approriate open campaign params 2013-08-08 22:32:12 -04:00
eric 587323196a Merge branch 'master' into ebook_selling 2013-08-08 20:02:25 -04:00
eric e64c128f7e Merge branch 'master' into ebook_selling
Conflicts:
	frontend/forms.py
2013-08-08 19:59:29 -04:00
eric 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
eric 69f9e1838f harmonization with master for merge 2013-08-08 18:21:33 -04:00
Raymond Yee 27bc134fa4 Merge branch 'expiring_cc' of github.com:Gluejar/regluit into expiring_cc 2013-08-08 12:28:36 -04:00
Raymond Yee a9b5d51b36 Merge branch 'master' into expiring_cc 2013-08-07 22:59:37 -04:00
Raymond Yee f30d662cd9 Merge branch 'master' into marc_provision 2013-08-07 22:10:01 -04:00
eric 1bd2918bc3 Merge branch 'master' into ebook_selling 2013-08-07 15:21:57 -04:00
eric 69e3ec0722 Add path back to landing in faq menu 2013-08-05 17:41:38 -04:00
eric a1b8ac6dba change Rghts tab to More… tab 2013-08-05 17:40:42 -04:00
eric e78d5c7472 clean up account update notices 2013-08-05 12:18:51 -04:00
eric f2fbfed79e Merge branch 'master' into expiring_cc 2013-08-03 16:19:53 -04:00
eric 84c18ee65d Make sure current staff is described accurately on ungluue.it site 2013-08-01 19:28:20 -04:00
eric cf640baff8 fix problem found with token test 2013-07-29 21:38:16 -04:00
eric 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
eric a5cc59d6f9 filter marc records based on a user's wishlist 2013-07-29 17:59:52 -04:00
eric 9b901d838c token test for marc page 2013-07-29 16:49:50 -04:00
eric 1872180c22 add upload MARC link to work page 2013-07-29 16:35:50 -04:00
eric 8576a7fb7b Make marc records accessible from work page 2013-07-29 15:57:33 -04:00
eric 1307ae7091 move 856 documentation to template from settings 2013-07-26 22:31:41 -04:00
eric 2c75ecb9ce html nits 2013-07-26 21:01:19 -04:00
eric eff880ce0b get license from database, not from the record submitter 2013-07-26 19:52:15 -04:00
eric 91e2d41b67 moved the link target pref into a library prefs only table 2013-07-26 18:30:45 -04:00
Andromeda Yelton d2f3a2547e change default 2013-07-26 16:12:24 -04:00
Andromeda Yelton 767733ea26 anon user friendly 2013-07-26 16:12:10 -04:00
Andromeda Yelton 32f6546a04 spinny thing should go away if they want to use the form again 2013-07-26 08:59:31 -04:00
Andromeda Yelton 8281d99563 edge cases 2013-07-25 10:25:14 -04:00
Andromeda Yelton 3a9e588fc7 replacing confusing field names 2013-07-25 10:18:36 -04:00
Andromeda Yelton da08afd0b8 now users can select the MARC records they want and get as single download 2013-07-24 14:52:01 -04:00
Andromeda Yelton ec57b7efee user preference affects which MARC records we make available 2013-07-23 16:07:47 -04:00
Andromeda Yelton bb5c1079b6 user can now change marc preferences 2013-07-23 12:23:04 -04:00
Andromeda Yelton 287f017551 documentation for CC/PD MARC records 2013-07-22 14:23:59 -04:00
Andromeda Yelton f18fc27f91 Merge branch 'marc_provision' of github.com:Gluejar/regluit into marc_provision 2013-07-19 15:34:53 -04:00
eric 1bebec42af what about public domain ebooks? 2013-07-19 13:13:53 -04:00
eric 4c62a2b555 catch bad file errors 2013-07-19 12:47:36 -04:00
Andromeda Yelton 9cb3dcdadf documenting how you get MARCXML from LOC 2013-07-19 09:56:47 -04:00
Andromeda Yelton 516c8c768a I can harvest files from the db instead of tempting error by entering them twice 2013-07-18 16:36:01 -04:00
Andromeda Yelton 0e143b15ba persist information about where to find AWS files 2013-07-18 15:49:54 -04:00
Raymond Yee 37ce78fda2 Merge branch 'master' into expiring_cc 2013-07-17 18:12:30 -07:00
Andromeda Yelton 54e422e217 parametrizing formats and license choices, bugfixing 2013-07-17 13:03:35 -04:00
Andromeda Yelton 87c27cecee wiring ungluify_record to front end and s3 2013-07-17 10:34:01 -04:00
Andromeda Yelton e5a907644c Merge branch 'master' into marc_provision 2013-07-16 11:43:28 -04:00
Andromeda Yelton fe2e3b72c5 argh 2013-07-16 11:42:17 -04:00
Raymond Yee dabaa2f843 update tests to account for new events (now stripe allows multiple cards/customer and now generates card related events in addition to customer events) 2013-07-15 14:52:29 -07:00
Andromeda Yelton e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04:00
Andromeda Yelton 5f10047691 clarifying 2013-07-15 08:38:20 -04:00
Andromeda Yelton bbeb086cbc bugfixing 2013-07-08 15:54:36 -04:00
Raymond Yee 46d1d4f767 Merge branch 'master' into expiring_cc
Conflicts:
	payment/models.py
	payment/tests.py
2013-07-08 10:52:44 -07:00
Andromeda Yelton 214467e8f1 display available MARC records 2013-07-08 11:14:09 -04:00
Andromeda Yelton 6e853fc8f9 exclude google books, align error message with page text 2013-07-05 09:05:26 -04:00
Andromeda Yelton 8ff9bfc52f filesize under Amazon SES 10MB limit 2013-07-05 08:43:02 -04:00
eric c88e002ccb get manage campaign to work a second time 2013-07-01 03:20:58 -04:00
eric 7eeb114d03 tweek status messages 2013-06-29 23:14:33 -04:00
Raymond Yee 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
Raymond Yee 221a4bbfd2 Merge pull request #186 from Gluejar/fix_worklist_ordering
remove conflicting "order by"
2013-06-27 13:22:21 -07:00
eric 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
eric b0f4eda221 show offers on work page 2013-06-27 13:10:33 -04:00
eric 98ba975eec remove conflicting "order by" 2013-06-27 12:00:47 -04:00
eric 51c86867a0 don't pop a param that isn't there 2013-06-27 10:31:01 -04:00
eric f2f02237a8 fix KeyError at source, not in test 2013-06-26 14:36:04 -04:00
Andromeda Yelton 14051e2f21 pop kindle email from session after use 2013-06-26 09:46:56 -04:00
Andromeda Yelton 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
Andromeda Yelton 8395a4afb4 other things have logos, readmill should too 2013-06-26 09:31:26 -04:00
eric bb5bc2112d add readmill and send to kindle instructions 2013-06-25 17:42:06 -04:00
eric 6dd6d7de5a add instructions and png for embedded browser 2013-06-25 17:41:14 -04:00
eric e92532524f merge session.next_page into cookie.next functionality 2013-06-25 16:02:12 -04:00
eric fbe37359f2 simplify kindle_config view and add link to the work page 2013-06-25 16:01:08 -04:00
eric ff65b6b7dd validation nit 2013-06-25 15:59:00 -04:00
eric f79c456f53 I don't like putting None in a dict, especially when it bloats the code 2013-06-25 01:35:09 -04:00
eric 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
eric e33077138f move ebook id to title attribute 2013-06-25 01:09:36 -04:00
Andromeda Yelton bcec6d4914 no smtp auth failures for you 2013-06-24 15:42:51 -04:00
Andromeda Yelton aa7e5bfe5e kindle instructions 2013-06-24 14:52:03 -04:00
Andromeda Yelton 50fce4bb1a sharing->email 2013-06-24 14:28:01 -04:00
Andromeda Yelton 1380040bd2 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-24 13:56:39 -04:00
Andromeda Yelton 69f0451bea segregate flows of one-click and information-seeking options, address feedback 2013-06-24 13:53:28 -04:00
Andromeda Yelton 3c950966bc Merge branch 'master' into simpler_download 2013-06-24 08:36:51 -04:00
eric 5d1f6fa224 quick fix for readmill 2013-06-20 14:34:44 -04:00
eric 5fe6f5d3a0 no campaigns *right now* 2013-06-18 09:39:57 -04:00
eric 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
eric 1ea77acf09 move latest ending logic from form to model/settings 2013-06-17 18:53:28 -04:00
Andromeda Yelton 9e5f41968b download options should be sensitive to filetype 2013-06-17 18:53:28 -04:00
Andromeda Yelton cd504780e6 redesigning information flow to address feedback 2013-06-17 18:53:28 -04:00
Andromeda Yelton 8fd153f085 rewiring to remove buttons 2013-06-17 18:53:28 -04:00
eric 1e310e8896 fix overzealous global replace 2013-06-14 23:09:55 -04:00
Andromeda Yelton 7070f033e7 download options should be sensitive to filetype 2013-06-12 15:24:26 -04:00
Andromeda Yelton 2337676e1c redesigning information flow to address feedback 2013-06-12 15:11:43 -04:00
Andromeda Yelton 8e00242c35 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-12 14:05:46 -04:00
Andromeda Yelton 0819c77312 rewiring to remove buttons 2013-06-12 14:05:30 -04:00
eric a5af94be7a add user agent inspection 2013-06-10 12:58:19 -04:00
Andromeda Yelton e21b002b6a Merge branch 'master' into simpler_download 2013-06-10 11:59:19 -04:00
Andromeda Yelton 704fdc5b60 Merge branch 'simpler_download' of github.com:Gluejar/regluit into simpler_download 2013-06-10 11:58:03 -04:00
Andromeda Yelton 3b159db315 email validation 2013-06-10 11:57:59 -04:00
Andromeda Yelton afe7e3ca54 kindle sending should only fire if we have an address on file 2013-06-10 11:23:06 -04:00
eric 1a6107d025 this is how you log an exception 2013-06-10 11:12:54 -04:00
Andromeda Yelton 778983efb5 see if this fixes the formatting error 2013-06-10 11:08:48 -04:00
Andromeda Yelton ff8f063b7f provide backlink 2013-06-10 09:57:18 -04:00
Andromeda Yelton 8eb45252b6 correctly log exception 2013-06-10 09:57:12 -04:00
Andromeda Yelton 2fb93dbbef login or account creation after kindle sending now adds kindle email to profile 2013-06-10 09:29:18 -04:00
Andromeda Yelton e71ccfcfa5 add kindle email to user profile after login or account creation 2013-06-07 11:22:54 -04:00
Andromeda Yelton b23b617e4b prompt not-logged-in users for kindle delivery email 2013-06-07 10:19:06 -04:00
Andromeda Yelton b98a36d8e8 should be a view for coming-soon campaigns 2013-06-05 15:08:29 -04:00
Andromeda Yelton 6dbdc243e3 prevent overflow of books onto second line 2013-06-05 15:06:07 -04:00
Andromeda Yelton c8ff245e80 show coming soon campaigns if none active, or skip section if none initialized either 2013-06-05 15:05:14 -04:00
Andromeda Yelton 63d87434ab android instructions were slightly wrong. tested, fixed. 2013-06-05 14:53:14 -04:00
Andromeda Yelton 72b0977914 clarifying filetypes 2013-06-05 11:21:52 -04:00
Andromeda Yelton 1fa713cf12 encourage downloading of readmill app 2013-06-05 11:15:05 -04:00
Andromeda Yelton 2f3f8997ad make sure graceful degradation works, fix bugs 2013-06-05 11:06:07 -04:00
Andromeda Yelton f4ffd5da6f Merge branch 'master' into simpler_download 2013-06-04 10:48:49 -04:00
Andromeda Yelton 8a859e6757 provide feedback, protect against file-too-big error 2013-06-04 10:22:11 -04:00
Andromeda Yelton 0273a907da skeleton of error handling 2013-06-03 17:18:42 -04:00
eric dd72b0d997 add the downoad_count to form exclude 2013-06-03 16:23:21 -04:00
Andromeda Yelton ad69580b2d PEP 8, PEP 328. I feel better now. 2013-06-03 12:31:39 -04:00
Andromeda Yelton 4354d3abee now kindle sending usually works 2013-06-03 11:17:25 -04:00
Andromeda Yelton b3181f0e22 first pass at sending kindle files as attachments 2013-05-31 17:15:22 -04:00
Andromeda Yelton 236302342e users can add and change kindle email 2013-05-31 15:19:58 -04:00
Andromeda Yelton e75a7b9642 skeleton of send-to-kindle support 2013-05-31 11:34:51 -04:00
Andromeda Yelton c797de93e6 download instruction buttons now work via ajax too 2013-05-31 10:46:26 -04:00
Andromeda Yelton 792d977a61 download page now prettifies via hijax links as well as download page 2013-05-30 09:17:34 -04:00
Andromeda Yelton b5fd91006b jquery to hide/show downloading options 2013-05-28 09:23:57 -04:00
Andromeda Yelton b943e82012 CSS for streamlined downloads 2013-05-24 14:54:05 -04:00
Andromeda Yelton 177f60be0d preparing HTML for streamlined downloading experience 2013-05-24 14:16:13 -04:00
Raymond Yee 31b978bb25 Merge branch 'master' into expiring_cc 2013-05-20 11:36:42 -07:00
Andromeda Yelton 830e1248c3 probably more efficient 2013-05-17 11:30:22 -04:00
Andromeda Yelton 2ecf4d94e4 work lists with active campaigns should highlight them 2013-05-16 11:43:25 -04:00
eshellman 8dbf20e143 added submit warning 2013-05-16 11:25:20 -03:00
eric f2e6d10469 allow new edition id oclc but no isbn; allow new publishernames 2013-05-13 17:32:30 -04:00
Raymond Yee 73290fdfc1 fixed up text for account_active notice -- even though at this point, it's not being fired 2013-05-08 16:49:43 -07:00
Raymond Yee b224e99346 Merge branch 'master' into expiring_cc 2013-05-08 14:05:57 -07:00
thatandromeda 97bc857eab Merge pull request #168 from Gluejar/degruyter_stub_template
put status information in de gruyter initialized campaigns
2013-05-06 13:04:50 -07:00
eric 1788705bd7 fix bad links from stupid robots [#49219467] 2013-05-03 14:48:36 -04:00
eric 6b7fb7fd00 fix ebook url in reverse method 2013-04-26 17:49:57 -04:00
Raymond Yee db1ee70647 fixed up notice texts for account_expired
also made sure that user is properly passed to sender of notices
2013-04-26 10:50:28 -07:00
Raymond Yee 7265488484 Merge branch 'master' into expiring_cc 2013-04-26 08:58:47 -07:00
eshellman c5517df1c9 Merge pull request #167 from Gluejar/less_officious_comments
Less officious comments
2013-04-25 15:26:47 -07:00
Raymond Yee a375112e72 Merge branch 'master' into expiring_cc 2013-04-24 13:50:33 -07:00
thatandromeda babeb9e4aa Merge pull request #164 from Gluejar/manage_book_data
Manage book data
2013-04-24 11:31:07 -07:00
Andromeda Yelton e7cea6c8f4 clarifying 2013-04-24 14:30:39 -04:00
Andromeda Yelton 3b44e643d5 put status information in de gruyter initialized campaigns 2013-04-24 14:26:23 -04:00
Andromeda Yelton aca759447d test for staffness in template 2013-04-24 11:28:05 -04:00
eric 08d4adf50b implement adromeda suggestions 2013-04-24 11:14:25 -04:00
Andromeda Yelton 80ee477198 disambiguate staff and RH 2013-04-23 10:22:08 -04:00
Andromeda Yelton 516f867d87 removing word 'official' 2013-04-23 10:07:59 -04:00
eric fb77f5a372 fixed ebook admin to allow setting of counts, etc 2013-04-20 10:34:44 -04:00
eric a2606b2e08 move download count display to work infobox and rh_tools 2013-04-20 10:08:10 -04:00
eric de442c8f63 count downloads. migrate schemas! 2013-04-20 00:02:36 -04:00
eric aaaa9e0e56 need a link to repeat the proces 2013-04-18 11:29:34 -04:00
Raymond Yee aac69cf64c Fixed up account_expiring text...next step is to fix up account_expired and account_active 2013-04-17 15:43:44 -07:00
Raymond Yee 3b900e2328 Align names signals.py with those in the short.txt for notices 2013-04-17 13:24:43 -07:00
Raymond Yee 86dcdea1b7 updated text for cc notices 2013-04-17 11:42:49 -07:00
eric 11381a99c9 add edition management links 2013-04-16 16:46:45 -04:00
eric 31a1f46666 add split works funtionality 2013-04-16 16:46:25 -04:00
eric 3c61e292d9 Fix edition editing, add other identifiers 2013-04-13 10:59:11 -04:00
Raymond Yee 9cc2e3121e Merge branch 'master' into expiring_cc 2013-04-10 09:14:29 -07:00
Raymond Yee d977fd6338 Merge pull request #161 from Gluejar/fix_authcanceled
add a special response for failed social auths
2013-04-10 08:38:14 -07:00
eshellman 7e95d5f0d7 Merge pull request #162 from Gluejar/rh_is_not_user_friendly
altering term 'rights holder' in places where non-RHs are likely to enco...
2013-04-09 12:22:40 -07:00