Commit Graph

5350 Commits

Author SHA1 Message Date
MelissaCole
4176f33021 Account for no secret in reverse_gold_purchase
Secret was removed for recurring Stripe calls. To see if it's a recurring
subscription, we can see if a subscr_id exists.
2015-01-23 11:30:50 -08:00
Chad Birch
88a05fd3d2 Ban page: add note about message and unhide fields 2015-01-23 10:38:16 -08:00
Chad Birch
52b4be0749 Prevent ban with custom message that will not send
A user will only be sent a ban notification if either of the following
is true:

1. they are subscribed to the subreddit
2. they have ever gained or lost karma (of any type) in the subreddit

Because of these conditions, there is some confusion in cases where
moderators ban someone that has made a post that didn't yet receive any
votes, where they still expect the user to receive a ban message and be
able to see the reason for the ban that they requested to include in it.

This commit makes it so that including a custom reason is not possible
in a case where the message won't actually be sent, to prevent that
confusion.
2015-01-23 10:38:04 -08:00
Chad Birch
214445df8f Exempt admins from subreddit image upload limit 2015-01-23 10:37:58 -08:00
Chad Birch
dcd25c1cca Remove GET_bookmarklet endpoint 2015-01-23 10:37:49 -08:00
MelissaCole
a6cfd627e0 Clear secret if subscr_id already exists
Currently all subscriptions (new or recurring) have a secret (autorenew-).
To make it easier to find which type of payment it is, this will clear the
secret if this is a recurring subscription (which is the same structure
paypal takes).
2015-01-22 14:05:28 -08:00
MelissaCole
ee0682ad26 Fix stripe secret being nulled when renewed 2015-01-22 14:05:23 -08:00
MelissaCole
8ef7766336 Add customer.card.updated to event type (noop) 2015-01-22 14:05:17 -08:00
Brian Simpson
45bc8b09f5 modlog: Fix showing of subreddit name when in a multireddit. 2015-01-22 15:13:35 -05:00
Brian Simpson
dbb7935bf8 Enable per-user global selfserve cpm override.
Setting Account.selfserve_cpm_override_pennies will let the user create
campaigns with ANY targeting at that price.
2015-01-22 15:13:24 -05:00
Brian Simpson
a6c1d2e81f Allow custom pricing for location targets. 2015-01-22 15:13:20 -05:00
Brian Simpson
df8f3e4ccc PromotionWeights.add: Use map not filter to fix names. 2015-01-17 02:27:54 -05:00
Brian Simpson
b38a087072 PromotionWeights: improve object creation and deletion. 2015-01-17 02:27:45 -05:00
Brian Simpson
4c37d92bbe Clarify wording when a user initiates a thumbnail rescrape.
Previously it could seem like the browser will get notified when complete.
2015-01-16 03:23:24 -05:00
umbrae
7bed81dece Inbox counts: Remove live alter of unread count when mark-on-open is off
This is a good interaction in theory, but gets pretty hairy to test for
in practice due to modmail being a subset of messages as well as
subreddit messages not being restricted to modmail. This issue is
blocking release, so remove the buggy feature for rollout to be addressed
at a later date.
2015-01-16 12:03:29 -08:00
umbrae
5a1051a267 Make NSFL in link titles also denote over18. 2015-01-16 12:03:23 -08:00
Brian Simpson
232563ee22 Report hourly unique clicks. 2015-01-16 01:48:41 -05:00
Keith Mitchell
f58b70fa25 LabeledMulti: Age-normalized hot
Update normalized_hot to allow certain LabeledMultis
to specify slightly different weighting between subreddits
compared to the current algorithm.

Current merge algorithm always results in an N-subreddit multi
having the first N results being the #1 result from each of
the individual subreddits; this is not always ideal for slow
subreddits (e.g., /r/announcements and /r/blog).

Age-weighting allows a LabeledMulti to scale those older posts
further down the list, and lets them drop off after a number of
days.

The age-weighting will require a change to the use of sgm
in normalized_hot prior to full deployment, as the calculated
ehot values are no longer global amongst all users.
2015-01-16 11:41:41 -08:00
Brian Simpson
1c8a27121a Preserve the originally attempted url and subreddit when resubmitting a link. 2015-01-16 01:21:32 -05:00
Jordan Milne
bb0f5b552c Replace ad-hoc HTML templating with format_html() and _wsf()
Conflicts:
	r2/r2/templates/prefoptions.html
