Commit Graph

3204 Commits (ec4e1a7bb365453953d3444b1be5454d05c04ecc)

Author SHA1 Message Date
Raymond Yee 601a0a3aee Merge branch 'master' into empty_stripe_token 2012-11-15 15:43:04 -08:00
Raymond Yee 984e3d465a Merge pull request #78 from Gluejar/campaign_close
Campaign close
2012-11-15 15:30:27 -08:00
Raymond Yee 02dd7a55da Merge branch 'campaign_close' into charge_failed 2012-11-15 14:38:23 -08:00
Raymond Yee 03a751626e Stepping stone to tests that will allow the adjustment of localdatetime.now() so that we can simulate campaign closing 2012-11-15 14:37:04 -08:00
Raymond Yee 1739064229 return True incorrect place in Campaign.update_status 2012-11-15 13:06:12 -08:00
Raymond Yee 202f1700ea Merge branch 'master' into campaign_close 2012-11-15 09:12:26 -08:00
Raymond Yee b02a289e01 Add templates for pledge_failed notification 2012-11-15 09:06:55 -08:00
Raymond Yee 7b75c36390 Now UnifiedCampaignTests passing -- and number of emails sent out align with expectation 2012-11-14 14:33:37 -08:00
Raymond Yee 4fa36ad30e test_stripe_token_none passes now 2012-11-14 12:14:06 -08:00
Raymond Yee e26885870f Merge branch 'empty_stripe_token' into charge_failed 2012-11-14 11:51:59 -08:00
Raymond Yee 4100fa5468 catch empty token at the view level 2012-11-14 11:51:32 -08:00
Raymond Yee f4deee8be4 Merge branch 'empty_stripe_token' into charge_failed 2012-11-14 11:43:29 -08:00
Raymond Yee 7fe502ecdf check for zero length stripe token 2012-11-14 11:42:52 -08:00
Raymond Yee ec09588650 Add a (currently failing) test test_stripe_token_none 2012-11-14 11:39:56 -08:00
Raymond Yee a62c82df9b Merge branch 'empty_stripe_token' into charge_failed 2012-11-14 10:58:01 -08:00
Raymond Yee 346d4d8980 First step in patching the problem of null stripe_token 2012-11-14 10:53:19 -08:00
Andromeda Yelton bc56a1b56b making signin box prettier 2012-11-14 10:32:03 -05:00
Raymond Yee 8b14f37967 Merge branch 'webhooks' into charge_failed 2012-11-13 11:33:23 -08:00
Raymond Yee 678bef6530 Merge branch 'master' into webhooks 2012-11-13 11:32:55 -08:00
Raymond Yee 5eb8475ff0 Merge branch 'master' into production 2012-11-13 11:30:57 -08:00
Raymond Yee acd7e53403 Merge branch 'master' of github.com:Gluejar/regluit 2012-11-13 11:24:39 -08:00
Raymond Yee 13b4957d06 Update Sn test to work with latest UI tweaks 2012-11-13 11:23:44 -08:00
Raymond Yee 22fc71d84e Merge branch 'webhooks' into charge_failed 2012-11-13 10:47:26 -08:00
Raymond Yee 4e7fac0ecd Merge branch 'campaign_close' into charge_failed 2012-11-13 10:20:49 -08:00
Raymond Yee b2ca44da31 Now automatically process transactions based on status of campaigns 2012-11-13 10:15:38 -08:00
Raymond Yee f4c8c67850 [#39477485] allow campaigns to succeed if amount sufficient before campaign deadline 2012-11-13 09:01:05 -08:00
Raymond Yee f2bb53f132 recharge signal being fired now 2012-11-12 12:48:03 -08:00
Raymond Yee a90f133166 First pass at writing a signal handler to recharge transaction if account updated 2012-11-12 11:22:20 -08:00
Andromeda Yelton 5056396b86 addressing comments, checking all /accounts/ urls for styling 2012-11-12 10:39:33 -05:00
Andromeda Yelton 2dc20d18ec Merge branch 'master' into hijaxify_signin 2012-11-12 10:10:59 -05:00
eshellman 34f0bd9e1d Merge pull request #76 from Gluejar/fix_nav_menu
nav menu is nice
2012-11-10 09:40:08 -08:00
Andromeda Yelton 097241493c separating out rest of hijax vs non-hijax styling 2012-11-07 15:56:37 -05:00
Andromeda Yelton c5ed14b6dc further rectifying css 2012-11-07 15:34:10 -05:00
Andromeda Yelton 67ab8a8729 embiggening google signin 2012-11-07 15:11:13 -05:00
Andromeda Yelton 0e0b81808c prettifying google signup handling 2012-11-07 15:03:27 -05:00
Andromeda Yelton d9905df303 first pass at hijaxifying signin link 2012-11-07 14:58:40 -05:00
Andromeda Yelton affa8239c3 more prettifying 2012-11-07 13:45:19 -05:00
Andromeda Yelton d7e4384236 add badge link to notifications page and suppress menu drop-down when clicking on it 2012-11-07 13:45:10 -05:00
Andromeda Yelton 929c4d1a13 now the nav menu is prettier 2012-11-07 13:40:05 -05:00
Raymond Yee d02b13a9fc Merge branch 'master' into webhooks 2012-11-07 08:35:19 -08:00
Raymond Yee 9e8f54ab66 Merge branch 'master' into charge_failed 2012-11-07 08:11:13 -08:00
Raymond Yee 48646c8ee4 Merge branch 'master' of github.com:Gluejar/regluit 2012-11-07 08:10:46 -08:00
eshellman e401ad7b99 Merge pull request #75 from Gluejar/fix_nav_menu
Fix nav menu. If we improve the arrow button, this is good to go
2012-11-06 13:03:33 -08:00
Raymond Yee 793d984ba3 Implemented basic transaction_failed signal and notices -- THEY STILL NEED WORK
Tests handle situation of transaction_failed too
2012-11-06 11:22:25 -08:00
Raymond Yee 3da9ce6734 Merge branch 'master', remote branch 'origin' into webhooks 2012-11-06 07:56:46 -08:00
Andromeda Yelton 304ddb6bdc add badge to avatar when there are unseen notifications 2012-11-06 10:06:10 -05:00
Andromeda Yelton 50c51bd058 supporter not always in context, so use something that is 2012-11-06 09:54:42 -05:00
Andromeda Yelton 2d4740f037 round user avatar corners sitewide, not just on pages with supporter layout 2012-11-06 09:53:56 -05:00
Andromeda Yelton 271741ead4 more consistent capitalization 2012-11-06 09:36:54 -05:00
Andromeda Yelton 30b4381cf0 don't set font size for a if you want it to inherit 2012-11-06 09:36:09 -05:00