diff --git a/kalite/control_panel/templates/control_panel/facility_management.html b/kalite/control_panel/templates/control_panel/facility_management.html index a82b5e9166..d987087efe 100644 --- a/kalite/control_panel/templates/control_panel/facility_management.html +++ b/kalite/control_panel/templates/control_panel/facility_management.html @@ -363,11 +363,13 @@

{% trans "Students" %}  diff --git a/kalite/version.py b/kalite/version.py index b1e02ca768..2a47d9b554 100644 --- a/kalite/version.py +++ b/kalite/version.py @@ -1,11 +1,28 @@ # THIS IS USED BY settings.py. NEVER import settings.py here; hard-codes only! -# this is actually 0.12.2, but we need to update language pack version fallbacks before changing here +# this is actually 0.12.5, but we need to update language pack version fallbacks before changing here VERSION = "0.12.0" VERSION_INFO = { + "0.12.5": { + "release_date": "2014/08/08", + "git_commit": "19055bb", + "new_features": { + "all": [], + "students": [], + "coaches": [], + "admins": [], + }, + "bugs_fixed": { + "all": [], + "students": [], + "coaches": [], + "admins": ["Critical fix: ensure models created elsewhere sync after being modified"], + }, + }, + "0.12.4": { "release_date": "2014/08/07", - "git_commit": "8c3c3", + "git_commit": "8c3c331", "new_features": { "all": [], "students": [], @@ -13,16 +30,16 @@ "admins": [], }, "bugs_fixed": { - "all": ["Run setup when database is not initialized on startup"], + "all": [], "students": ["Stop opening new tabs when opening related videos from exercises"], "coaches": [], - "admins": [], + "admins": ["Run setup when database is not initialized on startup"], }, }, "0.12.3": { "release_date": "2014/08/02", - "git_commit": "90f88", + "git_commit": "90f8880", "new_features": { "all": [], "students": ["Numpad for student exercises"], diff --git a/python-packages/securesync/engine/__init__.py b/python-packages/securesync/engine/__init__.py index beb437ce0d..3740eaca76 100755 --- a/python-packages/securesync/engine/__init__.py +++ b/python-packages/securesync/engine/__init__.py @@ -136,7 +136,7 @@ def get_models(device_counters=None, limit=None, zone=None, dest_version=None, * device = Device.all_objects.get(pk=device_id) - queryset = Model.all_objects.filter(Q(signed_by=device) | Q(signed_by__isnull=True)) + queryset = Model.all_objects.filter(Q(signed_by=device) | Q(signed_by__isnull=True) | Q(counter__isnull=True)) # for trusted (central) device, only include models with the correct fallback zone if not device.in_zone(zone):