github/reddit
1
1
Fork 0
mirror of https://github.com/reddit-archive/reddit.git synced 2026-04-27 03:00:12 -04:00
Code Issues Packages Projects Releases Wiki Activity
6,450 Commits 1 Branch 0 Tags
09121a3cb87f6443fa7f86957b81ca558ad8dfd0
Commit Graph

6450 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Simpson
09121a3cb8 Switch srmember memcache pool from binary to ascii protocol. 2015-08-11 19:02:55 -04:00
Brian Simpson
35951538f9 Switch memoize memcache pool from binary to ascii protocol. 2015-08-11 19:02:47 -04:00
Brian Simpson
107d3b58ed Switch stalecache memcaches from binary to ascii protocol. 2015-08-11 19:02:39 -04:00
Chad Birch
167e9c29ff Event collector: send dict events as well as Event 
Apparently vote events are neither Event nor EventV2, they're just being
sent through as a dict. So these aren't being handled at all by
save_event and haven't been getting sent to the collector.
 2015-08-10 12:22:15 -06:00
Florence Yeun
abfa2b5911 Quarantine: Remove page class from interstitials 2015-08-10 10:16:04 -07:00
Florence Yeun
57972a8718 Quarantine: Return 403 
For the quarantine interstitial, more consistently return a 403 status
code.
 2015-08-10 10:16:04 -07:00
Kevin O'Connor
9ccda2c49f POST_comment: More granular scope checking. 
The `submit` scope was required to reply to messages, which instead
should have been the job of `privatemessages`.
 2015-08-06 16:57:00 -07:00
Florence Yeun
c362f1c611 Quarantine: Fix no clobbering of checkboxes 
Ensure that the `allow_top` and `show_media` checkboxes can still
be unchecked for non-quarantined subreddits.
 2015-08-06 11:27:45 -07:00
David Wick
d360ac33dc Remove click tracking from /ads 2015-08-06 10:46:41 -07:00
Chad Birch
7aaca55b2a Redirect /faq to Zendesk 2015-08-05 13:21:28 -07:00
Chad Birch
f5932fa75b Add content policy page, redirect /rules to it 2015-08-05 13:21:21 -07:00
Matt Lee
e3c9e37050 Quarantine: Change language on interstitial page and in sidebar. 
Conflicts:
	r2/r2/templates/quarantineinterstitial.html
 2015-08-05 13:19:59 -07:00
Matt Lee
572c5b391d Quarantine: Link to /prefs/update on interstitial. 
If the user is logged in but does not have verified email, link the
‘verified email’ text to the page where they can do that.
 2015-08-05 13:19:59 -07:00
Matt Lee
37ee65b087 Fix interstitial button alignment in Safari. 2015-08-05 13:19:59 -07:00
Matt Lee
37edba78b6 Cleanup stamp css. 
Fixes a regression on the NSFW stamp styling which causes the left &
right padding to be unbalanced.  Also removes the ‘rounded’ class from
stamps because it does nothing.
 2015-08-05 13:19:59 -07:00
Matt Lee
d23131f16e Add quarantine stamp to new search page. 
Also removes a hack that’s no longer necessary and was causing the
stamps to render inconsistently with the rest of the site.
 2015-08-05 13:19:59 -07:00
MelissaCole
91110355d7 Remove gilded, promoted and advertising tabs in disallowed subreddits 
Also abort on /gilded and /ads in these subreddits
 2015-08-05 13:19:59 -07:00
MelissaCole
bf8b78b04d Default allow_gilding in FakeSubreddit 2015-08-05 13:19:59 -07:00
MelissaCole
8b9df0f242 Unsubscribe from quarantined subreddit on opt out 2015-08-05 13:18:48 -07:00
Chad Birch
c4c0f4ab34 Quarantine: Feature flag hiding user numbers 2015-08-05 13:18:44 -07:00
Chad Birch
fae672ea8e Quarantine: hide subscribers / users here now 
This hides the display of the subscribers and "users here now" counts
for quarantined subreddits. 0 will be returned for both values through
the API.
 2015-08-05 13:18:44 -07:00
