Commit Graph

661 Commits (e5a162061da1e72ed2d8d87252d52eec7e3c5c77)

Author SHA1 Message Date
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 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 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
eric 837de35375 selling now works up to purchase page 2013-08-16 15:49:44 -04:00
eric d941686c50 now does password reset for a socialauth account 2013-08-14 17:29:38 -04:00
eric 7f325c0775 Finish B2U Campaign setup 2013-08-09 19:00:54 -04:00
eric c2f3910fe8 set approriate open campaign params 2013-08-08 22:32:12 -04:00
eric e64c128f7e Merge branch 'master' into ebook_selling
Conflicts:
	frontend/forms.py
2013-08-08 19:59:29 -04:00
eric 1bd2918bc3 Merge branch 'master' into ebook_selling 2013-08-07 15:21:57 -04:00
eric a5cc59d6f9 filter marc records based on a user's wishlist 2013-07-29 17:59:52 -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 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 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
eric 4c62a2b555 catch bad file errors 2013-07-19 12:47:36 -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
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 e3b6288e23 iterating unglify script, starting to integrate into front end 2013-07-15 16:35:41 -04: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
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
eric fbe37359f2 simplify kindle_config view and add link to the work page 2013-06-25 16:01:08 -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
Andromeda Yelton bcec6d4914 no smtp auth failures for you 2013-06-24 15:42:51 -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