Raymond Yee
|
0788dee930
|
Merge pull request #189 from Gluejar/use_google_books_api_key
Adding Google books api key to the search
|
2013-07-02 08:04:59 -07:00 |
|
Raymond Yee
|
ac6f57fb31
|
Adding Google books api key to the search
|
2013-07-02 08:00:01 -07:00 |
|
Raymond Yee
|
d753d4bfa3
|
Merge pull request #188 from Gluejar/google_books_search
Trying a new key for prod.py too to see whether that will fix breakage i...
|
2013-07-02 07:43:02 -07:00 |
|
Raymond Yee
|
63a3bac876
|
Trying a new key for prod.py too to see whether that will fix breakage in api calls
|
2013-07-02 07:37:12 -07:00 |
|
Raymond Yee
|
4333a480de
|
Testing out new Google Books API key on just
|
2013-07-02 07:24:18 -07: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
|
ccbc78a10c
|
added a first pass for payment.tests.TransactionTest.test_paymentmanager_charge to illustrate use of PaymentManager.charge() -> hardwired for stripelib right now....
|
2013-06-28 16:05:19 -07:00 |
|
Raymond Yee
|
172ed2f557
|
Merge branch 'master' into instant_charge
|
2013-06-28 14:10:50 -07:00 |
|
eshellman
|
5417f3b7d2
|
Merge pull request #187 from Gluejar/send_to_kindle_size_patch
patch to limit attempts to send to kindle files that are on the order of...
|
2013-06-27 14:19:51 -07: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 |
|
Raymond Yee
|
253735f03f
|
Merge pull request #185 from Gluejar/simpler_download
don't pop a param that isn't there
|
2013-06-27 07:37:16 -07:00 |
|
eric
|
51c86867a0
|
don't pop a param that isn't there
|
2013-06-27 10:31:01 -04:00 |
|
Raymond Yee
|
3ff53dd5bc
|
first pass at stripelib.Processor.Pay
|
2013-06-26 18:46:30 -07:00 |
|
Raymond Yee
|
d3166d3aef
|
Merge branch 'master' into instant_charge
|
2013-06-26 17:17:07 -07:00 |
|
eshellman
|
5a207bf4e8
|
Merge pull request #181 from Gluejar/simpler_download
Simpler download. Yay.
|
2013-06-26 11:39:39 -07:00 |
|
eric
|
f2f02237a8
|
fix KeyError at source, not in test
|
2013-06-26 14:36:04 -04:00 |
Andromeda Yelton
|
b063fe6c3f
|
don't fail for spurious reason
|
2013-06-26 11:25:35 -04:00 |
|
Andromeda Yelton
|
14051e2f21
|
pop kindle email from session after use
|
2013-06-26 09:46:56 -04:00 |
|
Andromeda Yelton
|
02899d332f
|
can has readmill logo
|
2013-06-26 09:46:47 -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 |
|
Raymond Yee
|
701533117f
|
fixed some seemingly bad defaults in baseprocessor
basic pass at payment.manager.PaymentManager.charge
|
2013-06-25 15:34:20 -07: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 |
|
Raymond Yee
|
867e745f75
|
Merge branch 'master' into instant_charge
|
2013-06-25 11:26:39 -07:00 |
|
Raymond Yee
|
bf516c96e8
|
Merge pull request #184 from Gluejar/new_stripe_version
dead pledge code cleaned up.
|
2013-06-25 11:25:03 -07:00 |
|
Raymond Yee
|
cae7f6d862
|
also delete the commented out pledge method
|
2013-06-25 11:23:21 -07:00 |
|
Raymond Yee
|
22dc844b07
|
Getting rid of tests that call PaymentManager.pledge
|
2013-06-25 11:05:52 -07:00 |
|
Raymond Yee
|
1725331aa0
|
cleaning out some old refs to Paypal
|
2013-06-25 10:39:49 -07: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 |
|
Raymond Yee
|
5e3fca0282
|
in stripelib.py, I am resurrecting PledgeScenarioTest
in manager.py, a very rough first pass at charge -- not working yet, but doesn't break things either
|
2013-06-24 16:19:12 -07: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 |
|
Raymond Yee
|
f6499d7dc5
|
Merge branch 'master' into instant_charge
|
2013-06-24 09:18:52 -07:00 |
|
Raymond Yee
|
0950c3bc40
|
Merge branch 'master' into new_stripe_version
|
2013-06-24 09:18:31 -07:00 |
|
Raymond Yee
|
86caa9b3ed
|
Making changes to fix breakage in core.tests.BookLoaderTests.test_add_by_isbn
2000-07-01 -> 2000
Ace Trade -> Penguin
|
2013-06-24 08:04:36 -07:00 |
|
Andromeda Yelton
|
3c950966bc
|
Merge branch 'master' into simpler_download
|
2013-06-24 08:36:51 -04:00 |