90c080827c
Merge branch 'fix_pledge_nits' of github.com:Gluejar/regluit into fix_pledge_nits
2012-10-14 12:03:54 -04:00
ed6e72ec0d
preset no-premium, add validation message that should no longer arise [ fix #37720723 ]
...
so essentially this fixes the bug in two ways
2012-10-14 11:33:13 -04:00
f152bc97b1
Merge branch 'reuse_account'
...
Conflicts:
frontend/views.py
2012-10-13 16:19:45 -07:00
5bde0da8ca
[ #37716025 ] reuse a user's credit card
2012-10-13 13:45:46 -04:00
674637f616
we weren't checking that request.user==transaction.user
2012-10-13 13:40:36 -04:00
dbacb5a96d
max_amount, not amount before the authorization
2012-10-13 13:38:39 -04:00
f83ff09d05
plug security hole
2012-10-13 00:46:34 -04:00
cc47a28687
removing name and dedication also not done very well
2012-10-12 23:43:51 -04:00
957d73c462
fixed problem modifying anonymous = true
2012-10-12 22:24:58 -04:00
b0858ea12e
add a payment.manager.PaymentManager.retrieve_or_make_accounts
...
Made a change in make_account signature to allow for token=None
2012-10-12 07:44:50 -07:00
4ab64c2a68
Merge branch 'master' into pledge_pretty_stick_merge
...
Conflicts:
frontend/templates/faq_pledge.html
static/css/sitewide.css
static/less/sitewide.less
I took frontend/templates/faq_pledge.html from master.
I combined less/css to have def'n of both .central and li.checked
2012-10-10 16:46:11 -07:00
cf4d334b71
Merge pull request #39 from Gluejar/stripe_exception
...
Stripe exception
2012-10-09 07:54:31 -07:00
ff221472ee
hardened claim form handling [ fix #37274037 ]
2012-10-07 10:58:59 -04:00
447b5973c2
Add ProcessorError
...
Start elaborating StripeClient testing
2012-10-06 09:51:43 -07:00
2bea7e89f4
Merge branch 'master' into pledge_pretty_stick
...
Conflicts:
frontend/templates/pledge.html
static/css/pledge.css
static/less/pledge.less
2012-10-05 15:06:37 -04:00
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04:00
b07c49a87e
Merge branch 'relaunch_ry' of github.com:Gluejar/regluit into pledge_pretty_stick
...
Conflicts:
requirements_versioned.pip
2012-10-03 11:43:15 -04:00
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
81f45984e8
prevent campaign launch button from being visible to non-staff during preview
2012-09-27 13:11:19 -04:00
a48f61793d
only staff can launch campaigns during preview
2012-09-27 12:14:09 -03:00
8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
2012-09-22 23:43:59 -04:00
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04:00
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
Andromeda Yelton
eric
Raymond Yee