Commit Graph

2919 Commits (2441158d676968a702b254de477b4109c5b599c3)

Author SHA1 Message Date
Andromeda Yelton 2441158d67 less confusing message, for when the slideshow has non-campaign books 2012-10-14 15:00:58 -04:00
eshellman 0ef5c112db Merge pull request #52 from Gluejar/fix_pledge_nits
preset no-premium, add validation message [fix #37720723]
2012-10-14 11:26:02 -07:00
eric 201f5d588d re-add Andromeda's anonymity phrasing 2012-10-14 14:22:07 -04:00
Andromeda Yelton 90c080827c Merge branch 'fix_pledge_nits' of github.com:Gluejar/regluit into fix_pledge_nits 2012-10-14 12:03:54 -04:00
Andromeda Yelton 1a5d28369b this was only meant to hit input textboxes, not submit button 2012-10-14 11:36:31 -04:00
eric 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
Andromeda Yelton 9caf7853f1 Merge branch 'master' of github.com:Gluejar/regluit
Conflicts:
	frontend/templates/pledge_complete.html
2012-10-14 11:27:58 -04:00
Raymond Yee 7920d5aa19 Modified basic_campaign_test fixture with 3 user accounts:
RaymondYee / raymond.yee@gmail.com / Test_Password_
hmelville / rdhyee@yahoo.com / gofish!
dataunbound / raymond.yee@dataunbound.com / numbers_unbound

2 campaigns + 1 other book

Also a command to load_test_fixture
2012-10-14 07:33:50 -07:00
Raymond Yee d8a30a733a Add a log message for loading of keys in stripelib 2012-10-13 16:42:24 -07:00
Raymond Yee f152bc97b1 Merge branch 'reuse_account'
Conflicts:
	frontend/views.py
2012-10-13 16:19:45 -07:00
eric 8d6cc6f4c9 this makes the boder of the preapproval amount white 2012-10-13 14:12:34 -04:00
eric 5bde0da8ca [#37716025] reuse a user's credit card 2012-10-13 13:45:46 -04:00
eric 674637f616 we weren't checking that request.user==transaction.user 2012-10-13 13:40:36 -04:00
eric dbacb5a96d max_amount, not amount before the authorization 2012-10-13 13:38:39 -04:00
eric 8c20339618 typo 2012-10-13 13:35:41 -04:00
Raymond Yee 7813dc2061 Merge pull request #50 from Gluejar/fix_pledge_nits
Fix pledge nits -- Sn test works w/ small correction
2012-10-13 09:07:13 -07:00
Raymond Yee b904cb1f28 Fixed a bug in the logging statement that had mismatched # of parameters 2012-10-13 08:23:07 -07:00
Raymond Yee c585eca680 Merge branch 'master' into fix_pledge_nits 2012-10-13 08:14:34 -07:00
eric ef4b5bdb84 limit max pledge to $2000 [finish #37674713] 2012-10-13 10:13:46 -04:00
eric 2ae6942f4f better to not have logging of tokens 2012-10-13 00:48:46 -04:00
eric f83ff09d05 plug security hole 2012-10-13 00:46:34 -04:00
Raymond Yee a649576596 Starting to create a fixture to be used as a test campaign -- and to run a test case 2012-10-12 21:05:26 -07:00
eric 3485f9fd92 fixed text too close to border by adding heading 2012-10-12 23:57:42 -04:00
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