mozilla
/
addons-server
зеркало из https://github.com/mozilla/addons-server.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Remove the default app (submodule) (bug 1050154)

This commit is contained in:
Mathieu Agopian 2014-08-08 14:08:46 +02:00
Родитель 28d8bbb8ef
Коммит 9cd01a363e
41 изменённых файлов: 6 добавлений и 460 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
.travis.yml
Просмотреть файл

@ -8,12 +8,12 @@ before_install:
- sudo /usr/share/elasticsearch/bin/plugin -install elasticsearch/elasticsearch-analysis-icu/1.13.0
- sudo /usr/share/elasticsearch/bin/elasticsearch -Des.config=scripts/elasticsearch/elasticsearch.yml
install:
- make update_deps
- pip install --no-deps -r requirements/test.txt --find-links https://pyrepo.addons.mozilla.org/
- pip install --no-deps -r requirements/compiled.txt --find-links https://pyrepo.addons.mozilla.org/
- npm install
before_script:
- mysql -e 'create database olympia;'
- make update_submodules
- make update_assets
script:
- DJANGO_SETTINGS_MODULE=settings_ci make test

10
Makefile
Просмотреть файл

@ -1,4 +1,4 @@
.PHONY: help docs test test_force_db tdd test_failed update_code update_submodules update_deps update_db update_assets update_landfill full_update reindex
.PHONY: help docs test test_force_db tdd test_failed update_code update_deps update_db update_assets update_landfill full_update reindex
help:
@echo "Please use \`make <target>' where <target> is one of"
@ -7,8 +7,7 @@ help:
@echo " test_force_db to run all the test suite with a new database"
@echo " tdd to run all the test suite, but stop on the first error"
@echo " test_failed to rerun the failed tests from the previous run"
@echo " update_code to update the git repository and submodules"
@echo " update_submodules to only update the submodules"
@echo " update_code to update the git repository"
@echo " update_deps to update the python and npm dependencies"
@echo " update_db to run the database migrations"
@echo " full_update to update the code, the dependencies and the database"
@ -33,11 +32,6 @@ test_failed:
update_code:
git checkout master && git pull
$(MAKE) update_submodules
update_submodules:
git submodule --quiet foreach 'git submodule --quiet sync'
git submodule --quiet sync && git submodule update --init --recursive
update_deps:
pip install --no-deps --exists-action=w --download-cache=/tmp/pip-cache -r requirements/dev.txt --find-links https://pyrepo.addons.mozilla.org/ --allow-external PIL --allow-unverified PIL

0
default/__init__.py
Просмотреть файл

3
default/settings.py
Просмотреть файл

@ -1,3 +0,0 @@
from lib.settings_base import *
ROOT_URLCONF = 'default.urls'

1
default/urls.py
Просмотреть файл

@ -1 +0,0 @@
from lib.urls_base import *

1
default/webroot/admin-media
Просмотреть файл

@ -1 +0,0 @@
../../vendor/src/django/django/contrib/admin/media

Двоичные данные
default/webroot/ebay/ebay-extension/eBay32x32.png
Просмотреть файл

Двоичный файл не отображается.
Режим "рядом"

До

Ширина:  |  Высота:  |  Размер: 1.7 KiB

Двоичные данные
default/webroot/ebay/ebay-extension/ebay-0.9.6.5.xpi
Просмотреть файл

Двоичный файл не отображается.

31
default/webroot/ebay/ebay-extension/ebay_extension.html
Просмотреть файл

@ -1,31 +0,0 @@
<html>
<script language="JavaScript" type="text/javascript" src="../../js/__utm.js"></script>
<script type="text/javascript">
function install() {
if (document.referrer.match(/^https?:\/\/[^\/]*\.mozilla\.com\/?.*/) ||
document.referrer.match(/^https?:\/\/[^\/]*\.ebay\.(co\.uk|fr|de)\/?.*/)
) {
var params = {
/* Hash must be updated anytime the file changes or users won't be able to install */
'Firefox Companion for eBay': {
URL: 'http://releases.mozilla.org/pub/mozilla.org/addons/5202/firefox_companion_for_ebay-1.6.6-fx-win.xpi',
IconURL: 'eBay32x32.png',
Hash: 'sha1:3d89ec5586bd224bc80d7bd669873bb98f09755c',
toString: function () { return this.URL; }
}
};
InstallTrigger.install(params, goBack);
} else {
window.location.href='http://addons.mozilla.org/';
}
}
function goBack() {
history.back();
}
</script>
<body onload="install()">
</body>
</html>

