diff --git a/r2/babel.cfg b/r2/babel.cfg index 62a03aa34..9472d51c1 100644 --- a/r2/babel.cfg +++ b/r2/babel.cfg @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/compress_js.sh b/r2/compress_js.sh index 4f9e692c5..1a7a52822 100755 --- a/r2/compress_js.sh +++ b/r2/compress_js.sh @@ -1,6 +1,6 @@ #!/bin/bash -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/ez_setup/__init__.py b/r2/ez_setup/__init__.py index 22a1b085b..d57a562be 100644 --- a/r2/ez_setup/__init__.py +++ b/r2/ez_setup/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/__init__.py b/r2/r2/__init__.py index 40bfbd8b7..aa22ac8b5 100644 --- a/r2/r2/__init__.py +++ b/r2/r2/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/commands.py b/r2/r2/commands.py index 66146aa4e..ea14bb9fc 100644 --- a/r2/r2/commands.py +++ b/r2/r2/commands.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/__init__.py b/r2/r2/config/__init__.py index 9500c19ee..8f728af0b 100644 --- a/r2/r2/config/__init__.py +++ b/r2/r2/config/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/admin_routes.py b/r2/r2/config/admin_routes.py index b0c1d1c71..59be27def 100644 --- a/r2/r2/config/admin_routes.py +++ b/r2/r2/config/admin_routes.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/databases.py b/r2/r2/config/databases.py index 48f53b87a..36b989618 100644 --- a/r2/r2/config/databases.py +++ b/r2/r2/config/databases.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/environment.py b/r2/r2/config/environment.py index 53b3f73df..1b4f73fac 100644 --- a/r2/r2/config/environment.py +++ b/r2/r2/config/environment.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py index b0ed9be29..a7b88647d 100644 --- a/r2/r2/config/middleware.py +++ b/r2/r2/config/middleware.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/rewrites.py b/r2/r2/config/rewrites.py index 9b976f3de..8aa5d007d 100644 --- a/r2/r2/config/rewrites.py +++ b/r2/r2/config/rewrites.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/routing.py b/r2/r2/config/routing.py index 497b9ca7f..b88db20f4 100644 --- a/r2/r2/config/routing.py +++ b/r2/r2/config/routing.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/templates.py b/r2/r2/config/templates.py index 35c354192..c459ae2b7 100644 --- a/r2/r2/config/templates.py +++ b/r2/r2/config/templates.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/config/utils.py b/r2/r2/config/utils.py index ab13be08b..2bfb79d3d 100644 --- a/r2/r2/config/utils.py +++ b/r2/r2/config/utils.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/__init__.py b/r2/r2/controllers/__init__.py index 145d06943..db62033d8 100644 --- a/r2/r2/controllers/__init__.py +++ b/r2/r2/controllers/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/admin.py b/r2/r2/controllers/admin.py index fc7de031f..46d4ea78c 100644 --- a/r2/r2/controllers/admin.py +++ b/r2/r2/controllers/admin.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/api.py b/r2/r2/controllers/api.py index 7562fcc98..1e3e557b9 100644 --- a/r2/r2/controllers/api.py +++ b/r2/r2/controllers/api.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/buttons.py b/r2/r2/controllers/buttons.py index 0f39d51b1..1a23bfd0d 100644 --- a/r2/r2/controllers/buttons.py +++ b/r2/r2/controllers/buttons.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/captcha.py b/r2/r2/controllers/captcha.py index 5cf16969a..20989a7a7 100644 --- a/r2/r2/controllers/captcha.py +++ b/r2/r2/controllers/captcha.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/embed.py b/r2/r2/controllers/embed.py index fb982f16e..bdefee014 100644 --- a/r2/r2/controllers/embed.py +++ b/r2/r2/controllers/embed.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/error.py b/r2/r2/controllers/error.py index b16b44a2c..340074787 100644 --- a/r2/r2/controllers/error.py +++ b/r2/r2/controllers/error.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/errors.py b/r2/r2/controllers/errors.py index 86b6b6c68..3064ee7ae 100644 --- a/r2/r2/controllers/errors.py +++ b/r2/r2/controllers/errors.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/feedback.py b/r2/r2/controllers/feedback.py index ff55bd7cd..62b76fafc 100644 --- a/r2/r2/controllers/feedback.py +++ b/r2/r2/controllers/feedback.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/front.py b/r2/r2/controllers/front.py index 021d100e3..ac8182f77 100644 --- a/r2/r2/controllers/front.py +++ b/r2/r2/controllers/front.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/i18n.py b/r2/r2/controllers/i18n.py index a9efc4841..c237a878a 100644 --- a/r2/r2/controllers/i18n.py +++ b/r2/r2/controllers/i18n.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/listingcontroller.py b/r2/r2/controllers/listingcontroller.py index b2d22f595..065944061 100644 --- a/r2/r2/controllers/listingcontroller.py +++ b/r2/r2/controllers/listingcontroller.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/reddit_base.py b/r2/r2/controllers/reddit_base.py index 97cf01487..563e69492 100644 --- a/r2/r2/controllers/reddit_base.py +++ b/r2/r2/controllers/reddit_base.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/redirect.py b/r2/r2/controllers/redirect.py index f19274c39..94c8e4a2b 100644 --- a/r2/r2/controllers/redirect.py +++ b/r2/r2/controllers/redirect.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/template.py b/r2/r2/controllers/template.py index f661e3789..e8cfd74fc 100644 --- a/r2/r2/controllers/template.py +++ b/r2/r2/controllers/template.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/toolbar.py b/r2/r2/controllers/toolbar.py index 7623b95c3..d5b830e50 100644 --- a/r2/r2/controllers/toolbar.py +++ b/r2/r2/controllers/toolbar.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/validator/__init__.py b/r2/r2/controllers/validator/__init__.py index 6536777b8..d1ea08100 100644 --- a/r2/r2/controllers/validator/__init__.py +++ b/r2/r2/controllers/validator/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/controllers/validator/validator.py b/r2/r2/controllers/validator/validator.py index 50241f4c3..978778c2a 100644 --- a/r2/r2/controllers/validator/validator.py +++ b/r2/r2/controllers/validator/validator.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/i18n/__init__.py b/r2/r2/i18n/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/i18n/__init__.py +++ b/r2/r2/i18n/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/i18n/en/LC_MESSAGES/r2.data b/r2/r2/i18n/en/LC_MESSAGES/r2.data index 225c68a62..7160da669 100644 --- a/r2/r2/i18n/en/LC_MESSAGES/r2.data +++ b/r2/r2/i18n/en/LC_MESSAGES/r2.data @@ -38,4 +38,4 @@ I457 sS'nplurals' p20 I2 -s. \ No newline at end of file +s. diff --git a/r2/r2/i18n/en/LC_MESSAGES/r2.mo b/r2/r2/i18n/en/LC_MESSAGES/r2.mo index 901bbabfa..42dfbeed4 100644 Binary files a/r2/r2/i18n/en/LC_MESSAGES/r2.mo and b/r2/r2/i18n/en/LC_MESSAGES/r2.mo differ diff --git a/r2/r2/lib/__init__.py b/r2/r2/lib/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/lib/__init__.py +++ b/r2/r2/lib/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/app_globals.py b/r2/r2/lib/app_globals.py index 465f1aea4..4dddc31c6 100644 --- a/r2/r2/lib/app_globals.py +++ b/r2/r2/lib/app_globals.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/base.py b/r2/r2/lib/base.py index 7dc750d5f..6eda91c0d 100644 --- a/r2/r2/lib/base.py +++ b/r2/r2/lib/base.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/filters.c b/r2/r2/lib/c/filters.c index d9ee28614..3b59fb4a1 100644 --- a/r2/r2/lib/c/filters.c +++ b/r2/r2/lib/c/filters.c @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/Database.cpp b/r2/r2/lib/c/recommendations/Database.cpp index 675a85aba..66da76389 100644 --- a/r2/r2/lib/c/recommendations/Database.cpp +++ b/r2/r2/lib/c/recommendations/Database.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/Database.h b/r2/r2/lib/c/recommendations/Database.h index 02fd2446b..e851f610b 100644 --- a/r2/r2/lib/c/recommendations/Database.h +++ b/r2/r2/lib/c/recommendations/Database.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/Dictionary.h b/r2/r2/lib/c/recommendations/Dictionary.h index 532df2857..bc49852c8 100644 --- a/r2/r2/lib/c/recommendations/Dictionary.h +++ b/r2/r2/lib/c/recommendations/Dictionary.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/ModsTable.cpp b/r2/r2/lib/c/recommendations/ModsTable.cpp index 822c84f7e..60ffdedd5 100644 --- a/r2/r2/lib/c/recommendations/ModsTable.cpp +++ b/r2/r2/lib/c/recommendations/ModsTable.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/ModsTable.h b/r2/r2/lib/c/recommendations/ModsTable.h index d09a0128e..1afe11df9 100644 --- a/r2/r2/lib/c/recommendations/ModsTable.h +++ b/r2/r2/lib/c/recommendations/ModsTable.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/Recommender.cpp b/r2/r2/lib/c/recommendations/Recommender.cpp index 32bd205df..15bc21d4d 100644 --- a/r2/r2/lib/c/recommendations/Recommender.cpp +++ b/r2/r2/lib/c/recommendations/Recommender.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/Recommender.h b/r2/r2/lib/c/recommendations/Recommender.h index fab386835..f07c5e00c 100644 --- a/r2/r2/lib/c/recommendations/Recommender.h +++ b/r2/r2/lib/c/recommendations/Recommender.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/SparseMatrix.h b/r2/r2/lib/c/recommendations/SparseMatrix.h index e5c923ad9..637799406 100644 --- a/r2/r2/lib/c/recommendations/SparseMatrix.h +++ b/r2/r2/lib/c/recommendations/SparseMatrix.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/User.cpp b/r2/r2/lib/c/recommendations/User.cpp index 5cf548322..a9d740170 100644 --- a/r2/r2/lib/c/recommendations/User.cpp +++ b/r2/r2/lib/c/recommendations/User.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/User.h b/r2/r2/lib/c/recommendations/User.h index 3a606739f..f4afd860c 100644 --- a/r2/r2/lib/c/recommendations/User.h +++ b/r2/r2/lib/c/recommendations/User.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/articles.cpp b/r2/r2/lib/c/recommendations/articles.cpp index 190963b11..67962ed82 100644 --- a/r2/r2/lib/c/recommendations/articles.cpp +++ b/r2/r2/lib/c/recommendations/articles.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/articles.h b/r2/r2/lib/c/recommendations/articles.h index 3f307404c..e53f3aa91 100644 --- a/r2/r2/lib/c/recommendations/articles.h +++ b/r2/r2/lib/c/recommendations/articles.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/main.cpp b/r2/r2/lib/c/recommendations/main.cpp index 56ab213dd..ba3aa9c7b 100644 --- a/r2/r2/lib/c/recommendations/main.cpp +++ b/r2/r2/lib/c/recommendations/main.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/recommend_memcache.cpp b/r2/r2/lib/c/recommendations/recommend_memcache.cpp index 8b96e4569..be2af2b89 100644 --- a/r2/r2/lib/c/recommendations/recommend_memcache.cpp +++ b/r2/r2/lib/c/recommendations/recommend_memcache.cpp @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/recommend_memcache.h b/r2/r2/lib/c/recommendations/recommend_memcache.h index 3115251d1..07af9d231 100644 --- a/r2/r2/lib/c/recommendations/recommend_memcache.h +++ b/r2/r2/lib/c/recommendations/recommend_memcache.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/c/recommendations/recommender_py.h b/r2/r2/lib/c/recommendations/recommender_py.h index 943a94724..391703477 100644 --- a/r2/r2/lib/c/recommendations/recommender_py.h +++ b/r2/r2/lib/c/recommendations/recommender_py.h @@ -1,5 +1,5 @@ /* -* "The contents of this file are subject to the Common Public Attribution +* The contents of this file are subject to the Common Public Attribution * License Version 1.0. (the "License"); you may not use this file except in * compliance with the License. You may obtain a copy of the License at * http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/cache.py b/r2/r2/lib/cache.py index 4750840e3..ba9324eaa 100644 --- a/r2/r2/lib/cache.py +++ b/r2/r2/lib/cache.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/captcha.py b/r2/r2/lib/captcha.py index 93017f826..8a36d7b24 100644 --- a/r2/r2/lib/captcha.py +++ b/r2/r2/lib/captcha.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/count.py b/r2/r2/lib/count.py index e9bca586b..67a13bbc4 100644 --- a/r2/r2/lib/count.py +++ b/r2/r2/lib/count.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/__init__.py b/r2/r2/lib/db/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/lib/db/__init__.py +++ b/r2/r2/lib/db/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/alter_db.py b/r2/r2/lib/db/alter_db.py index 07641e120..7beda06c2 100644 --- a/r2/r2/lib/db/alter_db.py +++ b/r2/r2/lib/db/alter_db.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/operators.py b/r2/r2/lib/db/operators.py index cca8330c9..d30cd650e 100644 --- a/r2/r2/lib/db/operators.py +++ b/r2/r2/lib/db/operators.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/queries.py b/r2/r2/lib/db/queries.py index 07482a68a..72c7cf92e 100644 --- a/r2/r2/lib/db/queries.py +++ b/r2/r2/lib/db/queries.py @@ -202,7 +202,7 @@ def user_rel_query(rel, user, name): rel.c._name == name, sort = desc('_date'), eager_load = True, - #thing_data = True + thing_data = not g.use_query_cache ) return make_results(q, filter_thing2) diff --git a/r2/r2/lib/db/sorts.py b/r2/r2/lib/db/sorts.py index a61902411..8d930e036 100644 --- a/r2/r2/lib/db/sorts.py +++ b/r2/r2/lib/db/sorts.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/stats.py b/r2/r2/lib/db/stats.py index 9cd64d623..c44926877 100644 --- a/r2/r2/lib/db/stats.py +++ b/r2/r2/lib/db/stats.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/tdb_sql.py b/r2/r2/lib/db/tdb_sql.py index f7b6aa013..74e5aa094 100644 --- a/r2/r2/lib/db/tdb_sql.py +++ b/r2/r2/lib/db/tdb_sql.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/thing.py b/r2/r2/lib/db/thing.py index d1a67a38b..b53325644 100644 --- a/r2/r2/lib/db/thing.py +++ b/r2/r2/lib/db/thing.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/db/userrel.py b/r2/r2/lib/db/userrel.py index 15c730c94..7ac280473 100644 --- a/r2/r2/lib/db/userrel.py +++ b/r2/r2/lib/db/userrel.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/filters.py b/r2/r2/lib/filters.py index fa6cf07d0..e3baf9424 100644 --- a/r2/r2/lib/filters.py +++ b/r2/r2/lib/filters.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/find_tz.py b/r2/r2/lib/find_tz.py index c110ff5e4..b2939c73d 100644 --- a/r2/r2/lib/find_tz.py +++ b/r2/r2/lib/find_tz.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/helpers.py b/r2/r2/lib/helpers.py index 120109456..9117da5e6 100644 --- a/r2/r2/lib/helpers.py +++ b/r2/r2/lib/helpers.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/html_source.py b/r2/r2/lib/html_source.py index 87b0a9595..f5dd15833 100644 --- a/r2/r2/lib/html_source.py +++ b/r2/r2/lib/html_source.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/jsonresponse.py b/r2/r2/lib/jsonresponse.py index d45861bf1..3bb1f215d 100644 --- a/r2/r2/lib/jsonresponse.py +++ b/r2/r2/lib/jsonresponse.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/jsontemplates.py b/r2/r2/lib/jsontemplates.py index 9fbd7f74d..a74033c6e 100644 --- a/r2/r2/lib/jsontemplates.py +++ b/r2/r2/lib/jsontemplates.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/logger.py b/r2/r2/lib/logger.py index dff8c65a1..f075df10e 100644 --- a/r2/r2/lib/logger.py +++ b/r2/r2/lib/logger.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/manager/__init__.py b/r2/r2/lib/manager/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/lib/manager/__init__.py +++ b/r2/r2/lib/manager/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/manager/db_manager.py b/r2/r2/lib/manager/db_manager.py index 358b04547..2eb002775 100644 --- a/r2/r2/lib/manager/db_manager.py +++ b/r2/r2/lib/manager/db_manager.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/manager/tp_manager.py b/r2/r2/lib/manager/tp_manager.py index 8b35983fb..f0b907411 100644 --- a/r2/r2/lib/manager/tp_manager.py +++ b/r2/r2/lib/manager/tp_manager.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/memoize.py b/r2/r2/lib/memoize.py index 2a81f0605..732ee8a07 100644 --- a/r2/r2/lib/memoize.py +++ b/r2/r2/lib/memoize.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/menus.py b/r2/r2/lib/menus.py index 4735b2983..5b69286ed 100644 --- a/r2/r2/lib/menus.py +++ b/r2/r2/lib/menus.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/normalized_hot.py b/r2/r2/lib/normalized_hot.py index f3eaa2728..88ff43e3f 100644 --- a/r2/r2/lib/normalized_hot.py +++ b/r2/r2/lib/normalized_hot.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/organic.py b/r2/r2/lib/organic.py index 079040431..c5e3ecb56 100644 --- a/r2/r2/lib/organic.py +++ b/r2/r2/lib/organic.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/pages/__init__.py b/r2/r2/lib/pages/__init__.py index c61822669..b3f890ec9 100644 --- a/r2/r2/lib/pages/__init__.py +++ b/r2/r2/lib/pages/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/pages/admin_pages.py b/r2/r2/lib/pages/admin_pages.py index 28d700af8..731847436 100644 --- a/r2/r2/lib/pages/admin_pages.py +++ b/r2/r2/lib/pages/admin_pages.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/pages/pages.py b/r2/r2/lib/pages/pages.py index 1a5df83c3..29c336476 100644 --- a/r2/r2/lib/pages/pages.py +++ b/r2/r2/lib/pages/pages.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/recommendation.py b/r2/r2/lib/recommendation.py index 44b812866..b49c130ac 100644 --- a/r2/r2/lib/recommendation.py +++ b/r2/r2/lib/recommendation.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/rising.py b/r2/r2/lib/rising.py index 605e26c42..6f848b5d8 100644 --- a/r2/r2/lib/rising.py +++ b/r2/r2/lib/rising.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/rpc.py b/r2/r2/lib/rpc.py index 0d85b5f32..6c834121a 100644 --- a/r2/r2/lib/rpc.py +++ b/r2/r2/lib/rpc.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/set_reddit_pops.py b/r2/r2/lib/set_reddit_pops.py index de8c16922..ef2963857 100644 --- a/r2/r2/lib/set_reddit_pops.py +++ b/r2/r2/lib/set_reddit_pops.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/solrsearch.py b/r2/r2/lib/solrsearch.py index cdc8b3346..b3034ecb2 100644 --- a/r2/r2/lib/solrsearch.py +++ b/r2/r2/lib/solrsearch.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/strings.py b/r2/r2/lib/strings.py index d52b54b5e..f4f264de6 100644 --- a/r2/r2/lib/strings.py +++ b/r2/r2/lib/strings.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/template_helpers.py b/r2/r2/lib/template_helpers.py index 6764b0b93..a926e0d24 100644 --- a/r2/r2/lib/template_helpers.py +++ b/r2/r2/lib/template_helpers.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/test_cache.py b/r2/r2/lib/test_cache.py index 8dffb3b19..1cfb7d5bd 100644 --- a/r2/r2/lib/test_cache.py +++ b/r2/r2/lib/test_cache.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/test_wrapper.py b/r2/r2/lib/test_wrapper.py index 0afe8d4b3..e6b2bcaee 100644 --- a/r2/r2/lib/test_wrapper.py +++ b/r2/r2/lib/test_wrapper.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/tracking.py b/r2/r2/lib/tracking.py index e55b69165..43259e999 100644 --- a/r2/r2/lib/tracking.py +++ b/r2/r2/lib/tracking.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/translation.py b/r2/r2/lib/translation.py index 8ea653ec6..374fd110a 100644 --- a/r2/r2/lib/translation.py +++ b/r2/r2/lib/translation.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/user_stats.py b/r2/r2/lib/user_stats.py index e3e2a9aec..c469a6e56 100644 --- a/r2/r2/lib/user_stats.py +++ b/r2/r2/lib/user_stats.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/utils/__init__.py b/r2/r2/lib/utils/__init__.py index d125078b6..964f4f066 100644 --- a/r2/r2/lib/utils/__init__.py +++ b/r2/r2/lib/utils/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/utils/utils.py b/r2/r2/lib/utils/utils.py index 3779fedfe..b37b7108e 100644 --- a/r2/r2/lib/utils/utils.py +++ b/r2/r2/lib/utils/utils.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/lib/wrapped.py b/r2/r2/lib/wrapped.py index 57efcbcb5..302a49710 100644 --- a/r2/r2/lib/wrapped.py +++ b/r2/r2/lib/wrapped.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/__init__.py b/r2/r2/models/__init__.py index c94da30fa..b93b2f61a 100644 --- a/r2/r2/models/__init__.py +++ b/r2/r2/models/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/account.py b/r2/r2/models/account.py index 428d54c51..bbefd6372 100644 --- a/r2/r2/models/account.py +++ b/r2/r2/models/account.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/admintools.py b/r2/r2/models/admintools.py index c1a7f43ea..322d0dfdf 100644 --- a/r2/r2/models/admintools.py +++ b/r2/r2/models/admintools.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/builder.py b/r2/r2/models/builder.py index 46b67a788..3759b7a59 100644 --- a/r2/r2/models/builder.py +++ b/r2/r2/models/builder.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/link.py b/r2/r2/models/link.py index 56028023c..effec3711 100644 --- a/r2/r2/models/link.py +++ b/r2/r2/models/link.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/listing.py b/r2/r2/models/listing.py index d3cafc4cf..19233b7ee 100644 --- a/r2/r2/models/listing.py +++ b/r2/r2/models/listing.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/mail_queue.py b/r2/r2/models/mail_queue.py index 84ea2c982..f7a4e6f56 100644 --- a/r2/r2/models/mail_queue.py +++ b/r2/r2/models/mail_queue.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/populatedb.py b/r2/r2/models/populatedb.py index 6c1bc2901..ecab3dad2 100644 --- a/r2/r2/models/populatedb.py +++ b/r2/r2/models/populatedb.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/printable.py b/r2/r2/models/printable.py index 686595880..2e0a4f33c 100644 --- a/r2/r2/models/printable.py +++ b/r2/r2/models/printable.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/report.py b/r2/r2/models/report.py index c514929c5..522d6b96a 100644 --- a/r2/r2/models/report.py +++ b/r2/r2/models/report.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/subreddit.py b/r2/r2/models/subreddit.py index 425430cd8..20daf4146 100644 --- a/r2/r2/models/subreddit.py +++ b/r2/r2/models/subreddit.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/thing_changes.py b/r2/r2/models/thing_changes.py index 6408f4b31..be475cc35 100644 --- a/r2/r2/models/thing_changes.py +++ b/r2/r2/models/thing_changes.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/types.py b/r2/r2/models/types.py index 7c2c16971..7a4e9cf39 100644 --- a/r2/r2/models/types.py +++ b/r2/r2/models/types.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/update_karmas.py b/r2/r2/models/update_karmas.py index ccf5a24b8..a522d9a57 100644 --- a/r2/r2/models/update_karmas.py +++ b/r2/r2/models/update_karmas.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/models/vote.py b/r2/r2/models/vote.py index bf85455cb..7695515d0 100644 --- a/r2/r2/models/vote.py +++ b/r2/r2/models/vote.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/public/favicon.ico b/r2/r2/public/favicon.ico index e6d6ba6cf..738332d28 100644 Binary files a/r2/r2/public/favicon.ico and b/r2/r2/public/favicon.ico differ diff --git a/r2/r2/public/static/animate.js b/r2/r2/public/static/animate.js index c363fafc2..dff92e4f6 100644 --- a/r2/r2/public/static/animate.js +++ b/r2/r2/public/static/animate.js @@ -71,4 +71,4 @@ function start_animate(interval) { function stop_animate() { clearInterval(animator); animator = null; -} \ No newline at end of file +} diff --git a/r2/r2/public/static/favicon.ico b/r2/r2/public/static/favicon.ico index e6d6ba6cf..738332d28 100644 Binary files a/r2/r2/public/static/favicon.ico and b/r2/r2/public/static/favicon.ico differ diff --git a/r2/r2/public/static/lipstick.css b/r2/r2/public/static/lipstick.css index ac0b5ac0c..6c86d555d 100644 --- a/r2/r2/public/static/lipstick.css +++ b/r2/r2/public/static/lipstick.css @@ -106,4 +106,4 @@ input.txt { background-color:#f7f7f7; border: 1px solid #c15d64; margin: 0px} .star a { text-decoration: none; color: black } -#main {padding: 0px 7px 0 7px} \ No newline at end of file +#main {padding: 0px 7px 0 7px} diff --git a/r2/r2/templates/__init__.py b/r2/r2/templates/__init__.py index 7d034d95e..e0a61f397 100644 --- a/r2/r2/templates/__init__.py +++ b/r2/r2/templates/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/admin/__init__.py b/r2/r2/templates/admin/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/templates/admin/__init__.py +++ b/r2/r2/templates/admin/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/admin_rightbox.html b/r2/r2/templates/admin_rightbox.html index 345cf4f46..7519b4cec 100644 --- a/r2/r2/templates/admin_rightbox.html +++ b/r2/r2/templates/admin_rightbox.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/admintranslations.html b/r2/r2/templates/admintranslations.html index 808fcc1da..26671de8d 100644 --- a/r2/r2/templates/admintranslations.html +++ b/r2/r2/templates/admintranslations.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/autohandler b/r2/r2/templates/autohandler index 1c4dee8b1..e06cb7278 100644 --- a/r2/r2/templates/autohandler +++ b/r2/r2/templates/autohandler @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -20,4 +20,4 @@ ## CondeNet, Inc. All Rights Reserved. ################################################################################ -% m.call_next() \ No newline at end of file +% m.call_next() diff --git a/r2/r2/templates/base.html b/r2/r2/templates/base.html index c3dcbac6f..e9ecba136 100644 --- a/r2/r2/templates/base.html +++ b/r2/r2/templates/base.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/base.htmllite b/r2/r2/templates/base.htmllite index 5e95a5caf..af4ef0f56 100644 --- a/r2/r2/templates/base.htmllite +++ b/r2/r2/templates/base.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/base.mobile b/r2/r2/templates/base.mobile index 6d3e3ce07..2012989cb 100644 --- a/r2/r2/templates/base.mobile +++ b/r2/r2/templates/base.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/base.wired b/r2/r2/templates/base.wired index dff66433d..168bdeb10 100644 --- a/r2/r2/templates/base.wired +++ b/r2/r2/templates/base.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/captcha.html b/r2/r2/templates/captcha.html index 1630d4bd1..9f4c6b3e1 100644 --- a/r2/r2/templates/captcha.html +++ b/r2/r2/templates/captcha.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! from r2.lib.template_helpers import static %> diff --git a/r2/r2/templates/cnameframe.html b/r2/r2/templates/cnameframe.html index cb6b14adc..6f585d0d4 100644 --- a/r2/r2/templates/cnameframe.html +++ b/r2/r2/templates/cnameframe.html @@ -1,3 +1,25 @@ +## The contents of this file are subject to the Common Public Attribution +## License Version 1.0. (the "License"); you may not use this file except in +## compliance with the License. You may obtain a copy of the License at +## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public +## License Version 1.1, but Sections 14 and 15 have been added to cover use of +## software over a computer network and provide for limited attribution for the +## Original Developer. In addition, Exhibit A has been modified to be consistent +## with Exhibit B. +## +## Software distributed under the License is distributed on an "AS IS" basis, +## WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for +## the specific language governing rights and limitations under the License. +## +## 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 +## CondeNet, Inc. All Rights Reserved. +################################################################################ + <%! from r2.lib.template_helpers import join_urls %> diff --git a/r2/r2/templates/comment.htmllite b/r2/r2/templates/comment.htmllite index f8d53ea30..01a884966 100644 --- a/r2/r2/templates/comment.htmllite +++ b/r2/r2/templates/comment.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/comment.mobile b/r2/r2/templates/comment.mobile index 777c359e7..49228a2bc 100644 --- a/r2/r2/templates/comment.mobile +++ b/r2/r2/templates/comment.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/comment.xml b/r2/r2/templates/comment.xml index 345550215..2adacbb66 100644 --- a/r2/r2/templates/comment.xml +++ b/r2/r2/templates/comment.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/comment_skeleton.html b/r2/r2/templates/comment_skeleton.html index 854a236bb..58eaedaac 100644 --- a/r2/r2/templates/comment_skeleton.html +++ b/r2/r2/templates/comment_skeleton.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/commentbutton.html b/r2/r2/templates/commentbutton.html index 3455e974a..4af3d668c 100644 --- a/r2/r2/templates/commentbutton.html +++ b/r2/r2/templates/commentbutton.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/commentreplybox.html b/r2/r2/templates/commentreplybox.html index deee9b3a6..0ec4503b3 100644 --- a/r2/r2/templates/commentreplybox.html +++ b/r2/r2/templates/commentreplybox.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="error_field"/> diff --git a/r2/r2/templates/commentreplybox.htmllite b/r2/r2/templates/commentreplybox.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/commentreplybox.htmllite +++ b/r2/r2/templates/commentreplybox.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/commentreplybox.mobile b/r2/r2/templates/commentreplybox.mobile index a74e10149..248376145 100644 --- a/r2/r2/templates/commentreplybox.mobile +++ b/r2/r2/templates/commentreplybox.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/commentreplybox.xml b/r2/r2/templates/commentreplybox.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/commentreplybox.xml +++ b/r2/r2/templates/commentreplybox.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/embed.html b/r2/r2/templates/embed.html index b11dff988..e21eab4be 100644 --- a/r2/r2/templates/embed.html +++ b/r2/r2/templates/embed.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/errorpage.html b/r2/r2/templates/errorpage.html index 196774c4c..ec6d771b4 100644 --- a/r2/r2/templates/errorpage.html +++ b/r2/r2/templates/errorpage.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/gettextheader.html b/r2/r2/templates/gettextheader.html index 3a7f5a540..56aacbc03 100644 --- a/r2/r2/templates/gettextheader.html +++ b/r2/r2/templates/gettextheader.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/headerbar.mobile b/r2/r2/templates/headerbar.mobile index cba4f837c..4e3fa98b0 100644 --- a/r2/r2/templates/headerbar.mobile +++ b/r2/r2/templates/headerbar.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/headerbar.xml b/r2/r2/templates/headerbar.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/headerbar.xml +++ b/r2/r2/templates/headerbar.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/help.html b/r2/r2/templates/help.html index 5b20b55cb..f72f613e6 100644 --- a/r2/r2/templates/help.html +++ b/r2/r2/templates/help.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/infobar.html b/r2/r2/templates/infobar.html index 10dbac036..1ea5244d9 100644 --- a/r2/r2/templates/infobar.html +++ b/r2/r2/templates/infobar.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/infobar.htmllite b/r2/r2/templates/infobar.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/infobar.htmllite +++ b/r2/r2/templates/infobar.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/infobar.mobile b/r2/r2/templates/infobar.mobile index 91a915155..b910dedcf 100644 --- a/r2/r2/templates/infobar.mobile +++ b/r2/r2/templates/infobar.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/infobar.wired b/r2/r2/templates/infobar.wired index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/infobar.wired +++ b/r2/r2/templates/infobar.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/infobar.xml b/r2/r2/templates/infobar.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/infobar.xml +++ b/r2/r2/templates/infobar.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/link.htmllite b/r2/r2/templates/link.htmllite index 71c6661c1..ab4413be7 100644 --- a/r2/r2/templates/link.htmllite +++ b/r2/r2/templates/link.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/link.mobile b/r2/r2/templates/link.mobile index a39229de4..23f705896 100644 --- a/r2/r2/templates/link.mobile +++ b/r2/r2/templates/link.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/link.wired b/r2/r2/templates/link.wired index e7e81fd4e..a41a9e598 100644 --- a/r2/r2/templates/link.wired +++ b/r2/r2/templates/link.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/link.xml b/r2/r2/templates/link.xml index 315f7c72a..ddcc2b4c8 100644 --- a/r2/r2/templates/link.xml +++ b/r2/r2/templates/link.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/linkcompressed.html b/r2/r2/templates/linkcompressed.html index dcb8c9e20..d3b7dc5f7 100644 --- a/r2/r2/templates/linkcompressed.html +++ b/r2/r2/templates/linkcompressed.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/linkinfobar.html b/r2/r2/templates/linkinfobar.html index 0e7dc3222..725981cde 100644 --- a/r2/r2/templates/linkinfobar.html +++ b/r2/r2/templates/linkinfobar.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/listing.html b/r2/r2/templates/listing.html index 07bb58bdf..a86a1c88f 100644 --- a/r2/r2/templates/listing.html +++ b/r2/r2/templates/listing.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <% from r2.lib.template_helpers import replace_render, add_sr %> diff --git a/r2/r2/templates/listing.htmllite b/r2/r2/templates/listing.htmllite index 0669911bc..77c7f21d0 100644 --- a/r2/r2/templates/listing.htmllite +++ b/r2/r2/templates/listing.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/listing.mobile b/r2/r2/templates/listing.mobile index 9142088ba..31eba3e29 100644 --- a/r2/r2/templates/listing.mobile +++ b/r2/r2/templates/listing.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <% from r2.lib.template_helpers import replace_render, add_sr %> diff --git a/r2/r2/templates/listing.wired b/r2/r2/templates/listing.wired index d5ccd6cbb..ad1d93158 100644 --- a/r2/r2/templates/listing.wired +++ b/r2/r2/templates/listing.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/listing.xml b/r2/r2/templates/listing.xml index 0669911bc..77c7f21d0 100644 --- a/r2/r2/templates/listing.xml +++ b/r2/r2/templates/listing.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/listing_content.html b/r2/r2/templates/listing_content.html index 4f6844fd4..129aa5049 100644 --- a/r2/r2/templates/listing_content.html +++ b/r2/r2/templates/listing_content.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/login.mobile b/r2/r2/templates/login.mobile index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/login.mobile +++ b/r2/r2/templates/login.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/mail_opt.email b/r2/r2/templates/mail_opt.email index 8d97e3167..5bddc6640 100644 --- a/r2/r2/templates/mail_opt.email +++ b/r2/r2/templates/mail_opt.email @@ -31,4 +31,4 @@ We promise not to hold it against you. Your email address is once again to allowed to receive messages from ${g.domain}. Welcome back. -%endif \ No newline at end of file +%endif diff --git a/r2/r2/templates/menuarea.html b/r2/r2/templates/menuarea.html index 4b31ac2c9..9313f50d6 100644 --- a/r2/r2/templates/menuarea.html +++ b/r2/r2/templates/menuarea.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/menuarea.htmllite b/r2/r2/templates/menuarea.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/menuarea.htmllite +++ b/r2/r2/templates/menuarea.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/menuarea.mobile b/r2/r2/templates/menuarea.mobile index 91a915155..b910dedcf 100644 --- a/r2/r2/templates/menuarea.mobile +++ b/r2/r2/templates/menuarea.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/menuarea.xml b/r2/r2/templates/menuarea.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/menuarea.xml +++ b/r2/r2/templates/menuarea.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/message.html b/r2/r2/templates/message.html index f781f6d21..1ba170962 100644 --- a/r2/r2/templates/message.html +++ b/r2/r2/templates/message.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/message.xml b/r2/r2/templates/message.xml index 4920d8e4f..e7ec00e6d 100644 --- a/r2/r2/templates/message.xml +++ b/r2/r2/templates/message.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morechildren.html b/r2/r2/templates/morechildren.html index 7c80a21a4..8849039a7 100644 --- a/r2/r2/templates/morechildren.html +++ b/r2/r2/templates/morechildren.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morechildren.htmllite b/r2/r2/templates/morechildren.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/morechildren.htmllite +++ b/r2/r2/templates/morechildren.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morechildren.mobile b/r2/r2/templates/morechildren.mobile index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/morechildren.mobile +++ b/r2/r2/templates/morechildren.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morechildren.xml b/r2/r2/templates/morechildren.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/morechildren.xml +++ b/r2/r2/templates/morechildren.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morerecursion.html b/r2/r2/templates/morerecursion.html index 786d6c8b6..fc9bee75b 100644 --- a/r2/r2/templates/morerecursion.html +++ b/r2/r2/templates/morerecursion.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morerecursion.htmllite b/r2/r2/templates/morerecursion.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/morerecursion.htmllite +++ b/r2/r2/templates/morerecursion.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morerecursion.mobile b/r2/r2/templates/morerecursion.mobile index 91a915155..b910dedcf 100644 --- a/r2/r2/templates/morerecursion.mobile +++ b/r2/r2/templates/morerecursion.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/morerecursion.xml b/r2/r2/templates/morerecursion.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/morerecursion.xml +++ b/r2/r2/templates/morerecursion.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/navbutton.html b/r2/r2/templates/navbutton.html index d4f9116ad..76d9dc72f 100644 --- a/r2/r2/templates/navbutton.html +++ b/r2/r2/templates/navbutton.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link" /> diff --git a/r2/r2/templates/navbutton.mobile b/r2/r2/templates/navbutton.mobile index d4cc03f88..6dc73c821 100644 --- a/r2/r2/templates/navbutton.mobile +++ b/r2/r2/templates/navbutton.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/navmenu.html b/r2/r2/templates/navmenu.html index 228a7ebdd..4fdb7c130 100644 --- a/r2/r2/templates/navmenu.html +++ b/r2/r2/templates/navmenu.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link, text_with_links, img_link, separator"/> diff --git a/r2/r2/templates/navmenu.htmllite b/r2/r2/templates/navmenu.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/navmenu.htmllite +++ b/r2/r2/templates/navmenu.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/navmenu.mobile b/r2/r2/templates/navmenu.mobile index 185de3c86..2e1d5743e 100644 --- a/r2/r2/templates/navmenu.mobile +++ b/r2/r2/templates/navmenu.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/newlink.html b/r2/r2/templates/newlink.html index 22e948eae..e266f9252 100644 --- a/r2/r2/templates/newlink.html +++ b/r2/r2/templates/newlink.html @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="error_field, submit_form, plain_link, text_with_links"/> diff --git a/r2/r2/templates/optout.html b/r2/r2/templates/optout.html index 7d54ca518..ae35fab78 100644 --- a/r2/r2/templates/optout.html +++ b/r2/r2/templates/optout.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ###############################################################################
%if thing.leave: diff --git a/r2/r2/templates/organiclisting.html b/r2/r2/templates/organiclisting.html index 76a6b6d8d..886dda845 100644 --- a/r2/r2/templates/organiclisting.html +++ b/r2/r2/templates/organiclisting.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="help.html" import="help_or_hide"/> diff --git a/r2/r2/templates/page_down.html b/r2/r2/templates/page_down.html index f5db7d81e..c23cd18d3 100644 --- a/r2/r2/templates/page_down.html +++ b/r2/r2/templates/page_down.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/pagenamenav.html b/r2/r2/templates/pagenamenav.html index e0eb39932..c6cff95a0 100644 --- a/r2/r2/templates/pagenamenav.html +++ b/r2/r2/templates/pagenamenav.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link"/> diff --git a/r2/r2/templates/pagenamenav.mobile b/r2/r2/templates/pagenamenav.mobile index 4836b508d..bd8b38779 100644 --- a/r2/r2/templates/pagenamenav.mobile +++ b/r2/r2/templates/pagenamenav.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/pane.htmllite b/r2/r2/templates/pane.htmllite index 1ab3b78d9..5323c2198 100644 --- a/r2/r2/templates/pane.htmllite +++ b/r2/r2/templates/pane.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/pane.xml b/r2/r2/templates/pane.xml index 1ab3b78d9..5323c2198 100644 --- a/r2/r2/templates/pane.xml +++ b/r2/r2/templates/pane.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/panestack.html b/r2/r2/templates/panestack.html index 0b707a7ad..0c7f32f2b 100644 --- a/r2/r2/templates/panestack.html +++ b/r2/r2/templates/panestack.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/panestack.htmllite b/r2/r2/templates/panestack.htmllite index f06d0da0e..50e702bdb 100644 --- a/r2/r2/templates/panestack.htmllite +++ b/r2/r2/templates/panestack.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/panestack.mobile b/r2/r2/templates/panestack.mobile index f06d0da0e..50e702bdb 100644 --- a/r2/r2/templates/panestack.mobile +++ b/r2/r2/templates/panestack.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/panestack.wired b/r2/r2/templates/panestack.wired index 3edbb1596..0510f7ca1 100644 --- a/r2/r2/templates/panestack.wired +++ b/r2/r2/templates/panestack.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/panestack.xml b/r2/r2/templates/panestack.xml index f06d0da0e..50e702bdb 100644 --- a/r2/r2/templates/panestack.xml +++ b/r2/r2/templates/panestack.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/permalinkmessage.html b/r2/r2/templates/permalinkmessage.html index c3450bf14..c81570569 100644 --- a/r2/r2/templates/permalinkmessage.html +++ b/r2/r2/templates/permalinkmessage.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/permalinkmessage.mobile b/r2/r2/templates/permalinkmessage.mobile index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/permalinkmessage.mobile +++ b/r2/r2/templates/permalinkmessage.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/permalinkmessage.xml b/r2/r2/templates/permalinkmessage.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/permalinkmessage.xml +++ b/r2/r2/templates/permalinkmessage.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/prefdelete.html b/r2/r2/templates/prefdelete.html index 74d22cc28..1ebe1b8c4 100644 --- a/r2/r2/templates/prefdelete.html +++ b/r2/r2/templates/prefdelete.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/prefoptions.html b/r2/r2/templates/prefoptions.html index 1e66e4ee7..6b4f433ec 100644 --- a/r2/r2/templates/prefoptions.html +++ b/r2/r2/templates/prefoptions.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! from r2.lib.template_helpers import add_sr diff --git a/r2/r2/templates/prefupdate.html b/r2/r2/templates/prefupdate.html index a23eb5c57..db7b16217 100644 --- a/r2/r2/templates/prefupdate.html +++ b/r2/r2/templates/prefupdate.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="error_field"/> diff --git a/r2/r2/templates/printable.html b/r2/r2/templates/printable.html index f0f119fc6..b6e561d66 100644 --- a/r2/r2/templates/printable.html +++ b/r2/r2/templates/printable.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/printable.htmllite b/r2/r2/templates/printable.htmllite index 6a2a46230..d5326b0da 100644 --- a/r2/r2/templates/printable.htmllite +++ b/r2/r2/templates/printable.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/printable.mobile b/r2/r2/templates/printable.mobile index ff0a56415..2518eacb3 100644 --- a/r2/r2/templates/printable.mobile +++ b/r2/r2/templates/printable.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/profilebar.html b/r2/r2/templates/profilebar.html index a1bd37fb6..205c8cef3 100644 --- a/r2/r2/templates/profilebar.html +++ b/r2/r2/templates/profilebar.html @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/profiling.html b/r2/r2/templates/profiling.html index dc5714bb3..ad2db90de 100644 --- a/r2/r2/templates/profiling.html +++ b/r2/r2/templates/profiling.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/reddit.html b/r2/r2/templates/reddit.html index fd45fe0bc..6f46ad8e9 100644 --- a/r2/r2/templates/reddit.html +++ b/r2/r2/templates/reddit.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/reddit.htmllite b/r2/r2/templates/reddit.htmllite index 0c5b672ec..2ade2d27b 100644 --- a/r2/r2/templates/reddit.htmllite +++ b/r2/r2/templates/reddit.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/reddit.js b/r2/r2/templates/reddit.js index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/reddit.js +++ b/r2/r2/templates/reddit.js @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/reddit.mobile b/r2/r2/templates/reddit.mobile index bde1d364f..fa406179d 100644 --- a/r2/r2/templates/reddit.mobile +++ b/r2/r2/templates/reddit.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/reddit.wired b/r2/r2/templates/reddit.wired index 90fb69a0c..20c6c9776 100644 --- a/r2/r2/templates/reddit.wired +++ b/r2/r2/templates/reddit.wired @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/reddit.xml b/r2/r2/templates/reddit.xml index 0d7e1445b..cbda6c8da 100644 --- a/r2/r2/templates/reddit.xml +++ b/r2/r2/templates/reddit.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/redditfooter.html b/r2/r2/templates/redditfooter.html index 4e079468b..eeef440ce 100644 --- a/r2/r2/templates/redditfooter.html +++ b/r2/r2/templates/redditfooter.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/redditheader.mobile b/r2/r2/templates/redditheader.mobile index b0143b2fa..64e05ff44 100644 --- a/r2/r2/templates/redditheader.mobile +++ b/r2/r2/templates/redditheader.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/searchbar.htmllite b/r2/r2/templates/searchbar.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/searchbar.htmllite +++ b/r2/r2/templates/searchbar.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/searchbar.mobile b/r2/r2/templates/searchbar.mobile index 91a915155..b910dedcf 100644 --- a/r2/r2/templates/searchbar.mobile +++ b/r2/r2/templates/searchbar.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/searchbar.xml b/r2/r2/templates/searchbar.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/searchbar.xml +++ b/r2/r2/templates/searchbar.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/searchform.html b/r2/r2/templates/searchform.html index 42f25f376..8db52e58c 100644 --- a/r2/r2/templates/searchform.html +++ b/r2/r2/templates/searchform.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/server_status_page.html b/r2/r2/templates/server_status_page.html index a21aa316d..3e6757fd9 100644 --- a/r2/r2/templates/server_status_page.html +++ b/r2/r2/templates/server_status_page.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/server_status_page.htmllite b/r2/r2/templates/server_status_page.htmllite index 4fc809a87..e04810c43 100644 --- a/r2/r2/templates/server_status_page.htmllite +++ b/r2/r2/templates/server_status_page.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/share.email b/r2/r2/templates/share.email index 6429e3eb5..dd1c4f925 100644 --- a/r2/r2/templates/share.email +++ b/r2/r2/templates/share.email @@ -33,4 +33,4 @@ http://${g.domain}/goto?share=true&id=${thing.link._fullname} <% from r2.lib.template_helpers import add_sr %>${add_sr(thing.link.make_permalink_slow(), force_hostname = True)} ___ -If you would not like to receive emails from reddit.com in the future, visit http://${g.domain}/mail/optout?x=${thing.msg_hash} \ No newline at end of file +If you would not like to receive emails from reddit.com in the future, visit http://${g.domain}/mail/optout?x=${thing.msg_hash} diff --git a/r2/r2/templates/sidebox.html b/r2/r2/templates/sidebox.html index ab760339e..946b87f1d 100644 --- a/r2/r2/templates/sidebox.html +++ b/r2/r2/templates/sidebox.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link"/> diff --git a/r2/r2/templates/subreddit.html b/r2/r2/templates/subreddit.html index 330605db5..eaec60430 100644 --- a/r2/r2/templates/subreddit.html +++ b/r2/r2/templates/subreddit.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/subreddit.mobile b/r2/r2/templates/subreddit.mobile index 098c03e0e..3bc76301b 100644 --- a/r2/r2/templates/subreddit.mobile +++ b/r2/r2/templates/subreddit.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/subreddit.xml b/r2/r2/templates/subreddit.xml index d3f964851..6e54c2548 100644 --- a/r2/r2/templates/subreddit.xml +++ b/r2/r2/templates/subreddit.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/subredditbox.html b/r2/r2/templates/subredditbox.html index 8b47a5942..f5281cd7d 100644 --- a/r2/r2/templates/subredditbox.html +++ b/r2/r2/templates/subredditbox.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link"/> diff --git a/r2/r2/templates/subredditinfobar.html b/r2/r2/templates/subredditinfobar.html index 628659f0e..6bbaedc82 100644 --- a/r2/r2/templates/subredditinfobar.html +++ b/r2/r2/templates/subredditinfobar.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%! diff --git a/r2/r2/templates/translatedstring.html b/r2/r2/templates/translatedstring.html index 43f2001ed..3296fbd3a 100644 --- a/r2/r2/templates/translatedstring.html +++ b/r2/r2/templates/translatedstring.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <% diff --git a/r2/r2/templates/translation.html b/r2/r2/templates/translation.html index e2b5e0ade..148a396b3 100644 --- a/r2/r2/templates/translation.html +++ b/r2/r2/templates/translation.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <% diff --git a/r2/r2/templates/unfoundpage.html b/r2/r2/templates/unfoundpage.html index 581881eaf..4c6752424 100644 --- a/r2/r2/templates/unfoundpage.html +++ b/r2/r2/templates/unfoundpage.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################
diff --git a/r2/r2/templates/unfoundpage.htmllite b/r2/r2/templates/unfoundpage.htmllite index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/unfoundpage.htmllite +++ b/r2/r2/templates/unfoundpage.htmllite @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/unfoundpage.mobile b/r2/r2/templates/unfoundpage.mobile index 581881eaf..4c6752424 100644 --- a/r2/r2/templates/unfoundpage.mobile +++ b/r2/r2/templates/unfoundpage.mobile @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################
diff --git a/r2/r2/templates/unfoundpage.xml b/r2/r2/templates/unfoundpage.xml index fe4fab106..d30a29848 100644 --- a/r2/r2/templates/unfoundpage.xml +++ b/r2/r2/templates/unfoundpage.xml @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/userlist.html b/r2/r2/templates/userlist.html index cf3c7dc82..bf79c13a0 100644 --- a/r2/r2/templates/userlist.html +++ b/r2/r2/templates/userlist.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/templates/userstats.html b/r2/r2/templates/userstats.html index 2a65594c4..07e2e8f95 100644 --- a/r2/r2/templates/userstats.html +++ b/r2/r2/templates/userstats.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="utils.html" import="plain_link"/> diff --git a/r2/r2/templates/usertableitem.html b/r2/r2/templates/usertableitem.html index 05cdda9bd..2126cf8fa 100644 --- a/r2/r2/templates/usertableitem.html +++ b/r2/r2/templates/usertableitem.html @@ -1,4 +1,4 @@ -## "The contents of this file are subject to the Common Public Attribution +## The contents of this file are subject to the Common Public Attribution ## License Version 1.0. (the "License"); you may not use this file except in ## compliance with the License. You may obtain a copy of the License at ## http://code.reddit.com/LICENSE. The License is based on the Mozilla Public @@ -17,7 +17,7 @@ ## the Original Code is CondeNet, Inc. ## ## All portions of the code written by CondeNet are Copyright (c) 2006-2008 -## CondeNet, Inc. All Rights Reserved." +## CondeNet, Inc. All Rights Reserved. ################################################################################ <%namespace file="printable.html" import="yes_no_button" /> diff --git a/r2/r2/tests/__init__.py b/r2/r2/tests/__init__.py index 6d5ac9374..2dca4657e 100644 --- a/r2/r2/tests/__init__.py +++ b/r2/r2/tests/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/tests/functional/__init__.py b/r2/r2/tests/functional/__init__.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/tests/functional/__init__.py +++ b/r2/r2/tests/functional/__init__.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/tests/test_models.py b/r2/r2/tests/test_models.py index 000a107f9..6ecfb3193 100644 --- a/r2/r2/tests/test_models.py +++ b/r2/r2/tests/test_models.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/r2/websetup.py b/r2/r2/websetup.py index 1cb3502f3..88f7773c4 100644 --- a/r2/r2/websetup.py +++ b/r2/r2/websetup.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/rtl.sh b/r2/rtl.sh index 8957832d6..fa1f0d3b8 100755 --- a/r2/rtl.sh +++ b/r2/rtl.sh @@ -1,6 +1,6 @@ #!/bin/bash -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/setup.py b/r2/setup.py index 9c52779f4..0d9e0a0c7 100644 --- a/r2/setup.py +++ b/r2/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/supervise_watcher.py b/r2/supervise_watcher.py index 9c62d2e42..1b6709308 100644 --- a/r2/supervise_watcher.py +++ b/r2/supervise_watcher.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public diff --git a/r2/translation.py b/r2/translation.py index d72181992..ec5d6453b 100644 --- a/r2/translation.py +++ b/r2/translation.py @@ -1,4 +1,4 @@ -# "The contents of this file are subject to the Common Public Attribution +# The contents of this file are subject to the Common Public Attribution # License Version 1.0. (the "License"); you may not use this file except in # compliance with the License. You may obtain a copy of the License at # http://code.reddit.com/LICENSE. The License is based on the Mozilla Public