Commit Graph

3046 Commits (3da9ce67341ac9d395a816dc5a2a1384ea3735c6)

Author SHA1 Message Date
eric 476ce46dab display and notifications of acknowledgements 2012-10-12 23:45:09 -04:00
eric cc47a28687 removing name and dedication also not done very well 2012-10-12 23:43:51 -04:00
eric 82a35d0ec2 simplified reconcile_pledge javascript a bit
I went over this with a fine-tooth comb looking for a bug that wasn't
there
2012-10-12 22:31:18 -04:00
eric 6a1646f749 fixed bad method signature 2012-10-12 22:25:48 -04:00
eric 957d73c462 fixed problem modifying anonymous = true 2012-10-12 22:24:58 -04:00
Raymond Yee 3faabc1fdc Add a convenience script to come up with commands to drop all tables:
drop_tables.sh | django-admin.py dbshell

to actually drop tables -- USE WITH CAUTION
2012-10-12 17:28:42 -07:00
eric be3f989d36 although "up_or_down" not distinguished, should make it return what it says it is 2012-10-12 18:18:55 -04:00
eric 7d21e60984 if view expects one acct peruser, dont give it multiple accounts! [#36797599] 2012-10-12 16:03:50 -04:00
Andromeda Yelton b65e6d4d1d note anonymity in thank-you page 2012-10-12 15:21:14 -04:00
Andromeda Yelton 034439d39b should be focus, not click 2012-10-12 15:20:23 -04:00
Andromeda Yelton dd7334b54b explanation of CVC [#36797599] 2012-10-12 14:57:38 -04:00
Andromeda Yelton f98fc0b7a6 widening CC number box, rounding all corners on error display [#36797599] 2012-10-12 14:23:54 -04:00
Andromeda Yelton e155165eb2 fancifying handling of MM and YYYY [#36797599] 2012-10-12 14:23:31 -04:00
eric 1c5500a4e1 set NONPROFIT.is_on to false for launch 2012-10-12 13:47:43 -04:00
Raymond Yee 2af1866e14 Merge pull request #48 from Gluejar/account_constraint
[#37567927] enforce constraint of at most 1 active Account / user of giv...
2012-10-12 09:08:43 -07:00
Raymond Yee 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
Raymond Yee d92b563d18 Merge branch 'master' into account_constraint 2012-10-12 07:11:24 -07:00
thatandromeda f328ccfa78 Update frontend/templates/press.html 2012-10-12 09:56:50 -03:00
Raymond Yee b281aca869 [#37567927] enforce constraint of at most 1 active Account / user of given host
-> migration was missing before from an earlier commit -- add in now.
2012-10-11 16:36:24 -07:00
Raymond Yee 53d09a6ef7 Merge pull request #47 from Gluejar/collect_address_info
Collect address info
2012-10-11 13:17:35 -07:00
Andromeda Yelton df14eaeef0 Merge branch 'master' into collect_address_info
Conflicts:
	static/css/sitewide.css
	static/less/sitewide.less
2012-10-11 15:57:54 -04:00
Andromeda Yelton cc4c190d73 adding address collection to fund_the_pledge 2012-10-11 13:49:56 -04:00
Raymond Yee ca0158acd9 Merge pull request #45 from Gluejar/fix_cover_images
created editions may have cover images but not google books ids
2012-10-11 07:31:31 -07:00
Raymond Yee 3c01c3c9dd Merge pull request #46 from Gluejar/faq_edit
small change per AM
2012-10-11 07:31:14 -07:00
Andromeda Yelton 50d506b09d small change per AM 2012-10-11 09:59:40 -04:00
Andromeda Yelton ec0ba04d76 created editions may have cover images but not google books ids 2012-10-11 09:48:55 -04:00
Raymond Yee ae4143c221 Merge pull request #38 from Gluejar/campaign_stats
[#37388341] First crack at displaying campaign data -- per Melinda's request
2012-10-10 20:07:12 -07:00
Raymond Yee 1b3852777d Merge pull request #44 from Gluejar/sn_update
Updated Sn script now works for latest UI changes in pledging
2012-10-10 20:05:52 -07:00
Raymond Yee f15dab1551 Updated Sn script now works for latest UI changes in pledging 2012-10-10 19:54:56 -07:00
Raymond Yee 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
Raymond Yee 8b38da57bc Merge branch 'nuke_paypal_refs' of github.com:Gluejar/regluit 2012-10-10 15:04:56 -07:00
Raymond Yee f968caf561 Revert "Revert "slowly progressing on PledgeUiTest""
This reverts commit c0107b2192.
2012-10-10 13:59:04 -07:00
Andromeda Yelton 599606d2ce removing paypal and amazon references [#36554899] 2012-10-10 14:34:59 -04:00
Andromeda Yelton 6893b549a2 first pass at adding address collection 2012-10-10 14:23:02 -04:00
Raymond Yee c0107b2192 Revert "slowly progressing on PledgeUiTest"
PledgingUiTests works ok in isolation and in context of other frontend tests...but fails when run with core....

This reverts commit 6a447abe00.
2012-10-10 08:19:38 -07:00
Andromeda Yelton 839ce0496f Merge branch 'master' into collect_address_info
Conflicts:
	static/css/sitewide.css
	static/less/sitewide.less
2012-10-10 10:26:48 -04:00
Raymond Yee 6a447abe00 slowly progressing on PledgeUiTest 2012-10-09 16:12:54 -07:00
Andromeda Yelton 66f7667ed6 don't show donate options if nonprofit is off, disable pledge box 2012-10-09 16:13:22 -04:00
Andromeda Yelton 93dc8750dc tweaks 2012-10-09 16:12:38 -04:00
Andromeda Yelton 5b1f673a6f deactivate pledge box, handle nonprofit.is_on better 2012-10-09 16:11:57 -04:00
thatandromeda cf4d334b71 Merge pull request #39 from Gluejar/stripe_exception
Stripe exception
2012-10-09 07:54:31 -07:00
Raymond Yee 018332d508 [#37388341] First crack at displaying campaign data -- per Melinda's request 2012-10-08 17:47:55 -07:00
Raymond Yee 9d17f93fac Now I have some tests to show how to trigger all of the stripe CardError except invalid_number, expired_card, and processing_error -- ones that we'll need to simulate in some other way 2012-10-08 13:08:28 -07:00
eric ff221472ee hardened claim form handling [fix #37274037] 2012-10-07 10:58:59 -04:00
Raymond Yee 447b5973c2 Add ProcessorError
Start elaborating StripeClient testing
2012-10-06 09:51:43 -07:00
eric 7f1dc2d3ca merge works wasn't merging claims 2012-10-05 17:55:14 -04:00
Andromeda Yelton 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
Andromeda Yelton 920f856bcd prettifying 2012-10-05 15:05:15 -04:00
thatandromeda b9ac8523d2 Merge pull request #36 from Gluejar/new_rh_instructions
New rh instructions
2012-10-05 09:20:31 -07:00
Andromeda Yelton 17e110696d titles can be a lot longer than 30 characters 2012-10-05 12:08:06 -04:00