Merge branch 'master' of https://github.com/Illutron/IllutronDashboard

Illutron · Oct 10, 2011 · 47c1d8d · 47c1d8d
2 parents 6ea2920 + 3083f10
commit 47c1d8d
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,5 @@
 .idea
 *pyc
 *~
+media
 settings_local.py
diff --git a/apps/log/views.py b/apps/log/views.py
@@ -34,8 +34,8 @@ def member(request, id):
     log_list = []
     for log in log_entries:
        log_list.append({
-           'latitude': log.latitude,
-           'longitude': log.longitude,
+           #'latitude': log.latitude,
+           #'longitude': log.longitude,
            'on_illutron': log.on_illutron,
            'time': log.time.isoformat(),
            'description': log.description