b4c1d09e88
Merge pull request #64 from Gluejar/prepopulate_ack_name
...
Prepopulate ack name
2012-10-23 10:35:40 -07:00
ef4e35d174
is_preview is in sitewide context, do not need to add here
2012-10-23 10:24:02 -04:00
f9f19b2043
if last transaction ack_name was blank, use username as ack_name
2012-10-23 09:37:00 -04:00
79aefd4c91
nope, need to set the values over here
2012-10-18 14:13:42 -04:00
4a6a392481
ack_name and anonpref are form initial values, not context variables
2012-10-18 13:57:39 -04:00
64681d95f7
ohhh that's how class-based views work
2012-10-17 12:11:54 -04:00
96918d60a5
if not modifying pledge use ack data from previous transaction to prefill ack boxes [ #37939351 ]
2012-10-17 11:54:29 -04:00
3831a1ea59
clarifying kwarg
2012-10-16 11:36:51 -04:00
ae9a541ed5
too many ways we might add to wishlist to test for. adding argument for notification. [[ #37780515 ]
2012-10-16 11:06:13 -04:00
f7615ffa7c
fix bug where modify doesn't initialize to previous premium
2012-10-15 11:39:09 -04:00
824b6d3ff7
Merge pull request #54 from Gluejar/slideshow
...
Slideshow
2012-10-15 07:04:43 -07:00
1db22071fd
slideshow now pulls from recommended user
2012-10-15 00:59:46 -04:00
6c0906192f
Add exception message to when there is an error in creating new account
2012-10-14 21:42:09 -07:00
4484e504f8
resolve merge conflicts
2012-10-15 00:31:45 -04:00
1964eec782
add links to account management page [ #37674453 ]
2012-10-15 00:16:56 -04:00
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
168df09ac4
Display error message if make_account fails
2012-10-14 19:47:40 -07:00
bde8e98518
create empty manage account view
2012-10-14 15:31:18 -04:00
1ae6f463c9
don't need to feature successful campaigns in slideshow
2012-10-14 15:01:10 -04:00
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
Raymond Yee
Andromeda Yelton
eric