Commit Graph

2551 Commits (8d80be5248f9fee8e276752c5b55dd4763b7228c)

Author SHA1 Message Date
eric 86ef74662b add author role selector
Previously, to change an author role, you had to delete and add the
author.
2015-08-21 13:47:04 -04:00
Raymond Yee c6eff142ae Merge pull request #512 from Gluejar/feedback-by-webpage
replace email support links with form [finish #86803178]
2015-08-19 08:01:12 -07:00
eric 3d923407e4 replace email support links with form 2015-08-18 11:03:49 -04:00
eric 148c2b1021 add notes about meta referrer 2015-08-18 09:53:51 -04:00
Raymond Yee d252199dec Merge branch 'master' into publisher-opds 2015-08-06 12:57:43 -07:00
eric 06c23db9cd that was an easy fix 2015-08-06 14:49:41 -04:00
eric 11cf5b2869 Merge branch 'master' into publisher-opds
Conflicts:
	api/urls.py
2015-08-06 13:39:16 -04:00
eric cc21ac2edb add publisher feed
but don't expose it
2015-08-03 16:58:02 -04:00
eric 5185410825 get tests to pass 2015-07-28 09:41:55 -04:00
eric 44cd1eb19b add relation support to edition edit 2015-07-28 00:52:21 -04:00
eric 7c31bb115e fix authors.remove 2015-07-27 23:44:34 -04:00
eric e386dccb49 show non-author relations 2015-07-27 23:21:11 -04:00
Raymond Yee 7b3360b235 Merge pull request #497 from Gluejar/catch_stk_timeouts
move mock ebook class to acq
2015-07-09 14:09:24 -07:00
eric f19a1551e4 add redirect for new users 2015-07-09 16:32:52 -04:00
eric 449f38fe7d move mock ebook class to acq 2015-07-09 15:08:16 -04:00
Raymond Yee e147b3fea6 Merge pull request #494 from Gluejar/catch_stk_timeouts
Catch send-to-kindle timeouts
2015-07-08 13:36:12 -07:00
Raymond Yee 9ffb96559b rewrote the mock ebook to make the logic behind it clearer 2015-07-08 13:31:35 -07:00
Raymond Yee 685229ae4c Merge pull request #495 from Gluejar/fix_subjects_template
forgot about admin urls
2015-07-03 09:50:53 -07:00
eric 741763e8b6 handle connection timeout 2015-07-01 22:07:04 -04:00
eric df2706993d mock ebook for stk 2015-07-01 22:06:33 -04:00
eric 13093c9c4b forgot about admin urls
when updating url tag syntax
2015-07-01 20:57:25 -04:00
Raymond Yee 153a582cf0 Merge pull request #484 from Gluejar/add_yahoo
Add yahoo sign-in
2015-06-17 16:39:47 -07:00
Raymond Yee 3b575d10f6 changed default python social auth exception handling to catch the exception and send backend/error message to error page.
I've decided to display the backend but not the error message.
2015-06-17 15:39:27 -07:00
eric f1c74fe7da made search easier
when no local results, automatically invoke google books search
2015-06-07 18:55:49 -04:00
eric e6eaa24440 eliminate referrer leakage 2015-06-04 15:15:59 -04:00
Raymond Yee 90df82954e Merge pull request #491 from Gluejar/handle_bad_ebook_links
handle the bad link error  (Se test run locally -- so at the very least, this PR should not be destabilizing...will deploy and then test on some links.)
2015-06-03 07:24:03 -07:00
Raymond Yee 6ec36e001d adding a colon to error message
"Well, this is awkward our ebook link is bad" to "Well, this is awkward: our ebook link is bad"
2015-06-03 07:02:49 -07:00
eric 499b67d3e1 handle the bad link error 2015-06-02 23:45:30 -04:00
eric 15f6599331 reorder sections 2015-05-11 15:46:17 -04:00
eric afbe8ced90 edits 2015-05-11 11:35:44 -04:00
eric dda48c1161 opinionated rewrite 2015-05-08 13:22:25 -04:00
eric 4272c8ddb2 update welcome message 2015-05-06 16:14:13 -04:00
eric 07cfe361b2 add yahoo signin 2015-05-06 16:13:55 -04:00
eric 266378b7ed fix dotted url names 2015-04-28 14:13:18 -04:00
eric 877eac1af2 stray file? 2015-04-27 23:24:19 -04:00
eric 29108128a5 global change url syntax 2015-04-27 23:24:02 -04:00
Raymond Yee fe6d880957 Merge pull request #477 from Gluejar/view_as_plain
View as plain
2015-04-17 13:57:47 -07:00
Raymond Yee f676d116aa Merge pull request #476 from Gluejar/purchase_button
fix exception when no radio
2015-04-17 13:36:39 -07:00
Raymond Yee 46574801f7 I think now we have a Facebook profile link that works for both the global Facebook user ids and app scoped user ids. 2015-04-17 11:15:07 -07:00
eric 43ff601def I was in a hurry 2015-04-17 13:00:26 -04:00
eric bc16323652 fix profile link 2015-04-17 12:37:44 -04:00
eric f7bfdfbbc4 fix exeption when no radio
The exception we've seen is caused by clicking purchase for b2u without
picking a radio button; before gifting there was always a button
checked.
2015-04-15 18:31:46 -04:00
eric 5644d0ea37 add "view_as parameter" 2015-04-11 08:25:41 -04:00
eric e87294d442 twitter and facebook settings 2015-04-09 11:44:48 -04:00
eric db457a948f fixed user menu, bootstrapized learn more 2015-04-09 09:21:59 -04:00
eric 9e24dfaf7d change all signin buttons to bootstrap buttons 2015-04-08 23:32:36 -04:00
eric a8cab6c0ae get google oauth2 working 2015-04-07 22:55:30 -04:00
eric 27af1780ab month summary was including previous year 2015-03-31 13:51:22 -04:00
eric 78c2bb2dfc add free count 2015-03-31 13:50:39 -04:00
Raymond Yee 85d057eb7d Merge pull request #469 from Gluejar/improve_redemption
add case for correct user already has redeemed
2015-03-19 10:41:31 -07:00