Skip to content

Commit

Permalink
update copyright strings. show star on admin comments after they've b…
Browse files Browse the repository at this point in the history
…een editted
  • Loading branch information
spez committed Feb 11, 2009
1 parent 00b2fa1 commit c837ef1
Show file tree
Hide file tree
Showing 288 changed files with 290 additions and 290 deletions.
4 changes: 2 additions & 2 deletions LICENSE
Original file line number Diff line number Diff line change
Expand Up @@ -487,12 +487,12 @@ The Original Code is Reddit.
The Original Developer is the Initial Developer. The Initial Developer of the
Original Code is CondeNet, Inc.

All portions of the code written by CondeNet are Copyright (c) 2006-2008
All portions of the code written by CondeNet are Copyright (c) 2006-2009
CondeNet, Inc. All Rights Reserved.

EXHIBIT B. Attribution Information

Attribution Copyright Notice: Copyright (c) 2006-2008 CondeNet, Inc. All Rights
Attribution Copyright Notice: Copyright (c) 2006-2009 CondeNet, Inc. All Rights
Reserved.

Attribution Phrase (not exceeding 10 words): Powered by Reddit
Expand Down
2 changes: 1 addition & 1 deletion config/solr/schema.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The Original Code is Reddit.
The Original Developer is the Initial Developer. The Initial Developer of
the Original Code is CondeNet, Inc.
All portions of the code written by CondeNet are Copyright (c) 2006-2008
All portions of the code written by CondeNet are Copyright (c) 2006-2009
CondeNet, Inc. All Rights Reserved.
-->

Expand Down
2 changes: 1 addition & 1 deletion config/solr/server.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The Original Code is Reddit.
The Original Developer is the Initial Developer. The Initial Developer of
the Original Code is CondeNet, Inc.
All portions of the code written by CondeNet are Copyright (c) 2006-2008
All portions of the code written by CondeNet are Copyright (c) 2006-2009
CondeNet, Inc. All Rights Reserved.
-->

Expand Down
2 changes: 1 addition & 1 deletion config/solr/solrconfig.xml
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ The Original Code is Reddit.
The Original Developer is the Initial Developer. The Initial Developer of
the Original Code is CondeNet, Inc.
All portions of the code written by CondeNet are Copyright (c) 2006-2008
All portions of the code written by CondeNet are Copyright (c) 2006-2009
CondeNet, Inc. All Rights Reserved.
-->
<config>
Expand Down
2 changes: 1 addition & 1 deletion r2/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################

Expand Down
2 changes: 1 addition & 1 deletion r2/babel.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
## The Original Developer is the Initial Developer. The Initial Developer of
## the Original Code is CondeNet, Inc.
##
## All portions of the code written by CondeNet are Copyright (c) 2006-2008
## All portions of the code written by CondeNet are Copyright (c) 2006-2009
## CondeNet, Inc. All Rights Reserved.
################################################################################

Expand Down
2 changes: 1 addition & 1 deletion r2/ez_setup/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
#!python
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
"""r2
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/commands.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
import paste.deploy.config
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.cache import sgm
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/admin_routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
def add(mc):
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
import os
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/middleware.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
"""Pylons middleware initialization"""
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/rewrites.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
import re
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/routing.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
"""
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/templates.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.manager import tp_manager
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/config/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
iters = (list, tuple, set)
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from listingcontroller import ListingController
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.controllers.reddit_base import RedditController
Expand Down
4 changes: 2 additions & 2 deletions r2/r2/controllers/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController
Expand Down Expand Up @@ -528,7 +528,7 @@ def POST_editcomment(self, form, jquery, comment, body):
errors.BAD_COMMENT, errors.COMMENT_TOO_LONG,
errors.NOT_AUTHOR):
comment.body = body
if not c.user_is_admin: comment.editted = True
comment.editted = True
comment._commit()

jquery.replace_things(comment, True, True)
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/buttons.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/captcha.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/embed.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController, proxyurl
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
import os.path
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/errors.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.utils import Storage, tup
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/feedback.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/front.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from validator import *
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/i18n.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from pylons import request, g
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/listingcontroller.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController, base_listing
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/post.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.pages import *
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/promotecontroller.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from validator import *
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/reddit_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
import r2.lib.helpers as h
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/redirect.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from pylons.controllers.util import redirect_to
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/template.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from r2.lib.base import *
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/toolbar.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from reddit_base import RedditController
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/validator/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from validator import *
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/controllers/validator/validator.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from pylons import c, request, g
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/i18n/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
2 changes: 1 addition & 1 deletion r2/r2/lib/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,6 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
2 changes: 1 addition & 1 deletion r2/r2/lib/app_globals.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################
from __future__ import with_statement
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/lib/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# The Original Developer is the Initial Developer. The Initial Developer of the
# Original Code is CondeNet, Inc.
#
# All portions of the code written by CondeNet are Copyright (c) 2006-2008
# All portions of the code written by CondeNet are Copyright (c) 2006-2009
# CondeNet, Inc. All Rights Reserved.
################################################################################

Expand Down
2 changes: 1 addition & 1 deletion r2/r2/lib/c/filters.c
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* The Original Developer is the Initial Developer. The Initial Developer of the
* Original Code is CondeNet, Inc.
*
* All portions of the code written by CondeNet are Copyright (c) 2006-2008
* All portions of the code written by CondeNet are Copyright (c) 2006-2009
* CondeNet, Inc. All Rights Reserved.
*******************************************************************************/
#include <Python.h>
Expand Down
2 changes: 1 addition & 1 deletion r2/r2/lib/c/recommendations/Database.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* The Original Developer is the Initial Developer. The Initial Developer of the
* Original Code is CondeNet, Inc.
*
* All portions of the code written by CondeNet are Copyright (c) 2006-2008
* All portions of the code written by CondeNet are Copyright (c) 2006-2009
* CondeNet, Inc. All Rights Reserved.
*******************************************************************************/

Expand Down
Loading

0 comments on commit c837ef1

Please sign in to comment.