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
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
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
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
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
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
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
af8a661eb7
Merge branch 'master' into webhooks
2012-11-19 09:21:38 -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
645c7d41da
Merge branch 'master' into webhooks
2012-11-16 10:48:17 -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
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
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
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
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
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
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
102937567b
better syntax
2012-10-16 10:20:41 -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
1ccc45875c
This message may be more intelligible to those new to the site.
2012-10-15 00:49:22 -04: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
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
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
8c20339618
typo
2012-10-13 13:35:41 -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
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
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
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
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
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
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
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
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
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
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
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
Andromeda Yelton
Raymond Yee
eric