2015-01-16 00:29:59 -08:00
Jordan Milne
d8d0e46b95 Add format_html and format_html_join and _wsf
These functions should make it easier to do ad-hoc HTML templating
correctly.
2015-01-16 00:25:43 -08:00
Jordan Milne
b4bce39902 Rename mako_websafe to the more descriptive conditional_websafe 2015-01-16 00:25:28 -08:00
MelissaCole
e7d2d1806c Clear secret for recurring subscription payments 2015-01-15 14:17:40 -08:00
Keith Mitchell
61850e958a OAuth2: Validate OAuth2Client owner of refresh_tokens 2015-01-15 14:07:17 -08:00
Keith Mitchell
49dd4209da OAuth2: Expose leavemoderator, leavecontributor, accept_mod 2015-01-15 11:15:45 -08:00
Keith Mitchell
fb66af7c3b /dev/api: Remove api_section.apps
Programmatic use of OAuth developer management is discouraged
2015-01-15 11:15:35 -08:00
Keith Mitchell
a4dda3928b OAuth2: Expose /api/friend for mod tasks
Note: While I'd have preferred to do a "nice" endpoint
like what I did with user friends, there's been enough
delay in exposing /api/friend functionality to OAuth2
consumers that I decided it would be best to take the
less clean solution.
2015-01-15 11:15:24 -08:00
Keith Mitchell
a82bc65192 OAuth2 scopes: Space-separate multiple scopes 2015-01-15 11:15:14 -08:00
honestbleeps
ad42be6c94 Fix links getting marked as visited on right click 2015-01-15 09:54:21 -08:00
Jordan Milne
bb4d85fbe1 Allow setting c.site via the r param in GETs
Fixes flair not displaying when using GET_morechildren
2015-01-14 14:23:39 -08:00
Jordan Milne
12ae73b84e Add a username-relative userpage redirect at /user/me 2015-01-14 14:23:34 -08:00
Jordan Milne
cfd3a1cf1a Check if thing.childlisting is falsy before including it
This fixes bold `False`s showing up in the `.json-html`
and `.json-compact` renderstyles. Apparently been an issue for
5 years, but it was only noticed now.
2015-01-14 14:23:29 -08:00
Brian Simpson
034e267b45 Subreddit._by_name: always allow stalecache when retrieving names->ids.
Subreddit names never change. The subsequent Subreddit._byID will continue
to respect the supplied `stale` kwarg.
2015-01-14 17:17:36 -05:00
John-William Trenholm
32c1229d4c Add run time to promote.py 2015-01-13 13:14:20 -08:00
MelissaCole
a1ba729e67 Stop propagation in gold checkout for creddits 2015-01-13 12:49:28 -08:00
MelissaCole
236de26753 Make room for submit button on friends/ban page
The width is reduced to allow room for the submit button when the input element is edited.
2015-01-13 12:49:23 -08:00
Chad Birch
6b51528648 Subreddit.random_reddits(): fix logic error
The logic of this code contained a couple subtle errors that could cause
strange behavior. In reddit's current state of having two "automatic
subreddits" (which are always included in the front page set, and not
counted towards the limit), the fact that the automatic_ids list could
have an item removed while being iterated over meant that unsubscribing
from the first automatic subreddit (/r/blog) made it so that it was
effectively impossible to unsubscribe from the second one
(/r/announcements). If you unsubscribed, it would still be present in
your front page regardless, and if you stayed subscribed it would
actually be present twice.
2015-01-12 16:45:05 -07:00
Chad Birch
5c4f80d6ee Revert "Add back POST_update for API clients."
This reverts commit 605fa72772fa84b9245498f817cdc6d872ab3bdd.

This endpoint has had no significant traffic for months, and should be
safe to remove again at this point.
2015-01-12 16:45:01 -07:00
Keith Mitchell
159cb9f600 Prefix OAuth2 Access Tokens with user ID 2015-01-12 11:38:38 -08:00
Brian Simpson
4368be7d91 Allow sponsors to look up users by email. 2015-01-12 14:37:11 -05:00
Brian Simpson
003ca6e0bc Add AccountsByCanonicalEmail. 2015-01-12 14:37:11 -05:00
David Wick
680dcddc04 Fix text for password field on register.compact not appearing
Strength meter relies css/events from restyled login.  This
ensures it's there before trying to add the meter.
2015-01-12 11:31:28 -08:00
Brian Simpson
ac9b7141b5 Add tracking pixel url in response header for api requests. 2015-01-09 03:04:13 -05:00
Neil Williams
af09fa8dee Update license headers to 2015.
The highlight of each year for me.
2015-01-08 13:35:03 -08:00
David Wick
3a7cee6233 login/register: Add "an" before "account" 2015-01-08 12:59:50 -08:00
David Wick
3f0b7d3f35 Display reason for being flagged 2015-01-08 12:59:42 -08:00
David Wick
f8762d200b Reject fraudulent ads automatically 2015-01-08 12:59:36 -08:00
David Wick
5eca8e81ac Add community_email method 2015-01-08 12:59:23 -08:00
David Wick
705b49f073 Add listing for promotions suspected of fraud 2015-01-08 12:59:23 -08:00
David Wick
0baff564e5 Add a hook for when bids are edited 2015-01-08 12:57:57 -08:00