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
f15dab1551
Updated Sn script now works for latest UI changes in pledging
2012-10-10 19:54:56 -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
8b38da57bc
Merge branch 'nuke_paypal_refs' of github.com:Gluejar/regluit
2012-10-10 15:04:56 -07:00
f968caf561
Revert "Revert "slowly progressing on PledgeUiTest""
...
This reverts commit c0107b2192
2012-10-10 13:59:04 -07:00
599606d2ce
removing paypal and amazon references [ #36554899 ]
2012-10-10 14:34:59 -04:00
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
6a447abe00
slowly progressing on PledgeUiTest
2012-10-09 16:12:54 -07:00
66f7667ed6
don't show donate options if nonprofit is off, disable pledge box
2012-10-09 16:13:22 -04:00
93dc8750dc
tweaks
2012-10-09 16:12:38 -04:00
5b1f673a6f
deactivate pledge box, handle nonprofit.is_on better
2012-10-09 16:11:57 -04:00
cf4d334b71
Merge pull request #39 from Gluejar/stripe_exception
...
Stripe exception
2012-10-09 07:54:31 -07:00
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
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
7f1dc2d3ca
merge works wasn't merging claims
2012-10-05 17:55:14 -04: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
920f856bcd
prettifying
2012-10-05 15:05:15 -04:00
b9ac8523d2
Merge pull request #36 from Gluejar/new_rh_instructions
...
New rh instructions
2012-10-05 09:20:31 -07:00
17e110696d
titles can be a lot longer than 30 characters
2012-10-05 12:08:06 -04:00
bc87b559fc
adding value to pledge box by clicking on premium needs to also activate acknowledgements
2012-10-05 12:00:20 -04:00
dc268bd217
if pledge box is empty, clicking on nontrivial pledge will fill [ #36325899 ]
2012-10-05 11:53:58 -04:00
487724dc91
improving campaign launch instructions
2012-10-05 11:30:49 -04:00
1723ae4559
may as well update
2012-10-05 11:30:38 -04:00
410f1cb9ec
Merge branch 'relaunch_ry'
2012-10-04 14:09:51 -07:00
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
5ca4d5c4c8
improving layout of premium addition
2012-10-04 12:08:40 -04:00
fd487b02b9
adding video instructions, clarifying premiums, etc.
2012-10-04 10:59:31 -04:00
8cba33675c
whoops, save button needs to be visible prelaunch
2012-10-04 11:12:20 -03:00
b5148f39fc
Merge pull request #33 from Gluejar/pledged_badges
...
clean up two loose ends; gotta see what jenkins thinks of it
2012-10-03 17:38:02 -07:00
04002e40a2
jenkins build errors suggest some environments evaluate module attributes differently
2012-10-03 20:35:05 -04:00
75e0a4c534
clean up two loose ends
2012-10-03 17:36:17 -04:00
c26532c0fd
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-10-03 17:08:54 -04:00
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04:00
462011ed7e
add_pledge_badge was just a bug waiting to happen
2012-10-03 17:06:51 -04:00
e99a88c103
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-03 16:28:51 -04:00
d439106cf4
badge outline to thin gray
2012-10-03 16:20:43 -04:00
4ea8dbdfac
anonymity needs to adhere to whole pledge and be communicated clearly regardless of amount if we're doing badges
2012-10-03 16:02:51 -04:00
3312a9108a
anonymous pledges shouldn't add badge
2012-10-03 16:01:02 -04:00
2cdb945812
finishing new layout
2012-10-03 13:44:33 -04:00
757a3469b5
let's use css for borders
2012-10-03 13:15:46 -04:00
5ca90fdaf4
Merge branch 'relaunch_ry' of github.com:Gluejar/regluit into pledge_pretty_stick
2012-10-03 12:24:49 -04:00
f9e81d1741
syntax error fix
2012-10-03 09:24:04 -07:00
113148d6a9
swapped badges, deleted empty badge, added title to edit icon
2012-10-03 12:17:23 -04:00
98b32a4092
Merge branch 'master' into production
2012-10-03 08:54:41 -07: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
ae857b3c8f
restyle badges and edit profile function
2012-10-03 10:59:57 -04:00
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
2012-10-03 08:57:35 -04:00
57dc500643
Revert "Revert "wired badge awarding into pledge modified and pledge complete signals""
...
This reverts commit 863055c305
2012-10-03 08:57:24 -04:00
863055c305
Revert "wired badge awarding into pledge modified and pledge complete signals"
...
This reverts commit 759e39f61d
2012-10-03 08:56:29 -04:00
Raymond Yee
Andromeda Yelton
eric