New features:

    * self service sponsored links (initial version with no targeting)
       * credit card processing with authorize.net (and corresponding interaction code)
    * hardcache -- for persistent cache keys with expiration
    * Awards code
    * messaging overhaul round 1.  Added mark as unread as well as message sorting

  Additions:
    * add TedScraper and improve youtube scraper (ala tritelife); move traffic link on sponsored links and make them still visible when the promotion is over
    * compressify all of our pngs, and set it up so thumbs, sr images, and the sprite get compressed every time they are generated
    * rate limit logins (naive way)
    * add a limit to the length of the moderator sidebox.
    * add over18 thumbnail handling and NSFW label on nsfw content
    * make NSFW label optional, and make the operation of the pref checkboxes sensible
    * add the option (for moderators) to remove a subreddit from the default set
    * Combine the queue handling code to be easily plumbed, and use it to precompute /comments

  Bugfixes:
    * trap duplicate vote error
    * Fixed new mail mouseover on toolbar
    * spammers can't send empty bodied emails any more (they will get rejected as they should).

r2/Makefile

@@ -48,7 +48,7 @@ MAINCSS    := $(foreach css, $(main_css), $(static_dir)/$(css))
 RTLCSS      = $(CSSTARGETS:.css=-rtl.css) $(MAINCSS:.css=-rtl.css)
 
 
-MD5S = $(JSTARGETS:=.md5) $(CSSTARGETS:=.md5)
+MD5S = $(JSTARGETS:=.md5) $(CSSTARGETS:=.md5) $(MAINCSS:=.md5) $(RTLCSS:=.md5)
 
 ifdef PRIVATEREPOS
 INIUPDATE = $(wildcard *.update)

r2/example.ini

@@ -10,6 +10,8 @@ uncompressedJS = true
 translator = true
 sqlprinting = false
 
+log_start = true
+
 proxy_addr = 
 log_path   = 
 
@@ -61,6 +63,7 @@ db_create_tables = True
 
 type_db = main
 rel_type_db = main
+hardcache_db = main
 
 db_table_link = thing, main, main
 db_table_account = thing, main
@@ -116,6 +119,7 @@ max_sr_images = 20
 
 show_awards = False
 
+takedown_sr = _takedowns
 login_cookie = reddit_session
 domain = localhost
 domain_prefix = 
@@ -130,6 +134,7 @@ page_cache_time = 30
 static_path = /static/
 useragent = Mozilla/5.0 (compatible; bot/1.0; ChangeMe)
 allow_shutdown = False
+profanity_wordlist = 
 
 solr_url =  
 solr_cache_time = 300
@@ -157,7 +162,6 @@ HOT_PAGE_AGE = 1
 
 #
 rising_period = 12 hours
-new_incubation = 90 seconds
 
 # time of ratelimit purgatory (min)
 RATELIMIT = 10
@@ -188,7 +192,7 @@ spreadshirt_test_font =
 [server:main]
 use = egg:Paste#http
 host = 0.0.0.0
-port = %(port)s
+port = %(scgi_port)s
 
 [app:main]
 use = egg:r2