a19a060351
Merge pull request #100 from Gluejar/missing_parenthesis
...
it was missing a parenthesis
2012-12-31 08:54:56 -08:00
609c09c74d
it was missing a parenthesis
2012-12-31 11:12:55 -05:00
47c44b20d5
add success_date property to campaign so we can accurately report it when it differs from campaign deadline
2012-12-31 11:00:45 -05:00
7a0e2bfbd8
addressing ul, li, dt, dd comments
2012-12-19 10:22:11 -05:00
4a307a1e00
addressing CSS comments and also fixing some invalid html
2012-12-17 14:23:23 -05:00
ab2d3d51b6
Merge branch 'master' into unglued_books_tab
2012-12-14 10:46:11 -05:00
73266f07eb
line up icons better and more clearly indicate status of books with successful campaigns
2012-12-14 10:45:16 -05:00
7c88279603
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-14 10:03:57 -05:00
b001aefeeb
separating unglued and PD works on ready-to-read page
2012-12-13 15:25:01 -05:00
136614b8ff
Merge pull request #96 from Gluejar/merge_works_management
...
staff only UI for merging works [finish #39297681 ]
2012-12-13 12:09:43 -08:00
ec4e1a7bb3
Merge branch 'master' of github.com:Gluejar/regluit
2012-12-13 09:55:14 -05:00
575d34d968
Update frontend/templates/base.html
2012-12-13 09:51:36 -05:00
fec7f33d9e
staff only UI for merging works [finish #39297681 ]
...
staff-only link in rights tab of every work!
2012-12-12 22:35:35 -05:00
7501c3fdae
prettifying
2012-12-11 13:17:33 -05:00
d73c1157b8
whoops lost some context in merge
2012-12-11 10:53:12 -05:00
bfbb74c0a2
providing next steps
2012-12-11 10:37:38 -05:00
1304a73790
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/metrics.html
frontend/views.py
2012-12-11 10:31:58 -05:00
43c9087d2b
Rewrite filter to include Transactions that are active or complete rather than filter out ones not to count.
2012-12-10 13:01:50 -08:00
33665abd37
Merge branch 'master' into pledges_on_info_page
2012-12-10 12:26:30 -08:00
61bb121a51
[ #37736995 ] the old error message for a CC error was potentially confusing -- I think this should be better -- see images in
...
https://www.evernote.com/shard/s1/sh/b59d4cfa-81a2-42bc-a315-24996fb01e83/2cfa234f2a15042ff0bb198514771dcb
2012-12-10 11:18:46 -08:00
c1c3b3d1ad
[ #40818125 ] minimum target to $500
2012-12-06 21:05:15 -05:00
23708e15ba
exclude uncollectable pledges
2012-12-06 15:31:32 -05:00
7decd15333
Revert "wanted to be able to track prospective revenue from info page"
...
This reverts commit 150ed860c9
2012-12-06 12:37:48 -05:00
150ed860c9
wanted to be able to track prospective revenue from info page
2012-12-06 11:42:02 -05:00
fd7c10863e
Merge pull request #91 from Gluejar/fix_lightbox
...
Fix lightbox. works for me.
2012-12-04 13:37:40 -08:00
f22312d735
Update frontend/templates/base.html
...
network of killers now live
2012-12-04 13:47:19 -05:00
88b4446bf0
force reload of hijax.js
2012-11-30 12:28:29 -05:00
0993d393d2
Merge pull request #88 from Gluejar/smashwords
...
Smashwords. Looks good for the first pass.
2012-11-29 10:58:15 -08:00
202c10b0fb
latest coverage
2012-11-29 12:04:05 -05:00
4fe73e110c
make sure to include new file location
2012-11-29 12:00:34 -05:00
0aef30015b
addressing comments
2012-11-29 11:20:13 -05:00
c4ac00e8ef
first pass at smashwords page
2012-11-29 10:54:07 -05:00
4d923aba5b
Merge branch 'master' into charge_failed
2012-11-27 12:19:21 -08:00
1cd50d716f
display submit buttons as loading gifs for transactions that might take a while
2012-11-27 13:32:25 -05:00
41f3da3d31
Merge branch 'master' of github.com:Gluejar/regluit into charge_failed
2012-11-26 14:36:40 -08:00
8692d26540
friendlifying
2012-11-26 14:23:04 -05:00
1976bb14d3
Update frontend/templates/notification/pledge_charged/short.txt
2012-11-26 13:45:12 -05:00
0b9827424f
Merge pull request #84 from Gluejar/pledge_sidebar
...
Pledge sidebar
2012-11-26 08:21:02 -08:00
6ab521faa1
Merge branch 'master' into charge_failed
2012-11-23 09:20:58 -08:00
28eca2999c
put checks for notices in proper context
2012-11-21 16:42:04 -08:00
db1fdc321e
Merge pull request #79 from Gluejar/ending_soon_notification
...
Ending soon notification
2012-11-21 14:05:26 -08:00
54a8a31c8c
Merge branch 'master' into pledge_sidebar
2012-11-21 17:00:33 -05:00
ea212bd167
Merge pull request #82 from Gluejar/empty_stripe_token
...
Empty stripe token reports error
2012-11-21 13:37:48 -08:00
ecea475419
a few modifications to pledge_failed notice
2012-11-21 11:40:19 -08:00
cbac6f1e3c
First round of edits to get pledge_charged and pledge_failed notices to be parallel. tests passing
2012-11-21 09:21:01 -08:00
ce6e7f865d
tests pass on this commit
2012-11-20 13:56:14 -08:00
0a0b74e449
Revert "Revert "make the html validate""
...
This reverts commit a215471abb
2012-11-20 15:53:24 -05:00
3ccb10a9aa
Merge branch 'pledge_sidebar' of github.com:Gluejar/regluit into pledge_sidebar
...
Conflicts:
frontend/templates/base.html
2012-11-20 15:51:37 -05:00
466f7b9689
ok, so this results in the same dom tree, though the css matching is off
2012-11-20 15:48:41 -05:00
a215471abb
Revert "make the html validate"
...
This reverts commit f5e3cc1670
2012-11-20 15:40:32 -05:00
f5e3cc1670
make the html validate
2012-11-20 15:28:45 -05:00
02b17ea81f
Merge branch 'master' into charge_failed
2012-11-20 12:08:36 -08:00
7fcd0ba3af
change css filenames so that we can force user refresh
2012-11-20 14:26:06 -05:00
9f43c9a43c
this one too
2012-11-20 13:41:00 -05:00
ba3c0d3871
& not &
2012-11-20 13:40:25 -05:00
c034e10b30
Putting in some code to record a PaymentResponse to track errors in stripelib.Execute
2012-11-20 09:28:10 -08:00
029cd9740d
that line looks better outside the form
2012-11-20 10:10:30 -05:00
810580779e
fixing nits
2012-11-20 10:06:40 -05:00
a2abb92038
makes pledge action clearer by describing in more contexts and using Pledge rather than Support
2012-11-20 09:56:04 -05:00
81e27e234e
decided that phrasing was confusing
2012-11-20 09:09:03 -05:00
8b3287d85d
Merge branch 'master' into charge_failed
2012-11-19 10:28:18 -08:00
716468cf0d
Merge branch 'webhooks' into charge_failed
2012-11-19 10:26:13 -08:00
4544fb05a5
Merge branch 'master' into charge_failed
2012-11-19 09:22:19 -08:00
af8a661eb7
Merge branch 'master' into webhooks
2012-11-19 09:21:38 -08:00
4da9b6ae36
Merge branch 'master' into empty_stripe_token
2012-11-19 09:21:01 -08:00
0b657cf1c1
clarify that acks are in the unglued ebook itself
2012-11-19 11:23:32 -05:00
2fd4743e4c
Merge pull request #77 from Gluejar/hijaxify_signin
...
Hijaxify signin and make forms more good
2012-11-16 13:25:28 -08:00
3253bcca6f
also suppress sign up box on /accounts/register
2012-11-16 15:47:03 -05:00
bd23eef4da
Merge branch 'master' into empty_stripe_token
2012-11-16 12:36:58 -08:00
645c7d41da
Merge branch 'master' into webhooks
2012-11-16 10:48:17 -08:00
7f499bb6f2
Merge branch 'master' into charge_failed
2012-11-16 10:46:28 -08:00
fce06ca854
Update frontend/templates/press.html
2012-11-16 13:22:36 -05:00
2858ed194c
bugfixing
2012-11-16 11:43:00 -05:00
e613fe9365
added version to js url to force reload
2012-11-16 11:32:27 -05:00
87da5ae50e
tweaking phrasing following user feedback
2012-11-16 10:07:45 -05:00
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
acfdbfdf9c
Stephen's campaign closed :/
2012-11-16 08:00:22 -05:00
b02a289e01
Add templates for pledge_failed notification
2012-11-15 09:06:55 -08:00
7b75c36390
Now UnifiedCampaignTests passing -- and number of emails sent out align with expectation
2012-11-14 14:33:37 -08:00
4fa36ad30e
test_stripe_token_none passes now
2012-11-14 12:14:06 -08:00
e26885870f
Merge branch 'empty_stripe_token' into charge_failed
2012-11-14 11:51:59 -08:00
4100fa5468
catch empty token at the view level
2012-11-14 11:51:32 -08:00
ec09588650
Add a (currently failing) test test_stripe_token_none
2012-11-14 11:39:56 -08:00
8b14f37967
Merge branch 'webhooks' into charge_failed
2012-11-13 11:33:23 -08:00
678bef6530
Merge branch 'master' into webhooks
2012-11-13 11:32:55 -08:00
f2bb53f132
recharge signal being fired now
2012-11-12 12:48:03 -08:00
2dc20d18ec
Merge branch 'master' into hijaxify_signin
2012-11-12 10:10:59 -05:00
097241493c
separating out rest of hijax vs non-hijax styling
2012-11-07 15:56:37 -05:00
c5ed14b6dc
further rectifying css
2012-11-07 15:34:10 -05:00
d9905df303
first pass at hijaxifying signin link
2012-11-07 14:58:40 -05:00
d7e4384236
add badge link to notifications page and suppress menu drop-down when clicking on it
2012-11-07 13:45:10 -05:00
d02b13a9fc
Merge branch 'master' into webhooks
2012-11-07 08:35:19 -08:00
9e8f54ab66
Merge branch 'master' into charge_failed
2012-11-07 08:11:13 -08:00
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
304ddb6bdc
add badge to avatar when there are unseen notifications
2012-11-06 10:06:10 -05:00
50c51bd058
supporter not always in context, so use something that is
2012-11-06 09:54:42 -05:00
271741ead4
more consistent capitalization
2012-11-06 09:36:54 -05:00
0bcf845058
suppress top signup button on landing page
2012-11-06 09:34:31 -05:00
b3f21ecce3
consistent sign in/sign up capitalization
2012-11-06 09:31:53 -05:00
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
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
14cd6209bf
continuing on UnifiedCampaignTests
2012-10-31 11:57:39 -07:00
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
78c62ef553
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/work.html
2012-10-25 09:43:29 -04:00
ec20417039
Update frontend/templates/press.html
2012-10-25 10:14:40 -03:00
1a83b6cfc4
Merge pull request #73 from Gluejar/clarify_acknowledgements
...
Clarify acknowledgements
2012-10-24 09:14:12 -07:00
08e49036d1
Merge pull request #74 from Gluejar/fix_nav_menu
...
Fix nav menu
2012-10-24 09:13:43 -07:00
4a87253ca7
only show the premiums section if there actually are premiums
2012-10-24 11:34:22 -04:00
9eb0323768
add case where ungluer has not yet pledged
2012-10-24 11:30:37 -04:00
d4549dfdb6
explain about acknowledgements in campaign management page
2012-10-24 11:25:37 -04:00
89b92b4dba
add acknowledgements to support menu
2012-10-24 11:25:17 -04:00
cc18eb20d3
add acknowledgements to support menu
2012-10-24 11:24:46 -04:00
e6ed4c3074
explain about acknowledgements in campaign management page
2012-10-24 11:00:35 -04:00
b4c1d09e88
Merge pull request #64 from Gluejar/prepopulate_ack_name
...
Prepopulate ack name
2012-10-23 10:35:40 -07:00
673b890e42
add production setting and only use google analytics in production
2012-10-23 10:24:16 -04:00
ef4e35d174
is_preview is in sitewide context, do not need to add here
2012-10-23 10:24:02 -04:00
f9f19b2043
if last transaction ack_name was blank, use username as ack_name
2012-10-23 09:37:00 -04:00
aa338e9811
amazon situation now resolved
2012-10-23 09:08:09 -04:00
6b348f2b76
don't need that conditional any more
2012-10-22 15:45:11 -04:00
4effa6faf9
communicate current outage, provide CTAs for current and future ones
2012-10-22 15:44:56 -04:00
02f803291a
communicate current outage, provide CTAs for current and future ones
2012-10-22 15:43:45 -04:00
002298d51a
don't need that conditional any more
2012-10-22 15:43:25 -04:00
104992612b
first pass at making things visually distinct if there are notifications
2012-10-19 15:01:06 -04:00
836a957d97
add profile settings link to dropdown
2012-10-19 12:31:23 -04:00
09d5b00e50
highlight editing area if #edit is in url
2012-10-19 12:26:11 -04:00
1bf4743667
making notifications prettier
2012-10-19 12:19:56 -04:00
11aac359e6
adding drop-down menu
2012-10-19 12:01:28 -04:00
21ef0c1bf2
now passing data through initial form values, not hidden divs
2012-10-18 14:16:05 -04:00
79aefd4c91
nope, need to set the values over here
2012-10-18 14:13:42 -04:00
4a6a392481
ack_name and anonpref are form initial values, not context variables
2012-10-18 13:57:39 -04:00
e3cdf397d3
Merge branch 'master' of github.com:Gluejar/regluit into prepopulate_ack_name
2012-10-18 10:12:13 -04:00
6b78ff7685
message for no pledges, html nits
2012-10-18 09:04:22 -04:00
64681d95f7
ohhh that's how class-based views work
2012-10-17 12:11:54 -04:00
96918d60a5
if not modifying pledge use ack data from previous transaction to prefill ack boxes [ #37939351 ]
2012-10-17 11:54:29 -04:00
79fca69cf9
Update frontend/templates/press.html
2012-10-16 16:41:37 -03:00
3831a1ea59
clarifying kwarg
2012-10-16 11:36:51 -04:00
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
102937567b
better syntax
2012-10-16 10:20:41 -04:00
f7615ffa7c
fix bug where modify doesn't initialize to previous premium
2012-10-15 11:39:09 -04:00
80fae98b88
Merge pull request #60 from Gluejar/manage_user_cc
...
tweak error page, other nits
2012-10-15 07:50:45 -07:00
5ddbcd8d67
Improve error message to encourage user to try again
2012-10-15 10:47:18 -04:00
48be5a1191
xhtml nits
2012-10-15 10:28:31 -04:00
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
824b6d3ff7
Merge pull request #54 from Gluejar/slideshow
...
Slideshow
2012-10-15 07:04:43 -07:00
5955445fbb
tweaks
2012-10-15 09:52:39 -04:00
5c96382220
now that we have comprehensive account management page, link should go to it
2012-10-15 09:52:32 -04:00
1db22071fd
slideshow now pulls from recommended user
2012-10-15 00:59:46 -04:00
1ccc45875c
This message may be more intelligible to those new to the site.
2012-10-15 00:49:22 -04:00
6c0906192f
Add exception message to when there is an error in creating new account
2012-10-14 21:42:09 -07:00
4484e504f8
resolve merge conflicts
2012-10-15 00:31:45 -04:00
b1e9acac11
a bit prettier by stealing pledge complete styling
2012-10-15 00:22:23 -04:00
1964eec782
add links to account management page [ #37674453 ]
2012-10-15 00:16:56 -04:00
bda3211a76
user can manage their account credit card [ #37674369 ]
2012-10-14 23:41:17 -04:00
b923f741ce
DRY stuff that makes stripe work
2012-10-14 23:38:18 -04:00
168df09ac4
Display error message if make_account fails
2012-10-14 19:47:40 -07:00
1778427b01
Merge pull request #56 from Gluejar/proof_notifications
...
Proof notifications
2012-10-14 14:52:16 -07:00
3e2d65afd9
list the user's pledges [ #37674453 ]
...
see result at /accounts/manage/
2012-10-14 17:44:17 -04:00
80ec41422e
DRY the transaction summary
2012-10-14 17:42:28 -04:00
386a30e3da
missing endif
2012-10-14 17:27:52 -04:00
590320f555
that period looks weird if the user's dedication already includes one
2012-10-14 17:27:38 -04:00
56f2357b50
DRYer
2012-10-14 17:19:33 -04:00
0c8d73fbc7
making acknowledgements formatting the same
2012-10-14 17:15:45 -04:00
c15ecd7715
remove ref to payment processor, add acknowledgements
2012-10-14 17:04:32 -04:00
bde8e98518
create empty manage account view
2012-10-14 15:31:18 -04:00
82e0e17017
stopgap for [ #37714043 ]
2012-10-14 15:20:55 -04:00
1ae6f463c9
don't need to feature successful campaigns in slideshow
2012-10-14 15:01:10 -04:00
2441158d67
less confusing message, for when the slideshow has non-campaign books
2012-10-14 15:00:58 -04:00
f30329a892
when we trn is_preview off the message on top should change
2012-10-14 14:54:32 -04:00
201f5d588d
re-add Andromeda's anonymity phrasing
2012-10-14 14:22:07 -04:00
90c080827c
Merge branch 'fix_pledge_nits' of github.com:Gluejar/regluit into fix_pledge_nits
2012-10-14 12:03:54 -04:00
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
9caf7853f1
Merge branch 'master' of github.com:Gluejar/regluit
...
Conflicts:
frontend/templates/pledge_complete.html
2012-10-14 11:27:58 -04:00
f152bc97b1
Merge branch 'reuse_account'
...
Conflicts:
frontend/views.py
2012-10-13 16:19:45 -07:00
8d6cc6f4c9
this makes the boder of the preapproval amount white
2012-10-13 14:12:34 -04:00
5bde0da8ca
[ #37716025 ] reuse a user's credit card
2012-10-13 13:45:46 -04:00
674637f616
we weren't checking that request.user==transaction.user
2012-10-13 13:40:36 -04:00
dbacb5a96d
max_amount, not amount before the authorization
2012-10-13 13:38:39 -04:00
8c20339618
typo
2012-10-13 13:35:41 -04:00
ef4b5bdb84
limit max pledge to $2000 [finish #37674713 ]
2012-10-13 10:13:46 -04:00
f83ff09d05
plug security hole
2012-10-13 00:46:34 -04:00
3485f9fd92
fixed text too close to border by adding heading
2012-10-12 23:57:42 -04:00
476ce46dab
display and notifications of acknowledgements
2012-10-12 23:45:09 -04:00
cc47a28687
removing name and dedication also not done very well
2012-10-12 23:43:51 -04:00
957d73c462
fixed problem modifying anonymous = true
2012-10-12 22:24:58 -04:00
b65e6d4d1d
note anonymity in thank-you page
2012-10-12 15:21:14 -04:00
034439d39b
should be focus, not click
2012-10-12 15:20:23 -04:00
dd7334b54b
explanation of CVC [ #36797599 ]
2012-10-12 14:57:38 -04:00
e155165eb2
fancifying handling of MM and YYYY [ #36797599 ]
2012-10-12 14:23:31 -04:00
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
f328ccfa78
Update frontend/templates/press.html
2012-10-12 09:56:50 -03:00
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
cc4c190d73
adding address collection to fund_the_pledge
2012-10-11 13:49:56 -04:00
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
3c01c3c9dd
Merge pull request #46 from Gluejar/faq_edit
...
small change per AM
2012-10-11 07:31:14 -07:00
50d506b09d
small change per AM
2012-10-11 09:59:40 -04:00
ec0ba04d76
created editions may have cover images but not google books ids
2012-10-11 09:48:55 -04: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
6893b549a2
first pass at adding address collection
2012-10-10 14:23:02 -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
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
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
cf4d334b71
Merge pull request #39 from Gluejar/stripe_exception
...
Stripe exception
2012-10-09 07:54:31 -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
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
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
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
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
757a3469b5
let's use css for borders
2012-10-03 13:15:46 -04:00
113148d6a9
swapped badges, deleted empty badge, added title to edit icon
2012-10-03 12:17:23 -04: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
ceebcb690d
step one: fix media links [ #37068821 ]
2012-10-02 18:12:44 -04:00
68615b3b3d
Merge branch 'update_manage_campaign'
2012-10-02 13:08:55 -07:00
1dad4342c9
remove acknowledgements from premium display
2012-10-02 14:42:39 -04:00
e4cccc277f
try this placement of the star
2012-10-02 14:17:26 -04:00
5b19d7e765
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-02 13:52:58 -04:00
bf5e81b9a8
Merge branch 'master' into relaunch_ry
2012-10-02 10:52:04 -07:00
75f2ad0b46
Merge pull request #28 from Gluejar/campaign_relaunch
...
fixing bug: successful campaigns were relaunchable.
2012-10-02 10:48:41 -07:00
1cb2461daa
merging changes
2012-10-02 13:36:30 -04:00
9b42c0ccd9
Merge branch 'master' into relaunch_ry
...
Conflicts:
requirements_versioned.pip
2012-10-02 10:18:24 -07:00
0ec9789e56
merging in relaunch_ry in hopes that stripe wil work
2012-10-02 10:25:43 -04:00
4cf4787a95
don't display username
2012-10-02 09:32:33 -04:00
2c2ce2a34f
suppress display of any amount premium if it's the only premium
2012-10-02 09:29:18 -04:00
2371aad994
update FAQ to reflect new payment system
2012-10-02 09:18:44 -04:00
a9d9cde55a
grammar
2012-10-02 07:55:11 -04:00
d54f45d511
further aesthetic refinements
2012-10-01 15:53:41 -04:00
33e652881c
Merge branch 'master' into pledged_badges
2012-10-01 15:38:52 -04:00
6a6045e9ab
first pass at prettifying stripe process
2012-10-01 15:31:17 -04:00
99c228323e
fix double toggle when clicking on star
2012-10-01 15:24:11 -04:00
fd845d627b
is unglued is not grammatical here
2012-10-01 09:47:32 -04:00
753ca046a0
Merge branch 'pledged_badges' of github.com:Gluejar/regluit into pledged_badges
2012-10-01 09:35:19 -04:00
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
0955dc0f78
Merge pull request #29 from Gluejar/trivial_edits
...
Trivial edits
2012-10-01 06:16:46 -07:00
6117b8475f
minor style edits
2012-10-01 09:15:38 -04:00
abea3a67de
updating handling of premiums and anonymity
2012-10-01 09:12:40 -04:00
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
b07afdc97d
fixing bug: successful campaigns were relaunchable.
2012-09-28 17:44:08 -04:00
51f8e90487
fixed markup syntax of faq
2012-09-28 17:16:25 -04:00
94ed8fa8df
removed unbalanced <span>
2012-09-28 17:09:21 -04:00
87e2d0e0b4
fix OLA work number 29340547
2012-09-28 16:02:03 -04:00
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
8cb4586f78
Merge pull request #20 from Gluejar/relaunch
...
Relaunch
2012-09-28 07:55:07 -07:00
839a864149
Merge branch 'relaunch' of github.com:Gluejar/regluit into relaunch
2012-09-28 10:40:56 -04:00
079487783c
incorporating AM's revisions to FAQ
2012-09-28 10:40:44 -04:00
d72df702aa
Merge branch 'master' into relaunch_ry
2012-09-27 15:01:20 -07:00
3b04ddb4a9
Merge branch 'relaunch' into relaunch_ry
2012-09-27 14:07:47 -07:00
800dc128ab
Merge branch 'campaign_relaunch' into relaunch
...
Conflicts:
frontend/templates/manage_campaign.html
2012-09-27 14:04:00 -07:00
81f45984e8
prevent campaign launch button from being visible to non-staff during preview
2012-09-27 13:11:19 -04:00
2b2bea8978
not using that any more
2012-09-27 12:40:30 -04:00
57df9c116e
removing references to paypal and amazon
2012-09-27 12:35:23 -04:00
a48f61793d
only staff can launch campaigns during preview
2012-09-27 12:14:09 -03:00
8bd7a5eb65
[deliver #36743191 ] move stripe implementation UI back to stripe.js
2012-09-26 15:03:46 -07:00
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
9af9c09e5d
more thoughtful handling of readmill url
2012-09-26 14:59:13 -04:00
77abb2d048
Merge pull request #18 from Gluejar/add_oclc
...
Add worldcat links and oclcnum editing [#32289887 ]
2012-09-26 06:36:07 -07:00
f18b7e80cb
anchor text shouldn't be confusing
2012-09-25 16:46:58 -03:00
1cbe62d573
Redirecting to pledge_complete works now -- though there's definitely clean up to do
2012-09-25 11:52:56 -07:00
278a36e2f2
unglued_epub_url should be looking only at unglued books, not all epubs
2012-09-25 11:42:20 -04:00
b03decfb00
wrap ebook link separately around each icon so underline doesn't show up in spaces onhover
2012-09-25 11:09:33 -04:00
0989319430
inline script wasn't actually doing anything
2012-09-25 10:53:54 -04:00
38d115e5a1
no longer need readmill script since we're pulling send script directly
2012-09-25 10:53:23 -04:00
050bf58da5
add ability to set oclcnumbers for editions. [#finish 32289887]
...
(note also subtle chage to isbn editiing)
2012-09-24 21:51:57 -04:00
d0be2f8761
[ #36469239 ] I can now get a transaction to work via stripelib.py now
2012-09-24 16:29:20 -07:00
ccc082545a
[ #32289887 ] add worldcat learn more...
...
test it on /work/82838/
2012-09-24 15:36:39 -04:00
6a4d8fd3ff
Merge branch 'relaunch' into paymentmanager_account
2012-09-24 09:52:24 -07:00
de4092d23d
Merge pull request #14 from Gluejar/nonprofit_switch
...
Nonprofit switch [deliver #36476831 ]
2012-09-24 09:50:22 -07:00
59f530f8b7
Merge branch 'relaunch_ry' into paymentmanager_account
2012-09-24 09:09:57 -07:00
4a82d59a49
Merge branch 'relaunch' into relaunch_ry
2012-09-24 09:09:11 -07:00
a91a70e6ef
Merge pull request #12 from Gluejar/master
...
merge all the mester into relaunch
2012-09-24 09:07:44 -07:00
44ed8fdfcf
stop referring to acknowledgements as rewards to avoid confusing people
2012-09-24 11:52:30 -03:00
4b49b1df4b
display badges on user profiles [ #29340547 ]
2012-09-22 23:55:07 -04:00
f940c3e239
more removing dates
2012-09-22 23:49:43 -04:00
72eb8f9e26
made the tab badge mouseover text stop saying "I" when it's another supporter's page
2012-09-22 23:48:53 -04:00
fde2202661
try removing dates again
2012-09-22 23:46:00 -04:00
91ab80d112
Revert "remove user's join date (need the space!)"
...
This reverts commit 756f6f6498
2012-09-22 23:43:59 -04:00
756f6f6498
remove user's join date (need the space!)
2012-09-22 23:38:39 -04:00
1de7dd1654
Merge branch 'master' into improvify_download_page
2012-09-22 13:51:28 -04:00
bd77dc0638
Download page: Added format icons, alt text to images and source for non-unglued ebooks
2012-09-21 22:23:17 -04:00
e8494864d4
This code is BROKEN -- but I'm committing this to capture current state of work -- problem is
...
global name 'stripe_token' is not defined
Exception Location: /Users/raymondyee/C/src/Gluejar/regluit/payment/stripelib.py in __init__, line 285
when you run the selenium test -- brings up issue of where to create Stripe account in PaymentManager abstraction
2012-09-21 17:40:33 -07:00
9a65996644
Merge pull request #16 from Gluejar/improvify_download_page
...
Improvify download page [#36156381 ]
2012-09-21 17:09:08 -07:00
c4a2db66f7
Fix index out of bounds errors when no unglued epub is available [ #36156381 ]
2012-09-21 19:54:43 -04:00
d8cbf39849
removed odd semicolons from non-working readmill code [ #36156381 ]
2012-09-21 18:19:11 -04:00
a7210ad778
fund pledge_the_pledge page [ #36476831 ]
2012-09-21 17:31:28 -04:00
422826c4c2
Merge branch 'relaunch' into nonprofit_switch
2012-09-21 17:17:07 -04:00
63af76efc5
donation page
2012-09-21 17:15:30 -04:00
2ea3059682
[ #36469239 ] get rid of retain_cc_info since we will retain CC info for all pledges
2012-09-21 12:51:21 -07:00
b6862cad3d
fix copying the premiums [ #36192903 ]
2012-09-21 13:54:59 -04:00
d39b098cc1
[ #36197947 ] revised description of "paypal" email address
2012-09-21 13:08:54 -04:00
40a5b09359
rh_tools now shows campaign totals by campaign [ #16581715 ]
2012-09-21 12:32:32 -04:00
5d7e6a39bd
managers can clone UNSUCCESSFUL Campaigns, and can only manage INITIALIZED and ACTIVE ones. [ #36192903 ][ #30068227 ]
2012-09-21 12:10:13 -04:00
1383d4b1f4
update description of rewards
2012-09-20 17:48:54 -04:00
5589e5d209
Merge pull request #7 from Gluejar/improvify_download_page
...
Improvify download page
2012-09-20 12:58:45 -07:00
acf1763672
Update frontend/templates/press.html
2012-09-20 15:27:36 -03:00
1f6fd19918
Merge branch 'relaunch' into relaunch_ry
2012-09-20 10:39:56 -07:00
381f59fe62
Merge branch 'relaunch' into stripe_for_donation
2012-09-20 11:02:38 -04:00
05d082604c
updating selenium script for relaunch
2012-09-19 14:30:47 -07:00
3ce8d605a6
add stripe stuff to donation form
2012-09-19 14:04:28 -04:00
b2df67e22f
removed reconcile_pledge.js on pages that don't need it
2012-09-19 14:01:05 -04:00
5419c869ed
now the readmill script works on the lightbox too
2012-09-19 12:08:27 -04:00
2f084e2a7b
Merge branch 'master' into relaunch_ry
2012-09-19 08:20:35 -07:00
4d562b64d5
Merge pull request #8 from Gluejar/lockss
...
lockss needs a page listing the books unglued in each year to crawl
2012-09-19 07:31:27 -07:00
efa3187535
dynamically generate the readmill download url don't hardcode it you moron
2012-09-19 10:25:23 -04:00
980bb218a0
stripe2.Execute actually charges the transaction -- NEED to do some more error checking
2012-09-18 17:56:38 -07:00
be45a27b45
moving transaction.host None -> PAYMENT_HOST_NONE
...
a few typos (t->transaction, missing host)
skeleton for stripe2.py -- the module to implement various methods used by payment.manager
2012-09-18 17:01:07 -07:00
f2e4647e73
lockss needs a page listing the books unglued in each year to crawl
2012-09-18 14:16:59 -04:00
499b1f78b2
Merge pull request #6 from Gluejar/fix_zero_wisher_grammar
...
Fix zero wisher grammar
2012-09-18 10:41:09 -07:00
f581dd354b
readmill support
2012-09-18 13:40:52 -04:00
0de46d0bb6
DRM-free logo
2012-09-18 13:35:14 -04:00
82f6ceffd4
addressing comment
2012-09-18 13:09:19 -04:00
b0c2f0926b
whoops there are other cases
2012-09-18 12:12:50 -04:00
33ef8f6844
Update frontend/templates/press.html
2012-09-18 12:45:36 -03:00
35180252e0
bugfix [ #36104625 ]
2012-09-18 11:10:53 -04:00
f03855f2de
bugfix [ #36104625 ]
2012-09-18 11:10:01 -04:00
2216369bbf
include clickable links, make grammar singular/plural sensitive
2012-09-18 10:16:08 -04:00
6a650affc8
Now recording pledge as such -- and not charging immediately.
...
running into exception at https://github.com/Gluejar/regluit/blob/relaunch_ry/payment/manager.py#L554-- have to start implementing a baseclass for stripelib to handle pledge modification
2012-09-17 16:56:07 -07:00
69e959a0c8
fleshing out of payment.models.Account
2012-09-17 14:55:28 -07:00
c545173793
First pass at payment.models.Account
2012-09-13 16:43:54 -07:00
a68cd81823
Merge branch 'master' into relaunch_ry
2012-09-13 15:55:43 -07:00
c5f22742c1
In making a stripe charge, record transaction.type and transaction.approved.
...
Fixed Campaign.transactions() to handle default variables properly (compare with dfe17f94fa (L0R257)
2012-09-13 14:12:49 -07:00
cbd9640287
Update frontend/templates/base.html
...
better link, now that that blog post exists
2012-09-13 15:42:11 -03:00
b85fbfc78b
Merge branch 'master' into relaunch_ry
2012-09-13 10:42:35 -07:00
eac0e24b1b
Small change: now storing amount and status for transaction with new pledge.
2012-09-13 10:39:42 -07:00
4cd685a61a
communicate about lack of active campaigns
2012-09-13 11:22:40 -04:00
7bd44fb93e
link to work page not download page
2012-09-13 11:17:05 -04:00
fdf27c4029
make work title on download page a link
2012-09-13 11:14:32 -04:00
d4309dd46c
digital shift coverage of OLA unglued ebook launch
2012-09-12 11:55:27 -04:00
de78548a32
list press releases on press page
2012-09-12 11:31:22 -04:00
fb648bbb5c
Merge branch 'fix_lockss'
2012-09-12 10:37:29 -04:00
18a598f628
need to change lockss page since unglued adheres to editions
2012-09-12 10:11:49 -04:00
3733780ef3
Merge branch 'master' of github.com:Gluejar/regluit
2012-09-12 10:00:31 -04:00
d8316c76ec
user isn't in the context so we shouldn't reference it
2012-09-12 08:41:22 -04:00
c457dec497
helpful ebook format notations
2012-09-12 00:20:09 -04:00
64461cc49e
one letter typo was messing up unglued ebooks display
2012-09-12 00:09:29 -04:00
eshellman
Andromeda Yelton
Raymond Yee