Self hosted FLOSS fitness/workout, nutrition and weight tracker
Sort requirements alphabetically
Roland Geider3384ce1a8e0c
diff --git a/requirements.txt b/requirements.txtindex 55bc390c1..2965d8834 100644--- a/requirements.txt+++ b/requirements.txt@@ -2,29 +2,29 @@# Requirements for wger for production#-Django>=1.9,<1.10+bleach+django-bootstrap-breadcrumbs+django-bower+django-formtools>=1.0,<1.1django-recaptcha-reportlab>=3.3,<3.4+django-sortedm2m+Django>=1.9,<1.10+django_compressordjango_mobile-django-formtools>=1.0,<1.1-bleach-python-mimeparse-pilloweasy-thumbnails-django_compressoricalendar-django-bootstrap-breadcrumbs-sphinx-django-sortedm2m-django-bowerinvoke>=0.14,<0.15+pillow+python-mimeparse+reportlab>=3.3,<3.4requests+sphinx# REST API-djangorestframework>=3.2,<3.3+django-cors-headersdjango-filterdjango-tastypie>=0.13,<0.14-django-cors-headers+djangorestframework>=3.2,<3.3# Python3 compatibilitysixdiff --git a/wger/settings_global.py b/wger/settings_global.pyindex abba0a87b..4dcaa9a5e 100644--- a/wger/settings_global.py+++ b/wger/settings_global.py@@ -38,25 +38,25 @@ WSGI_APPLICATION = 'wger.wsgi.application'INSTALLED_APPS = ('django.contrib.auth','django.contrib.contenttypes',+ 'django.contrib.messages','django.contrib.sessions','django.contrib.sites',- 'django.contrib.messages','django.contrib.staticfiles',# Uncomment the next line to enable the admin:'django.contrib.admin',# Apps from wger proper+ 'wger.config','wger.core',- 'wger.manager',- 'wger.weight',+ 'wger.email','wger.exercises',+ 'wger.gym',+ 'wger.manager','wger.nutrition','wger.software','wger.utils',- 'wger.config',- 'wger.gym',- 'wger.email',+ 'wger.weight',# reCaptcha support, see https://github.com/praekelt/django-recaptcha'captcha',@@ -90,17 +90,17 @@ INSTALLED_APPS = (# added list of external libraries to be installed by bowerBOWER_INSTALLED_APPS = (- 'jquery#2.1.x','bootstrap',+ 'components-font-awesome','d3',- 'shariff',- 'tinymce-dist','DataTables',- 'components-font-awesome',- 'tinymce',- 'metrics-graphics','devbridge-autocomplete#1.2.x',+ 'jquery#2.1.x',+ 'metrics-graphics',+ 'shariff','sortablejs#1.4.x',+ 'tinymce',+ 'tinymce-dist',)