Commit Graph

1544 Commits (69f9e1838f27fa2a05e31835483e462cf16c8406)

Author SHA1 Message Date
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 84c18ee65d Make sure current staff is described accurately on ungluue.it site 2013-08-01 19:28:20 -04:00
Andromeda Yelton 6e853fc8f9 exclude google books, align error message with page text 2013-07-05 09:05:26 -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
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
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 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 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 0819c77312 rewiring to remove buttons 2013-06-12 14:05:30 -04:00
Andromeda Yelton e21b002b6a Merge branch 'master' into simpler_download 2013-06-10 11:59:19 -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
Andromeda Yelton ff8f063b7f provide backlink 2013-06-10 09:57:18 -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 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 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 8a859e6757 provide feedback, protect against file-too-big error 2013-06-04 10:22:11 -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