aboutsummaryrefslogtreecommitdiff
path: root/web/app/view/ServerDialog.js
diff options
context:
space:
mode:
authorHans van den Elsen <hans.elsen@esds.nl>2016-03-14 20:49:04 +0100
committerHans van den Elsen <hans.elsen@esds.nl>2016-03-14 20:49:04 +0100
commit7fd1c08dd2f789ddd37ff075a6ebda1645947616 (patch)
tree75b715e6dd70f6be3357e1710c4db6f1f6a1e29e /web/app/view/ServerDialog.js
parent4606737cc07b736f9c8f98ae680b928c94c082c8 (diff)
parent0a1019b59481b6bf8ee8989feb23cef084b6caf5 (diff)
downloadtraccar-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.gz
traccar-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.tar.bz2
traccar-server-7fd1c08dd2f789ddd37ff075a6ebda1645947616.zip
Merge remote-tracking branch 'refs/remotes/tananaev/master'
Diffstat (limited to 'web/app/view/ServerDialog.js')
-rw-r--r--web/app/view/ServerDialog.js5
1 files changed, 5 insertions, 0 deletions
diff --git a/web/app/view/ServerDialog.js b/web/app/view/ServerDialog.js
index 9fbbed920..67f3a7ab2 100644
--- a/web/app/view/ServerDialog.js
+++ b/web/app/view/ServerDialog.js
@@ -79,6 +79,11 @@ Ext.define('Traccar.view.ServerDialog', {
xtype: 'numberfield',
name: 'zoom',
fieldLabel: Strings.serverZoom
+ }, {
+ xtype: 'checkboxfield',
+ name: 'twelveHourFormat',
+ fieldLabel: Strings.settingsTwelveHourFormat,
+ allowBlank: false
}]
}
});