MelissaCole
2d38338eab Add API endpoint for opting into a quarantined subreddit 2015-08-05 13:18:44 -07:00
Matt Lee
3da619597a Replace over18 interstitial image. 2015-08-05 13:18:42 -07:00
Matt Lee
86ca226720 Remove style changes to NSFW stamp. 2015-08-05 13:18:42 -07:00
Matt Lee
143a8a7e14 Feature flag changes to existing interstitials. 2015-08-05 13:18:38 -07:00
Matt Lee
f022c3d110 Update content interstitials. 
Add new templates for interstitial pages, and update the banned, private, gold-only,
quarantined, and over 18 interstitials to use them.
 2015-08-05 13:18:38 -07:00
Matt Lee
17eccffd8c Quarantine: Fix caching issue with sidebar notice. 2015-08-05 13:18:38 -07:00
Matt Lee
b56db4a6bf Fix nsfw-stamp style in Firefox. 
Remove dotted bottom border.  Fixes for both old and new stamps.
 2015-08-05 13:18:34 -07:00
Matt Lee
bc7d4cf928 Quarantine: Move feature flag checks out of templates. 2015-08-05 13:18:34 -07:00
Florence Yeun
e2a7345a02 Quarantine: Add missing feature flag check 
Add the `quarantine` page class only when the feature is enabled.
 2015-08-05 13:18:28 -07:00
Florence Yeun
948b091180 Quarantine: Update wording 2015-08-05 13:18:28 -07:00
Florence Yeun
91bc08e843 Quarantine: 404 for unavailable content in api 
For non-html render types, return a 404 error instead of redirecting
to the content gate.
 2015-08-05 13:18:28 -07:00
Florence Yeun
e7c711c9ec Quarantine: Update header image 
Update the header image for quarantined subreddits and remove the
create subreddit snoos using a new `body` class.
 2015-08-05 13:18:28 -07:00
Florence Yeun
64ad1e8709 Quarantine: Opt out from content gate 
Declining to view a quarantined subreddit from the content gate should
send the user to the home page and opt out the user if applicable.
 2015-08-05 13:18:28 -07:00
Matt Lee
514ea2722e Update quarantined interstitial icon. 2015-08-05 13:18:27 -07:00
MelissaCole
3fd0cfd5d7 Fix uuid import bug 2015-08-05 13:18:27 -07:00
MelissaCole
cf9a9781cc Send quarantined subreddit actions to event-collector 
The available event_types are:
    quarantine_interstitial_view, quarantine_interstitial_dismiss,
    quarantine_opt_in, quarantine_opt_out
 2015-08-05 13:18:24 -07:00
Florence Yeun
a8cab6f148 Quarantine: Update feature flag 2015-08-05 13:17:23 -07:00
Florence Yeun
613eead51a Don't show welcome message for interstitials 2015-08-05 13:17:23 -07:00
Florence Yeun
8b7509b37b Readjust stamp padding 
For the new bold stamp style, increase stamp padding to 4px.
 2015-08-05 13:17:23 -07:00
Florence Yeun
7de163ef7f Quarantine: Add stamp to .compact 
Add the quarantine stamp for compact links throughout. Add the
quarantine stamp and NSFW stamp for compact comments on the user page.

Also, show both the quarantine stamp and NSFW stamp for comments on
the user page when applicable, to match the behavior for links.
 2015-08-05 13:17:23 -07:00
Matt Lee
9848155166 Quarantine: Add feature flag. 2015-08-05 13:17:23 -07:00
Matt Lee
c0de887fea Lower quarantine interstitial priority. 
If we would otherwise show a private or gold-only interstitial, show
that first.
 2015-08-05 13:17:23 -07:00
MelissaCole
a1c689c1fe Redirect /quarantine when dest doesn't include quarantined subreddit 2015-08-05 13:17:23 -07:00
Matt Lee
2792b84f68 Show quarantined subreddits in mod list if otherwise viewable. 2015-08-05 13:17:23 -07:00
Matt Lee
c626c7ae61 Newsletter: Don't show on over18 interstitial. 2015-08-05 13:17:23 -07:00
Matt Lee
2726158f2c Newsletter: Don't show on quarantine interstitial. 2015-08-05 13:17:23 -07:00
Matt Lee
d9a19e2b55 Extend interstitial to handle logged out and unverified cases. 2015-08-05 13:17:23 -07:00
Matt Lee
bd4b6e448a Update quarantine interstitial design. 2015-08-05 13:17:19 -07:00
Matt Lee
d9ffad5bcf Add quarantine notice to sidebar. 
Wraps the opt-out button in a box with some messaging.  Also moves the
opt-out above the subscribe button per the latest design specs.
 2015-08-05 13:16:58 -07:00