Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to Django 1.11 and all other dependencies #36

Merged
merged 38 commits into from
Aug 16, 2017
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
0e27fd8
More prefetches
OdyX Aug 14, 2017
64b8970
Update all requirements
OdyX Aug 14, 2017
7aca16d
Quick-fixes for upgrade
OdyX Aug 14, 2017
b9106a5
Upgrade dev requirements
OdyX Aug 14, 2017
666e038
Remove leftover autocomplete, fix debug bar
OdyX Aug 14, 2017
1880eee
Further orga renaming
OdyX Aug 14, 2017
517ec34
Update to latest django-filters
OdyX Aug 14, 2017
996e3bd
Fix datetimepicker through fixed grablib
OdyX Aug 14, 2017
cfa1053
Style the autocomplete somewhat more
OdyX Aug 16, 2017
eed75b3
Replace with widgets
OdyX Aug 16, 2017
8609390
Reinstate the checkbox as well
OdyX Aug 16, 2017
036348e
Fix exports in User app
OdyX Aug 16, 2017
3e3e4b8
Drop the hurtinq username patching of username that also affects edition
OdyX Aug 16, 2017
fc83c20
Fix StateManager tests
OdyX Aug 16, 2017
2cebf7e
Fix session creation without superleader
OdyX Aug 16, 2017
8a1117b
Fix flake8 superfluous imports
OdyX Aug 16, 2017
336dc4b
Fix last tests
OdyX Aug 16, 2017
10ea352
Autocomplete wind-down
OdyX Aug 14, 2017
cc6e4fb
Rename field organization to orga, for Django 1.9
OdyX Aug 14, 2017
e8f0f55
Comment away deprecated interfaces
OdyX Aug 14, 2017
ae7a257
New rolepermissions layout
OdyX Aug 14, 2017
7bcaebe
Fix URLs
OdyX Aug 14, 2017
0e53240
IBAN migration
OdyX Aug 14, 2017
7484063
Further orga renaming
OdyX Aug 14, 2017
119bdfd
Fix datepicker using our fork
OdyX Aug 15, 2017
a284022
More orga renaming fixes
OdyX Aug 15, 2017
a698e99
Autocomplete fixes
OdyX Aug 15, 2017
ad1ce24
Fix drifter base URL
OdyX Aug 15, 2017
9fd764c
Finish cleaning up orga autocomplete test
OdyX Aug 15, 2017
ca99b53
iSort
OdyX Aug 15, 2017
93aa482
More orga fixes
OdyX Aug 15, 2017
408ebb4
First autocompletes for User
OdyX Aug 15, 2017
4ee56c1
Fix further autocompletes
OdyX Aug 15, 2017
a4cb615
Fix SwissTime picker icon
OdyX Aug 16, 2017
84f8d4f
Flake8
OdyX Aug 16, 2017
beec082
Update tox.ini for py34
OdyX Aug 16, 2017
3117782
Grablib.yml needs to be present
OdyX Aug 16, 2017
86251ac
Replace grablib with submodules
OdyX Aug 16, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Remove leftover autocomplete, fix debug bar
  • Loading branch information
OdyX committed Aug 13, 2017
commit 666e0386d5398aa9e0f674b1233e6ef2421bb1e8
9 changes: 1 addition & 8 deletions defivelo/templates/base.html
Original file line number Diff line number Diff line change
Expand Up @@ -75,12 +75,5 @@
{% if not 'javascript_in_head'|bootstrap_setting %}{% bootstrap_javascript jquery=True %}{% endif %}
{% block bootstrap3_extra_script %}{% endblock %}
{% compress js %}
{% include 'autocomplete_light/_ajax_csrf.html' %}
<script type="text/javascript" src="{% static 'autocomplete_light/django_admin.js' %}"></script>
<script type="text/javascript" src="{% static 'autocomplete_light/autocomplete.js' %}"></script>
<script type="text/javascript" src="{% static 'autocomplete_light/widget.js' %}"></script>
<script type="text/javascript" src="{% static 'autocomplete_light/addanother.js' %}"></script>
<script type="text/javascript" src="{% static 'autocomplete_light/text_widget.js' %}"></script>
<script type="text/javascript" src="{% static 'autocomplete_light/remote.js' %}"></script>
{% endcompress %}
</body>
</body>
7 changes: 7 additions & 0 deletions defivelo/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
from django.conf.urls import include, url
from django.conf.urls.i18n import i18n_patterns
from django.contrib import admin
from django.conf import settings
from django.utils.translation import ugettext_lazy as _

from .views import HomeView, LicenseView
Expand All @@ -43,4 +44,10 @@
#url(r'^autocomplete/', include('autocomplete_light.urls')),
)

if settings.DEBUG:
import debug_toolbar
urlpatterns = [
url(r'^__debug__/', include(debug_toolbar.urls)),
] + urlpatterns

admin.site.site_header = _('Intranet DÉFI VÉLO')