26
default/webroot/ebay/ebay-extension/update.rdf
Просмотреть файл

@ -1,26 +0,0 @@
<?xml version="1.0"?>
<RDF:RDF xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:em="http://www.mozilla.org/2004/em-rdf#">
<RDF:Description about="urn:mozilla:extension:{62760FD6-B943-48C9-AB09-F99C6FE96088}">
<em:updates>
<RDF:Seq>
<RDF:li resource="urn:mozilla:extension:{62760FD6-B943-48C9-AB09-F99C6FE96088}:1.0"/>
</RDF:Seq>
</em:updates>
<em:version>1.0</em:version>
<em:updateLink>http://releases.mozilla.org/pub/mozilla.org/addons/5202/firefox_companion_for_ebay-1.6.6-fx-win.xpi</em:updateLink>
<em:updateHash>sha1:3d89ec5586bd224bc80d7bd669873bb98f09755c</em:updateHash>
</RDF:Description>
<RDF:Description about="urn:mozilla:extension:{62760FD6-B943-48C9-AB09-F99C6FE96088}:1.0">
<em:version>1.0</em:version>
<em:targetApplication>
<Description>
<em:id>{ec8030f7-c20a-464f-9b0e-13a3a9e97384}</em:id>
<em:minVersion>2.0</em:minVersion>
<em:maxVersion>2.0.0.*</em:maxVersion>
<em:updateLink>http://releases.mozilla.org/pub/mozilla.org/addons/5202/firefox_companion_for_ebay-1.6.6-fx-win.xpi</em:updateLink>
<em:updateHash>sha1:3d89ec5586bd224bc80d7bd669873bb98f09755c</em:updateHash>
</Description>
</em:targetApplication>
</RDF:Description>
</RDF:RDF>

1
default/webroot/favicon.ico
Просмотреть файл

@ -1 +0,0 @@
../../media/img/favicon.ico

16
default/webroot/google/google_browsersync.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-browsersync.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

5
default/webroot/google/google_desktop_gadget_win.html
Просмотреть файл

@ -1,5 +0,0 @@
<html>
<body
onload="window.location.href='http://dl.google.com/dl/desktop/nv/GoogleGadgetPluginFirefoxWin.xpi'">
</body>
</html>

16
default/webroot/google/google_gears_linux.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://dl.google.com/gears/current/gears-linux-opt.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_gears_osx.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://dl.google.com/gears/current/gears-osx-opt.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_notebook.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/([^\/]*\.)?google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-notebook.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_safebrowsing.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://dl.google.com/firefox/google-safebrowsing.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_sendtophone.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/sendtophone/google-sendtophone.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_suggest.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/suggest/google-suggest.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

15
default/webroot/google/google_toolbar.html
Просмотреть файл

