Commit Graph

3057 Commits (84e13a42bf5f9d37ca605621528b58db010f6af8)

Author SHA1 Message Date
thatandromeda 80fae98b88 Merge pull request #60 from Gluejar/manage_user_cc
tweak error page, other nits
2012-10-15 07:50:45 -07:00
eric 5ddbcd8d67 Improve error message to encourage user to try again 2012-10-15 10:47:18 -04:00
Raymond Yee b8441e19ea Merge pull request #59 from Gluejar/fix_preview_context
need is_preview to be in our context again
2012-10-15 07:43:30 -07:00
Andromeda Yelton c2d851de18 need is_preview to be in our context again 2012-10-15 10:40:33 -04:00
eric 48be5a1191 xhtml nits 2012-10-15 10:28:31 -04:00
thatandromeda 13a5d8cb93 Merge pull request #53 from Gluejar/is_preview_message
when we trn is_preview off the message on top should change
2012-10-15 07:05:24 -07:00
thatandromeda 824b6d3ff7 Merge pull request #54 from Gluejar/slideshow
Slideshow
2012-10-15 07:04:43 -07:00
Andromeda Yelton 5955445fbb tweaks 2012-10-15 09:52:39 -04:00
Andromeda Yelton 5c96382220 now that we have comprehensive account management page, link should go to it 2012-10-15 09:52:32 -04:00
eric 1db22071fd slideshow now pulls from recommended user 2012-10-15 00:59:46 -04:00
Raymond Yee d33485df99 use requirements_versioned.pip in update-prod 2012-10-14 21:59:13 -07:00
Raymond Yee 51e17e6886 Merge branch 'master' of github.com:Gluejar/regluit 2012-10-14 21:52:43 -07:00
eric 1ccc45875c This message may be more intelligible to those new to the site. 2012-10-15 00:49:22 -04:00
Raymond Yee 6157e2c8cd Merge pull request #58 from Gluejar/manage_user_cc
User can Manage pledges and CC Account
2012-10-14 21:47:35 -07:00
Raymond Yee 6c0906192f Add exception message to when there is an error in creating new account 2012-10-14 21:42:09 -07:00
eric 4484e504f8 resolve merge conflicts 2012-10-15 00:31:45 -04:00
eshellman 8a2da5d67a Merge pull request #57 from Gluejar/relaunch_testing
Relaunch testing
2012-10-14 21:27:48 -07:00
eric b1e9acac11 a bit prettier by stealing pledge complete styling 2012-10-15 00:22:23 -04:00
eric 1964eec782 add links to account management page [#37674453] 2012-10-15 00:16:56 -04:00
Raymond Yee c16df417e6 Hello world of IPN 2012-10-14 21:16:15 -07:00
eric bda3211a76 user can manage their account credit card [#37674369] 2012-10-14 23:41:17 -04:00
eric b923f741ce DRY stuff that makes stripe work 2012-10-14 23:38:18 -04:00
Raymond Yee 168df09ac4 Display error message if make_account fails 2012-10-14 19:47:40 -07:00
eric 1c557e1488 fix reference to Donation Credit canceler 2012-10-14 22:08:34 -04:00
Raymond Yee 540e434698 Feed a Luhn-invalid # to check our stripe implementation rejects it at UI level 2012-10-14 18:19:05 -07:00
eshellman 1778427b01 Merge pull request #56 from Gluejar/proof_notifications
Proof notifications
2012-10-14 14:52:16 -07:00
eric 3e2d65afd9 list the user's pledges [#37674453]
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
eric 80ec41422e DRY the transaction summary 2012-10-14 17:42:28 -04:00
Andromeda Yelton 386a30e3da missing endif 2012-10-14 17:27:52 -04:00
Andromeda Yelton 590320f555 that period looks weird if the user's dedication already includes one 2012-10-14 17:27:38 -04:00
Andromeda Yelton 56f2357b50 DRYer 2012-10-14 17:19:33 -04:00
Andromeda Yelton 0c8d73fbc7 making acknowledgements formatting the same 2012-10-14 17:15:45 -04:00
Andromeda Yelton c15ecd7715 remove ref to payment processor, add acknowledgements 2012-10-14 17:04:32 -04:00
eshellman 477c4d6dfe Merge pull request #55 from Gluejar/edit_button
stopgap for [#37714043]
2012-10-14 12:44:27 -07:00
eric bde8e98518 create empty manage account view 2012-10-14 15:31:18 -04:00
Andromeda Yelton 82e0e17017 stopgap for [#37714043] 2012-10-14 15:20:55 -04:00
Andromeda Yelton 1ae6f463c9 don't need to feature successful campaigns in slideshow 2012-10-14 15:01:10 -04:00
Andromeda Yelton 2441158d67 less confusing message, for when the slideshow has non-campaign books 2012-10-14 15:00:58 -04:00
Andromeda Yelton f30329a892 when we trn is_preview off the message on top should change 2012-10-14 14:54:32 -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