Commit Graph

3687 Commits (69f0451bea8f51a3a7fa9904e54b671fcbdf47c1)

Author SHA1 Message Date
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
Raymond Yee 1c86a0ae5a I'm going to modify test for reflect readmill change -- it seems like there is no extra readmill button for test scenario 2013-06-20 14:17:47 -07:00
Raymond Yee 93e0e8593c Merge pull request #183 from Gluejar/fix_readmill_redirect
need this to work
2013-06-20 13:35:48 -07: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
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 e6e2321344 Merge branch 'simpler_download' of https://github.com/Gluejar/regluit into simpler_download
Conflicts:
	frontend/views.py
2013-06-10 11:15:21 -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
eshellman f5bfbb3cf0 Merge pull request #182 from Gluejar/tidy_landing_page
Tidy landing page- looks good
2013-06-06 09:51:03 -07: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
thatandromeda 43cf61a7e8 Merge pull request #180 from Gluejar/fix_ebook_submission
add the downoad_count to form exclude
2013-06-04 07:48:14 -07: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 92b4a36a41 archive now presenting both http and https 2013-06-03 16:29:52 -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 2338240540 add kindle email to profile. requires migration 2013-05-31 11:35:17 -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
eshellman 65d88d68b5 Merge pull request #179 from Gluejar/work_description_editable
make work description editable in admin
2013-05-28 07:33:22 -07:00
Andromeda Yelton ffc813d8ee blank descriptions now legit 2013-05-28 10:19:01 -04:00
Andromeda Yelton 25c6784943 language editable too 2013-05-28 10:06:21 -04:00
Andromeda Yelton 38183fd288 make work description editable in admin 2013-05-28 09:27:26 -04:00
Andromeda Yelton b5fd91006b jquery to hide/show downloading options 2013-05-28 09:23:57 -04:00