Andromeda Yelton
1433be3856
customizing this on a per-user basis is going to be a pain, hence no amount
2012-11-16 10:07:19 -05:00
thatandromeda
acfdbfdf9c
Stephen's campaign closed :/
2012-11-16 08:00:22 -05: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
ec09588650
Add a (currently failing) test test_stripe_token_none
2012-11-14 11:39:56 -08: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
f2bb53f132
recharge signal being fired now
2012-11-12 12:48:03 -08:00
Andromeda Yelton
2dc20d18ec
Merge branch 'master' into hijaxify_signin
2012-11-12 10:10:59 -05: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
d9905df303
first pass at hijaxifying signin link
2012-11-07 14:58:40 -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
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
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
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
271741ead4
more consistent capitalization
2012-11-06 09:36:54 -05:00
Andromeda Yelton
0bcf845058
suppress top signup button on landing page
2012-11-06 09:34:31 -05:00
Andromeda Yelton
b3f21ecce3
consistent sign in/sign up capitalization
2012-11-06 09:31:53 -05:00
Raymond Yee
f6bf774f2c
Test sending junk to webhook handler
...
Simulate sending events to the ipnhandler and check to see how many emails generated in test
2012-11-02 14:46:49 -07:00
Raymond Yee
9826951d36
Continuing to build out UnifiedCampaignTests -- now includes scenario where a pledge is made and charged -- and the corresponding Stripe events are polled and inspected
2012-11-01 14:06:11 -07:00
Raymond Yee
14cd6209bf
continuing on UnifiedCampaignTests
2012-10-31 11:57:39 -07:00
Raymond Yee
96b62aa163
basic skeleton for test based on loading fixture
...
keep the signals for create userprofile, wishlist, and credit from firing if fixtures being loaded
2012-10-31 11:08:46 -07:00
Andromeda Yelton
78c62ef553
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/work.html
2012-10-25 09:43:29 -04:00
thatandromeda
ec20417039
Update frontend/templates/press.html
2012-10-25 10:14:40 -03:00
thatandromeda
1a83b6cfc4
Merge pull request #73 from Gluejar/clarify_acknowledgements
...
Clarify acknowledgements
2012-10-24 09:14:12 -07:00
thatandromeda
08e49036d1
Merge pull request #74 from Gluejar/fix_nav_menu
...
Fix nav menu
2012-10-24 09:13:43 -07:00
Andromeda Yelton
4a87253ca7
only show the premiums section if there actually are premiums
2012-10-24 11:34:22 -04:00
Andromeda Yelton
9eb0323768
add case where ungluer has not yet pledged
2012-10-24 11:30:37 -04:00
Andromeda Yelton
d4549dfdb6
explain about acknowledgements in campaign management page
2012-10-24 11:25:37 -04:00
Andromeda Yelton
89b92b4dba
add acknowledgements to support menu
2012-10-24 11:25:17 -04:00
Andromeda Yelton
cc18eb20d3
add acknowledgements to support menu
2012-10-24 11:24:46 -04:00
Andromeda Yelton
e6ed4c3074
explain about acknowledgements in campaign management page
2012-10-24 11:00:35 -04:00
Raymond Yee
b4c1d09e88
Merge pull request #64 from Gluejar/prepopulate_ack_name
...
Prepopulate ack name
2012-10-23 10:35:40 -07:00
Andromeda Yelton
673b890e42
add production setting and only use google analytics in production
2012-10-23 10:24:16 -04:00
Andromeda Yelton
ef4e35d174
is_preview is in sitewide context, do not need to add here
2012-10-23 10:24:02 -04:00
Andromeda Yelton
f9f19b2043
if last transaction ack_name was blank, use username as ack_name
2012-10-23 09:37:00 -04:00
Andromeda Yelton
aa338e9811
amazon situation now resolved
2012-10-23 09:08:09 -04:00
Andromeda Yelton
6b348f2b76
don't need that conditional any more
2012-10-22 15:45:11 -04:00
Andromeda Yelton
4effa6faf9
communicate current outage, provide CTAs for current and future ones
2012-10-22 15:44:56 -04:00
Andromeda Yelton
02f803291a
communicate current outage, provide CTAs for current and future ones
2012-10-22 15:43:45 -04:00
Andromeda Yelton
002298d51a
don't need that conditional any more
2012-10-22 15:43:25 -04:00
Andromeda Yelton
104992612b
first pass at making things visually distinct if there are notifications
2012-10-19 15:01:06 -04:00
Andromeda Yelton
836a957d97
add profile settings link to dropdown
2012-10-19 12:31:23 -04:00
Andromeda Yelton
09d5b00e50
highlight editing area if #edit is in url
2012-10-19 12:26:11 -04:00
Andromeda Yelton
1bf4743667
making notifications prettier
2012-10-19 12:19:56 -04:00
Andromeda Yelton
11aac359e6
adding drop-down menu
2012-10-19 12:01:28 -04:00
Andromeda Yelton
21ef0c1bf2
now passing data through initial form values, not hidden divs
2012-10-18 14:16:05 -04:00
Andromeda Yelton
79aefd4c91
nope, need to set the values over here
2012-10-18 14:13:42 -04:00
Andromeda Yelton
4a6a392481
ack_name and anonpref are form initial values, not context variables
2012-10-18 13:57:39 -04:00
Andromeda Yelton
e3cdf397d3
Merge branch 'master' of github.com:Gluejar/regluit into prepopulate_ack_name
2012-10-18 10:12:13 -04:00
eric
6b78ff7685
message for no pledges, html nits
2012-10-18 09:04:22 -04:00
Andromeda Yelton
64681d95f7
ohhh that's how class-based views work
2012-10-17 12:11:54 -04:00
Andromeda Yelton
96918d60a5
if not modifying pledge use ack data from previous transaction to prefill ack boxes [ #37939351 ]
2012-10-17 11:54:29 -04:00
thatandromeda
79fca69cf9
Update frontend/templates/press.html
2012-10-16 16:41:37 -03:00
Andromeda Yelton
3831a1ea59
clarifying kwarg
2012-10-16 11:36:51 -04:00
Andromeda Yelton
ae9a541ed5
too many ways we might add to wishlist to test for. adding argument for notification. [[ #37780515 ]
2012-10-16 11:06:13 -04:00
Andromeda Yelton
102937567b
better syntax
2012-10-16 10:20:41 -04:00
eric
f7615ffa7c
fix bug where modify doesn't initialize to previous premium
2012-10-15 11:39:09 -04:00
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
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
eric
1ccc45875c
This message may be more intelligible to those new to the site.
2012-10-15 00:49:22 -04: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
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
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
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
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
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
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
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
eric
ef4b5bdb84
limit max pledge to $2000 [finish #37674713 ]
2012-10-13 10:13:46 -04:00
eric
f83ff09d05
plug security hole
2012-10-13 00:46:34 -04: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
957d73c462
fixed problem modifying anonymous = true
2012-10-12 22:24:58 -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
e155165eb2
fancifying handling of MM and YYYY [ #36797599 ]
2012-10-12 14:23:31 -04: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
thatandromeda
f328ccfa78
Update frontend/templates/press.html
2012-10-12 09:56:50 -03: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
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
thatandromeda
cf4d334b71
Merge pull request #39 from Gluejar/stripe_exception
...
Stripe exception
2012-10-09 07:54:31 -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
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
Andromeda Yelton
487724dc91
improving campaign launch instructions
2012-10-05 11:30:49 -04:00
Andromeda Yelton
1723ae4559
may as well update
2012-10-05 11:30:38 -04:00
Raymond Yee
410f1cb9ec
Merge branch 'relaunch_ry'
2012-10-04 14:09:51 -07:00
Raymond Yee
5df3ab23ab
Merge branch 'master' into relaunch_ry
2012-10-04 09:35:54 -07:00
Andromeda Yelton
5ca4d5c4c8
improving layout of premium addition
2012-10-04 12:08:40 -04:00
Andromeda Yelton
fd487b02b9
adding video instructions, clarifying premiums, etc.
2012-10-04 10:59:31 -04:00
thatandromeda
8cba33675c
whoops, save button needs to be visible prelaunch
2012-10-04 11:12:20 -03:00
eric
c26532c0fd
Merge branch 'master' of https://github.com/Gluejar/regluit
2012-10-03 17:08:54 -04:00
eric
75207afb4c
Merge branch 'pledged_badges'
2012-10-03 17:08:00 -04:00
Andromeda Yelton
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
Andromeda Yelton
757a3469b5
let's use css for borders
2012-10-03 13:15:46 -04:00
eric
113148d6a9
swapped badges, deleted empty badge, added title to edit icon
2012-10-03 12:17:23 -04:00
Andromeda Yelton
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
Andromeda Yelton
ae857b3c8f
restyle badges and edit profile function
2012-10-03 10:59:57 -04:00
eric
deb67de0b8
Revert "try this placement of the star"
...
This reverts commit e4cccc277f
.
2012-10-03 08:57:35 -04:00
eric
ceebcb690d
step one: fix media links [ #37068821 ]
2012-10-02 18:12:44 -04:00
Raymond Yee
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
Andromeda Yelton
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
Andromeda Yelton
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -04:00
Andromeda Yelton
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
Raymond Yee
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
thatandromeda
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
Andromeda Yelton
1cb2461daa
merging changes
2012-10-02 13:36:30 -04:00
Raymond Yee
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
Andromeda Yelton
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
Andromeda Yelton
4cf4787a95
don't display username
2012-10-02 09:32:33 -04:00
Andromeda Yelton
2c2ce2a34f
suppress display of any amount premium if it's the only premium
2012-10-02 09:29:18 -04:00
Andromeda Yelton
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
Andromeda Yelton
a9d9cde55a
grammar
2012-10-02 07:55:11 -04:00
Andromeda Yelton
d54f45d511
further aesthetic refinements
2012-10-01 15:53:41 -04:00
eric
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
Andromeda Yelton
6a6045e9ab
first pass at prettifying stripe process
2012-10-01 15:31:17 -04:00
eric
99c228323e
fix double toggle when clicking on star
2012-10-01 15:24:11 -04:00
Andromeda Yelton
fd845d627b
is unglued is not grammatical here
2012-10-01 09:47:32 -04:00
Andromeda Yelton
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
thatandromeda
38b2567a02
Merge pull request #27 from Gluejar/deannoyify_email_notices
...
[finish #31209035 ] removes first line from the email notices
2012-10-01 06:28:57 -07:00
thatandromeda
0955dc0f78
Merge pull request #29 from Gluejar/trivial_edits
...
Trivial edits
2012-10-01 06:16:46 -07:00
Andromeda Yelton
6117b8475f
minor style edits
2012-10-01 09:15:38 -04:00
Andromeda Yelton
abea3a67de
updating handling of premiums and anonymity
2012-10-01 09:12:40 -04:00
eshellman
96a54adc4a
Merge pull request #25 from Gluejar/new_wisher_notification_improvement
...
include clickable links, make grammar singular/plural sensitive
2012-09-28 14:47:47 -07:00
eric
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
eric
51f8e90487
fixed markup syntax of faq
2012-09-28 17:16:25 -04:00
eric
94ed8fa8df
removed unbalanced <span>
2012-09-28 17:09:21 -04:00
eric
87e2d0e0b4
fix OLA work number 29340547
2012-09-28 16:02:03 -04:00
eric
f336730800
[finish #31209035 ] found where that extra line came from
...
This is why I got email leakage
2012-09-28 15:50:43 -04:00
eshellman
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
Andromeda Yelton
839a864149
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-28 10:40:56 -04:00
Andromeda Yelton
079487783c
incorporating AM's revisions to FAQ
2012-09-28 10:40:44 -04:00
Raymond Yee
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
Raymond Yee
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
Raymond Yee
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
Andromeda Yelton
81f45984e8
prevent campaign launch button from being visible to non-staff during preview
2012-09-27 13:11:19 -04:00
Andromeda Yelton
2b2bea8978
not using that any more
2012-09-27 12:40:30 -04:00
Andromeda Yelton
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
thatandromeda
a48f61793d
only staff can launch campaigns during preview
2012-09-27 12:14:09 -03:00
Raymond Yee
8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
eshellman
f327db6efd
Merge pull request #19 from Gluejar/improvify_download_page
...
Improvify download page with readmill [finish #36156381 ]
2012-09-26 13:04:39 -07:00
Andromeda Yelton
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
thatandromeda
77abb2d048
Merge pull request #18 from Gluejar/add_oclc
...
Add worldcat links and oclcnum editing [#32289887 ]
2012-09-26 06:36:07 -07:00
thatandromeda
f18b7e80cb
anchor text shouldn't be confusing
2012-09-25 16:46:58 -03:00
Raymond Yee
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
Andromeda Yelton
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00