@ -1,15 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar.xpi'+window.location.search;
} else {
window.location.href='https://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

15
default/webroot/google/google_toolbar_beta_linux.html
Просмотреть файл

@ -1,15 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-beta-linux.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

15
default/webroot/google/google_toolbar_beta_mac.html
Просмотреть файл

@ -1,15 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-beta-mac.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

15
default/webroot/google/google_toolbar_beta_win.html
Просмотреть файл

@ -1,15 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-beta-win.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_toolbar_linux.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-linux.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_toolbar_mac.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-mac.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_toolbar_win.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://toolbar.google.com/firefox/extensions/toolbar/google-toolbar-win.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

16
default/webroot/google/google_webcomments.html
Просмотреть файл

@ -1,16 +0,0 @@
<html>
<script type="text/javascript">
function redirect() {
if( document.referrer.match(/^https?:\/\/[^\/]*\.google\.com(\/.*)?$/) ||
document.referrer.match(/^$/) ){
window.location.href='http://dl.google.com/firefox/google-webcomments.xpi';
} else {
window.location.href='http://addons.mozilla.org/';
}
}
</script>
<body onload="redirect()">
</body>
</html>

4
default/webroot/google/joga_companion.html
Просмотреть файл

@ -1,4 +0,0 @@
<html>
<body onload="window.location.href='http://dl.google.com/firefox/joga/companion.xpi'">
</body>
</html>

1
default/webroot/media
Просмотреть файл

@ -1 +0,0 @@
../../media

1
docs/topics/install-olympia/index.rst
Просмотреть файл

@ -9,7 +9,6 @@ Install Olympia
install-with-vagrant
vagrant-on-windows
advanced-installation
settings-changelog
celery
elasticsearch
packages

2
docs/topics/install-olympia/install-with-vagrant.rst
Просмотреть файл

@ -104,7 +104,7 @@ Updating Olympia Code
To sync your repository with upstream changes, just update the code using git::
cd olympia
git pull && git submodule sync --quiet && git submodule update --init --recursive
git pull
Next, rebuild your VM so that any new requirements are installed and any new
DB migration scripts are run.

14
docs/topics/install-olympia/installation.rst
Просмотреть файл

@ -66,16 +66,11 @@ Use the Source
Grab olympia from github with::
git clone --recursive git://github.com/mozilla/olympia.git
git clone git://github.com/mozilla/olympia.git
cd olympia
``olympia.git`` is all the source code. :ref:`updating` is detailed later on.
If at any point you realize you forgot to clone with the recursive
flag, you can fix that by running::
git submodule update --init --recursive
virtualenv and virtualenvwrapper
--------------------------------
@ -165,11 +160,6 @@ This runs a command like this::
Settings
--------
.. note::
There is a :doc:`settings-changelog`, this can be useful for people who are already
setup but want to know what has recently changed.
Most of olympia is already configured in ``settings.py``, but there's some
things you may want to configure locally. All your local settings go into
``local_settings.py``. The settings template for developers, included below,
@ -331,7 +321,7 @@ If you want to do it manually, then check the following steps:
This updates olympia::
git checkout master && git pull && git submodule update --init --recursive
git checkout master && git pull
This updates the python packages::

107
docs/topics/install-olympia/settings-changelog.rst
Просмотреть файл

@ -1,107 +0,0 @@
Settings Changelog
==================
2014-07-09
----------
All the media related `XXX_PATH` and `XXX_URL` settings have now been
deprecated, in favor of helpers `user_media_url` and `user_media_path`, during
the switch to `django.contrib.staticfiles`. `JINGO_MINIFY_USE_STATIC` is
also now set to True.
2014-04-25
----------
* Added ``'django.contrib.staticfiles'`` to the ``INSTALLED_APPS``, as it's
needed by the latest versions of DDT.
* Added ``DEBUG_TOOLBAR_PATCH_SETTINGS = False`` to prevent DDT from patching
the settings on its own (it would create an import loop).
* Removed ``DEBUG_TOOLBAR_CONFIG`` as it's not used anymore with the latest
versions of DDT.
2014-01-22
----------
* Changed ``CACHES['default']['BACKEND']`` from
``django.core.cache.backends.locmem.LocMemCache`` to
``caching.backends.locmem.LocMemCache``.
We use the LocMemCache backend from cache-machine, as it interprets the
"0" timeout parameter of ``cache`` in the same way as the Memcached backend:
as infinity. Django's LocMemCache backend interprets it as a "0 seconds"
timeout (and thus doesn't cache at all).
2013-08-09
----------
* Added ``AES_KEYS`` as a settings for encrypting OAuth secrets. Uses a sample
by default, set this on a production server to something else.
2013-06-28
----------
* Added ``ES_USE_PLUGINS``. Some features of Elasticsearch require
installed plugins. To bypass requiring these plugins locally set this to
`False`. On our servers this should be `True`.
2013-05-24
----------
* Added ``ES_DEFAULT_NUM_REPLICAS``. Locally if you're running a single
Elasticsearch node you probably want to set this to 0 (zero).
* Added ``ES_DEFAULT_NUM_SHARDS``. Locally 3 shards is sufficient.
2012-04-12
----------
* Removed ``GEOIP_NOOP``, ``GEOIP_HOST``, and ``GEOIP_PORT`` as they are no
longer used.
* Added ``GEOIP_URL`` which is the fully qualified URL to your locally running
`geodude <https://github.com/mozilla/geodude>` instance without trailing
slash.
* Changed default ``GEOIP_DEFAULT_VAL`` to ``'worldwide'``.
2012-04-01
----------
* Added ``PACKAGED_ZIP`` setting, which is the base filename of the ``.zip``
containing the packaged app for the consumer-facing pages of the Marketplace.
* Removed ``FIREPLACE_SECRET_KEY`` setting since ``SECRET_KEY`` is already
used for making user secrets and we need something immediately.
2012-03-28
----------
* Added ``FIREPLACE_SECRET_KEY`` setting, used for creating shared
secrets for API login from the marketplace frontend.
2012-03-13
----------
* Added ``FIREPLACE_URL`` setting, for the origin URL of the
Marketplace frontend.
2012-02-25
----------
* Removed ``MDN_LAZY_REFRESH`` setting.
2012-11-14
----------
* Added ``MDN_LAZY_REFRESH`` which allows you to append `?refresh` to
https://marketplace-dev.allizom.org/developers/ and
https://marketplace-dev.allizom.org/developers/docs/ to refresh all content
from MDN for the Developer Hub. In production this should always remain
``False``.
2012-09-27
----------
* Added ``ALLOW_SELF_REVIEWS`` which allows you to approve/reject your own
add-ons and apps. This is especially useful for testing on our staging
and -dev servers. In production this should always remain ``False``.
2012-09-25
----------
* Added ``settings changelog``
* This will give us an area to mention new settings (and mark them as
optional) so people can look to see what has happened in settings-land.
* Removed ``confusion`` (optional)
* Using 'Added' and 'Removed' and 'Changed' as the start of your lines gives a
nice way to quickly read these.
* Changed default ``way to find changes`` from ``ask in IRC`` to ``check the
changelog``
* We can debate the format, but this gives us a starting point.

5
scripts/build-assets.sh
Просмотреть файл

@ -44,11 +44,6 @@ CLEANCSS_BIN = 'cleancss'
UGLIFY_BIN = 'uglifyjs'
SETTINGS
# Update the submodules.
echo "Updating submodules..."
git submodule --quiet foreach 'git submodule --quiet sync'
git submodule --quiet sync && git submodule update --init --recursive
echo "collecting statics..." `date`
python manage.py collectstatic --noinput

5
scripts/build.sh
Просмотреть файл

@ -47,11 +47,6 @@ if [ ! -d "$LOCALE" ]; then
svn co http://svn.mozilla.org/addons/trunk/site/app/locale/ $LOCALE
fi
# Update the submodules.
echo "Updating submodules..."
git submodule --quiet foreach 'git submodule --quiet sync'
git submodule --quiet sync && git submodule update --init --recursive
# Install node deps locally.
npm install
export PATH="./node_modules/.bin/:${PATH}"

6
scripts/update/update.py
Просмотреть файл

@ -89,12 +89,6 @@ def update_code(ctx, ref='origin/master'):
with ctx.lcd(settings.SRC_DIR):
ctx.local("git fetch && git fetch -t")
ctx.local("git reset --hard %s" % ref)
ctx.local("git submodule sync")
ctx.local("git submodule update --init --recursive")
# Recursively run submodule sync/update to get all the right repo URLs.
ctx.local("git submodule foreach 'git submodule sync --quiet'")
ctx.local("git submodule foreach "
"'git submodule update --init --recursive'")
@task

1
sites/altdev/settings_addons.py
Просмотреть файл

@ -1,7 +1,6 @@
"""private_addons will be populated from puppet and placed in this directory"""
from lib.settings_base import *
from default.settings import *
from settings_base import *
import private_addons

1
sites/dev/settings_addons.py
Просмотреть файл

@ -1,7 +1,6 @@
"""private_addons will be populated from puppet and placed in this directory"""
from lib.settings_base import *
from default.settings import *
from settings_base import *
import private_addons

1
sites/landfill/settings_addons.py
Просмотреть файл

@ -1,7 +1,6 @@
"""private_addons will be populated from puppet and placed in this directory"""
from lib.settings_base import *
from default.settings import *
from settings_base import *
import private_addons

1
sites/prod/settings_addons.py
Просмотреть файл

@ -1,5 +1,4 @@
from lib.settings_base import *
from default.settings import *
from settings_base import *
import private_addons

1
sites/stage/settings_addons.py
Просмотреть файл

@ -1,7 +1,6 @@
"""private_addons will be populated from puppet and placed in this directory"""
from lib.settings_base import *
from default.settings import *
from settings_base import *
import private_addons