Merge pull request #1681 from calmh/major-upgrade

Allow major upgrades [v0.10]
Backport the v0.11 upgrade system
2015-04-22 14:11:18 +01:00 · 2015-04-22 21:27:13 +09:00 · 2015-04-22 21:22:16 +09:00 · 2015-03-29 09:46:44 +02:00 · 2015-03-29 09:44:20 +02:00 · 2015-03-26 08:43:55 +01:00
26 changed files with 4389 additions and 536 deletions
@@ -37,8 +37,8 @@ import (
 )

 type guiError struct {
-	Time  time.Time `json:"time"`
-	Error string    `json:"error"`
+	Time  time.Time
+	Error string
 }

 var (
@@ -618,7 +618,7 @@ func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, upgrade.ErrUpgradeUnsupported.Error(), 500)
 		return
 	}
-	rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
+	rel, err := upgrade.LatestRelease(Version)
 	if err != nil {
 		http.Error(w, err.Error(), 500)
 		return
@@ -626,7 +626,8 @@ func restGetUpgrade(w http.ResponseWriter, r *http.Request) {
 	res := make(map[string]interface{})
 	res["running"] = Version
 	res["latest"] = rel.Tag
-	res["newer"] = upgrade.CompareVersions(rel.Tag, Version) == 1
+	res["newer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.Newer
+	res["majorNewer"] = upgrade.CompareVersions(rel.Tag, Version) == upgrade.MajorNewer

 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	json.NewEncoder(w).Encode(res)
@@ -660,14 +661,14 @@ func restGetLang(w http.ResponseWriter, r *http.Request) {
 }

 func restPostUpgrade(w http.ResponseWriter, r *http.Request) {
-	rel, err := upgrade.LatestRelease(strings.Contains(Version, "-beta"))
+	rel, err := upgrade.LatestRelease(Version)
 	if err != nil {
 		l.Warnln("getting latest release:", err)
 		http.Error(w, err.Error(), 500)
 		return
 	}

-	if upgrade.CompareVersions(rel.Tag, Version) == 1 {
+	if upgrade.CompareVersions(rel.Tag, Version) > upgrade.Equal {
 		err = upgrade.To(rel)
 		if err != nil {
 			l.Warnln("upgrading:", err)
@@ -828,6 +829,8 @@ func mimeTypeForFile(file string) string {
 		return "application/x-font-ttf"
 	case ".woff":
 		return "application/x-font-woff"
+	case ".svg":
+		return "image/svg+xml"
 	default:
 		return mime.TypeByExtension(ext)
 	}
@@ -837,12 +840,12 @@ func toNeedSlice(fs []db.FileInfoTruncated) []map[string]interface{} {
 	output := make([]map[string]interface{}, len(fs))
 	for i, file := range fs {
 		output[i] = map[string]interface{}{
-			"name":         file.Name,
-			"flags":        file.Flags,
-			"modified":     file.Modified,
-			"version":      file.Version,
-			"localVersion": file.LocalVersion,
-			"size":         file.Size(),
+			"Name":         file.Name,
+			"Flags":        file.Flags,
+			"Modified":     file.Modified,
+			"Version":      file.Version,
+			"LocalVersion": file.LocalVersion,
+			"Size":         file.Size(),
 		}
 	}
 	return output
@@ -324,7 +324,7 @@ func main() {
 	}

 	if doUpgrade || doUpgradeCheck {
-		rel, err := upgrade.LatestRelease(IsBeta)
+		rel, err := upgrade.LatestRelease(Version)
 		if err != nil {
 			l.Fatalln("Upgrade:", err) // exits 1
 		}
@@ -1057,7 +1057,7 @@ func autoUpgrade() {
 		case <-timer.C:
 		}

-		rel, err := upgrade.LatestRelease(IsBeta)
+		rel, err := upgrade.LatestRelease(Version)
 		if err == upgrade.ErrUpgradeUnsupported {
 			events.Default.Unsubscribe(sub)
 			return
@@ -1,4 +1,5 @@
 {
+   "A new major version may not be compatible with previous versions.": "A new major version may not be compatible with previous versions.",
   "API Key": "API Key",
   "About": "About",
   "Add": "Add",
@@ -72,6 +73,7 @@
   "Latest Release": "Latest Release",
   "Local Discovery": "Local Discovery",
   "Local State": "Local State",
+   "Major Upgrade": "Major Upgrade",
   "Maximum Age": "Maximum Age",
   "Metadata Only": "Metadata Only",
   "Move to top of queue": "Move to top of queue",
@@ -92,11 +94,13 @@
   "Override Changes": "Override Changes",
   "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for",
   "Path where versions should be stored (leave empty for the default .stversions folder in the folder).": "Path where versions should be stored (leave empty for the default .stversions folder in the folder).",
+   "Please consult the release notes before performing a major upgrade.": "Please consult the release notes before performing a major upgrade.",
   "Please wait": "Please wait",
   "Preview": "Preview",
   "Preview Usage Report": "Preview Usage Report",
   "Quick guide to supported patterns": "Quick guide to supported patterns",
   "RAM Utilization": "RAM Utilization",
+   "Release Notes": "Release Notes",
   "Rescan": "Rescan",
   "Rescan All": "Rescan All",
   "Rescan Interval": "Rescan Interval",
@@ -155,10 +159,12 @@
   "The number of versions must be a number and cannot be blank.": "The number of versions must be a number and cannot be blank.",
   "The rescan interval must be a non-negative number of seconds.": "The rescan interval must be a non-negative number of seconds.",
   "The rescan interval must be at least 5 seconds.": "The rescan interval must be at least 5 seconds.",
+   "This is a major version upgrade.": "This is a major version upgrade.",
   "Unknown": "Unknown",
   "Unshared": "Unshared",
   "Unused": "Unused",
   "Up to Date": "Up to Date",
+   "Upgrade": "Upgrade",
   "Upgrade To {%version%}": "Upgrade To {{version}}",
   "Upgrading": "Upgrading",
   "Upload Rate": "Upload Rate",
@@ -7,7 +7,7 @@
    "Add new folder?": "Aggiungere una nuova cartella?",
    "Address": "Indirizzo",
    "Addresses": "Indirizzi",
-    "All Data": "All Data",
+    "All Data": "Tutti i dati",
    "Allow Anonymous Usage Reporting?": "Abilitare Statistiche Anonime di Utilizzo?",
    "Anonymous Usage Reporting": "Statistiche Anonime di Utilizzo",
    "Any devices configured on an introducer device will be added to this device as well.": "Qualsiasi dispositivo configurato in un introduttore verrà aggiunto anche a questo dispositivo.",
@@ -17,7 +17,7 @@
    "Changelog": "Changelog",
    "Close": "Chiudi",
    "Comment, when used at the start of a line": "Per commentare, va inserito all'inizio di una riga",
-    "Compression": "Compression",
+    "Compression": "Compressione",
    "Compression is recommended in most setups.": "La compressione è raccomandata nella maggior parte delle configurazioni.",
    "Connection Error": "Errore di Connessione",
    "Copied from elsewhere": "Copiato da qualche altra parte",
@@ -73,8 +73,8 @@
    "Local Discovery": "Individuazione Locale",
    "Local State": "Stato Locale",
    "Maximum Age": "Durata Massima",
-    "Metadata Only": "Metadata Only",
-    "Move to top of queue": "Move to top of queue",
+    "Metadata Only": "Solo i metadati",
+    "Move to top of queue": "Posiziona in cima alla coda",
    "Multi level wildcard (matches multiple directory levels)": "Metacarattere multi-livello (corrisponde alle cartelle e alle sotto-cartelle)",
    "Never": "Mai",
    "New Device": "Nuovo Dispositivo",
@@ -98,7 +98,7 @@
    "Quick guide to supported patterns": "Guida veloce agli schemi supportati",
    "RAM Utilization": "Utilizzo RAM",
    "Rescan": "Riscansiona",
-    "Rescan All": "Rescan All",
+    "Rescan All": "Riscansiona Tutto",
    "Rescan Interval": "Intervallo Scansione",
    "Restart": "Riavvia",
    "Restart Needed": "Riavvio Necessario",
@@ -7,7 +7,7 @@
    "Add new folder?": "Dodać nowy folder?",
    "Address": "Adres",
    "Addresses": "Adresy",
-    "All Data": "All Data",
+    "All Data": "Wszystkie dane",
    "Allow Anonymous Usage Reporting?": "Zezwalaj na anonimowe statystyki użycia",
    "Anonymous Usage Reporting": "Anonimowe statystyki użycia",
    "Any devices configured on an introducer device will be added to this device as well.": "Wszystkie urządzenia skonfigurowane na urządzeniu wprowadzającym zostaną dodane także do tego urządzenia.",
@@ -17,17 +17,17 @@
    "Changelog": "Historia zmian",
    "Close": "Zamknij",
    "Comment, when used at the start of a line": "Komentarz, jeżeli użyty na początku linii",
-    "Compression": "Compression",
+    "Compression": "Kompresja",
    "Compression is recommended in most setups.": "Kompresja jest zalecana w większości przypadków",
    "Connection Error": "Błąd połączenia",
    "Copied from elsewhere": "Copied from elsewhere",
-    "Copied from original": "Copied from original",
+    "Copied from original": "Skopiowane z oryginału",
    "Copyright © 2014 Jakob Borg and the following Contributors:": "Copyright © 2014 Jakob Borg i następujący współautorzy:",
    "Delete": "Usuń",
    "Device ID": "ID urządzenia",
    "Device Identification": "Identyfikator urządzenia",
    "Device Name": "Nazwa urządzenia",
-    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Device {{device}} ({{address}}) wants to connect. Add new device?",
+    "Device {%device%} ({%address%}) wants to connect. Add new device?": "Urządzenie {{device}} ({{address}}) chce się połączyć. Zezwolić?",
    "Devices": "Urządzenia",
    "Disconnected": "Rozłączony",
    "Documentation": "Dokumentacja",
@@ -58,7 +58,7 @@
    "Global Discovery Server": "Globalny serwer rozgłoszeniowy",
    "Global State": "Status globalny",
    "Idle": "Bezczynny",
-    "Ignore": "Ignore",
+    "Ignore": "Ignoruj",
    "Ignore Patterns": "Wzorce ignorowania",
    "Ignore Permissions": "Ignoruj uprawnienia",
    "Incoming Rate Limit (KiB/s)": "Ograniczenie prędkości odbierania (KiB/s)",
@@ -68,13 +68,13 @@
    "Last File Received": "Ostatni otrzymany plik",
    "Last File Synced": "Ostatni zsynchronizowany plik",
    "Last seen": "Ostatnio widziany",
-    "Later": "Later",
+    "Later": "Później",
    "Latest Release": "Najnowsza wersja",
    "Local Discovery": "Lokalne odnajdywanie",
    "Local State": "Status lokalny",
    "Maximum Age": "Maksymalny wiek",
-    "Metadata Only": "Metadata Only",
-    "Move to top of queue": "Move to top of queue",
+    "Metadata Only": "Tylko metadane",
+    "Move to top of queue": "Przenieś na początek kolejki",
    "Multi level wildcard (matches multiple directory levels)": "Wieloznaczność na poziomie katalogów i plików (uwzględnia nazwy folderów i plików)",
    "Never": "Nigdy",
    "New Device": "Nowe urządzenie",
@@ -83,11 +83,11 @@
    "No File Versioning": "Bez wersjonowania pliku",
    "Notice": "Wskazówka",
    "OK": "OK",
-    "Off": "Off",
+    "Off": "Wyłącz",
    "Offline": "Rozłączony",
    "Online": "Połączony",
    "Out Of Sync": "Niezsynchronizowane",
-    "Out of Sync Items": "Out of Sync Items",
+    "Out of Sync Items": "Niezsynchronizowane pliki",
    "Outgoing Rate Limit (KiB/s)": "Ograniczenie prędkości wysyłania (KiB/s)",
    "Override Changes": "Nadpisz zmiany",
    "Path to the folder on the local computer. Will be created if it does not exist. The tilde character (~) can be used as a shortcut for": "Ścieżka do lokalnego folderu. Zostanie utworzona jeżeli nie istnieje.\nZnak tyldy (~) może zostać użyty jako skrót do",
@@ -98,29 +98,29 @@
    "Quick guide to supported patterns": "Krótki przewodnik po obsługiwanych wzorcach",
    "RAM Utilization": "Użycie pamięci RAM",
    "Rescan": "Skanuj ponownie",
-    "Rescan All": "Rescan All",
+    "Rescan All": "Skanuj wszystko ponownie",
    "Rescan Interval": "Interwał skanowania",
    "Restart": "Uruchom ponownie",
    "Restart Needed": "Wymagane ponowne uruchomienie",
    "Restarting": "Uruchamianie ponowne",
-    "Reused": "Reused",
+    "Reused": "Ponownie użyte",
    "Save": "Zapisz",
    "Scanning": "Skanowanie",
    "Select the devices to share this folder with.": "Wybierz urządzenie, któremu udostępnić folder.",
    "Select the folders to share with this device.": "Wybierz foldery do współdzielenia z tym urządzeniem.",
    "Settings": "Ustawienia",
-    "Share": "Share",
-    "Share Folder": "Share Folder",
-    "Share Folders With Device": "Share Folders With Device",
+    "Share": "Udostępnij",
+    "Share Folder": "Udostępnij folder",
+    "Share Folders With Device": "Udostępnij foldery między urządzeniami",
    "Share With Devices": "Udostępnij dla urządzenia",
-    "Share this folder?": "Share this folder?",
+    "Share this folder?": "Udostępnić ten folder?",
    "Shared With": "Współdzielony z",
    "Short identifier for the folder. Must be the same on all cluster devices.": "Krótki identyfikator folderu. Musi być taki sam na wszystkich urządzeniach.",
    "Show ID": "Pokaż ID",
    "Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.": "Pokazane w statusie zamiast ID urządzenia.Zostanie wysłane do innych urządzeń jako opcjonalna domyślna nazwa.",
    "Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.": "Pokazane w statusie zamiast ID urządzenia. Zostanie zaktualizowane do nazwy urządzenia jeżeli pozostanie puste.",
    "Shutdown": "Wyłącz",
-    "Shutdown Complete": "Shutdown Complete",
+    "Shutdown Complete": "Wyłączanie ukończone",
    "Simple File Versioning": "Proste wersjonowanie pliku",
    "Single level wildcard (matches within a directory only)": "Wieloznaczność na poziomie plików (uwzględnia nazwy plików)",
    "Source Code": "Kod źródłowy",
@@ -137,7 +137,7 @@
    "Syncthing is restarting.": "Restart Syncthing",
    "Syncthing is upgrading.": "Aktualizowanie Syncthing",
    "Syncthing seems to be down, or there is a problem with your Internet connection. Retrying…": "Syncthing wydaje się być wyłączony lub jest problem z twoim połączeniem internetowym. Próbuje ponownie...",
-    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing seems to be experiencing a problem processing your request. Please reload your browser or restart Syncthing if the problem persists.",
+    "Syncthing seems to be experiencing a problem processing your request. Please refresh the page or restart Syncthing if the problem persists.": "Syncthing nie może przetworzyć twojego zapytania. Proszę przeładuj stronę lub restartuj Syncthing gdy problem pozostanie.",
    "The aggregated statistics are publicly available at {%url%}.": "Zebrane statystyki są publicznie dostępna pod adresem {{url}}.",
    "The configuration has been saved but not activated. Syncthing must restart to activate the new configuration.": "Konfiguracja została zapisana lecz nie jest aktywna. Syncthing musi zostać zrestartowany aby aktywować nową konfiguracje.",
    "The device ID cannot be blank.": "ID urządzenia nie może być puste.",
@@ -156,7 +156,7 @@
    "The rescan interval must be a non-negative number of seconds.": "Interwał skanowania musi być niezerową liczbą sekund.",
    "The rescan interval must be at least 5 seconds.": "Interwał skanowania musi wynosić co najmniej 5 sekund.",
    "Unknown": "Nieznany",
-    "Unshared": "Unshared",
+    "Unshared": "Nieudostępnione",
    "Unused": "Nieużywane",
    "Up to Date": "Aktualny",
    "Upgrade To {%version%}": "Aktualizuj do {{version}}",
@@ -173,5 +173,5 @@
    "You must keep at least one version.": "Musisz posiadać przynajmniej jedną wersję",
    "full documentation": "pełna dokumentacja",
    "items": "pozycji",
-    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} wants to share folder \"{{folder}}\"."
+    "{%device%} wants to share folder \"{%folder%}\".": "{{device}} chce udostępnić folder \"{{folder}}\""
 }
@@ -82,7 +82,7 @@
    "No": "Ні",
    "No File Versioning": "Версіонування вимкнено",
    "Notice": "Повідомлення",
-    "OK": "OK",
+    "OK": "Гаразд",
    "Off": "Вимкнути",
    "Offline": "Офлайн",
    "Online": "Онлайн",
@@ -106,8 +106,8 @@
    "Reused": "Використано вдруге",
    "Save": "Зберегти",
    "Scanning": "Сканування",
-    "Select the devices to share this folder with.": "Оберіть пристрої із якими обміняти дану директорію.",
-    "Select the folders to share with this device.": "Оберіть директорії які обмінювати із цим пристроєм.",
+    "Select the devices to share this folder with.": "Оберіть пристрої, які матимуть доступ до цієї директорії.",
+    "Select the folders to share with this device.": "Оберіть директорії до яких матиме доступ цей пристрій.",
    "Settings": "Налаштування",
    "Share": "Розповсюдити ",
    "Share Folder": "Розповсюдити каталог",
@@ -38,6 +38,12 @@
            <span translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
          </button>
        </li>
+        <li ng-if="upgradeInfo && upgradeInfo.majorNewer">
+          <button type="button" class="btn navbar-btn btn-danger btn-sm" href="" ng-click="upgradeMajor()">
+            <span class="glyphicon glyphicon-chevron-up"></span>&emsp;
+            <span translate translate-value-version="{{upgradeInfo.latest}}">Upgrade To {%version%}</span>
+          </button>
+        </li>
        <li class="dropdown">
          <a href="#" class="dropdown-toggle" data-toggle="dropdown"><span class="glyphicon glyphicon-cog" aria-label="Edit"></span></a>
          <ul class="dropdown-menu">
@@ -147,7 +153,7 @@
        <div class="panel panel-warning">
          <div class="panel-heading"><h3 class="panel-title"><span class="glyphicon glyphicon-exclamation-sign"></span><span translate>Notice</span></h3></div>
          <div class="panel-body">
-            <p ng-repeat="err in errorList()"><small>{{err.time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.error)}}</p>
+            <p ng-repeat="err in errorList()"><small>{{err.Time | date:"H:mm:ss"}}:</small> {{friendlyDevices(err.Error)}}</p>
          </div>
          <div class="panel-footer">
            <button type="button" class="pull-right btn btn-sm btn-default" ng-click="clearErrors()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>OK</span></button>
@@ -168,9 +174,9 @@
        <div class="visible-xs"><h3><span translate>Folders</span></h3><hr></div>
          <div class="panel panel-default" ng-repeat="folder in folderList()">
            <div class="panel-heading" data-toggle="collapse" data-parent="#folders" href="#folder-{{$index}}" style="cursor: pointer">
-              <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.id)}}%"></div>
+              <div class="panel-progress" ng-show="folderStatus(folder) == 'syncing'" ng-attr-style="width: {{syncPercentage(folder.ID)}}%"></div>
              <h3 class="panel-title">
-                <span class="glyphicon glyphicon-hdd hidden-xs"></span>{{folder.id}}
+                <span class="glyphicon glyphicon-hdd hidden-xs"></span>{{folder.ID}}
                <span class="pull-right text-{{folderClass(folder)}}" ng-switch="folderStatus(folder)">
                  <span ng-switch-when="unknown"><span class="hidden-xs" translate>Unknown</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="unshared"><span class="hidden-xs" translate>Unshared</span><span class="visible-xs">&#9724;</span></span>
@@ -179,7 +185,7 @@
                  <span ng-switch-when="idle"><span class="hidden-xs" translate>Up to Date</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="syncing">
                    <span class="hidden-xs" translate>Syncing</span>
-                    ({{syncPercentage(folder.id)}}%)
+                    ({{syncPercentage(folder.ID)}}%)
                  </span>
                </span>
              </h3>
@@ -190,65 +196,64 @@
                  <tbody>
                    <tr>
                      <th><span class="glyphicon glyphicon-folder-open"></span>&emsp;<span translate>Folder Path</span></th>
-                      <td class="text-right">{{folder.path}}</td>
+                      <td class="text-right">{{folder.Path}}</td>
                    </tr>
-                    <tr ng-if="model[folder.id].invalid">
+                    <tr ng-if="model[folder.ID].invalid">
                      <th><span class="glyphicon glyphicon-warning-sign"></span>&emsp;<span translate>Error</span></th>
-                      <td class="text-right">{{model[folder.id].invalid}}</td>
+                      <td class="text-right">{{model[folder.ID].invalid}}</td>
                    </tr>
                    <tr>
                      <th><span class="glyphicon glyphicon-globe"></span>&emsp;<span translate>Global State</span></th>
-                      <td class="text-right">{{model[folder.id].globalFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.id].globalBytes | binary}}B</td>
+                      <td class="text-right">{{model[folder.ID].globalFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.ID].globalBytes | binary}}B</td>
                    </tr>
                    <tr>
                      <th><span class="glyphicon glyphicon-home"></span>&emsp;<span translate>Local State</span></th>
-                      <td class="text-right">{{model[folder.id].localFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.id].localBytes | binary}}B</td>
+                      <td class="text-right">{{model[folder.ID].localFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.ID].localBytes | binary}}B</td>
                    </tr>
-                    <tr ng-if="model[folder.id].needFiles > 0">
+                    <tr ng-if="model[folder.ID].needFiles > 0">
                      <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Out Of Sync</span></th>
                      <td class="text-right">
-                        <a ng-click="showNeed(folder.id)" href="">{{model[folder.id].needFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.id].needBytes | binary}}B</a>
+                        <a ng-click="showNeed(folder.ID)" href="">{{model[folder.ID].needFiles | alwaysNumber}} <span translate>items</span>, ~{{model[folder.ID].needBytes | binary}}B</a>
                      </td>
                    </tr>
-                    <tr ng-if="folder.readOnly">
+                    <tr ng-if="folder.ReadOnly">
                      <th><span class="glyphicon glyphicon-lock"></span>&emsp;<span translate>Folder Master</span></th>
                      <td class="text-right">
                        <span translate>Yes</span>
                      </td>
                    </tr>
-                    <tr ng-if="model[folder.id].ignorePatterns">
+                    <tr ng-if="model[folder.ID].ignorePatterns">
                      <th><span class="glyphicon glyphicon-eye-close"></span>&emsp;<span translate>Ignore Patterns</span></th>
                      <td class="text-right">
                        <span translate>Yes</span>
                      </td>
                    </tr>
-                    <tr ng-if="folder.ignorePerms">
+                    <tr ng-if="folder.IgnorePerms">
                      <th><span class="glyphicon glyphicon-unchecked"></span>&emsp;<span translate>Ignore Permissions</span></th>
                      <td class="text-right">
                        <span translate>Yes</span>
                      </td>
                    </tr>
-                    <tr ng-if="folder.rescanIntervalS != 60">
+                    <tr ng-if="folder.RescanIntervalS != 60">
                      <th><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan Interval</span></th>
-                      <td class="text-right">{{folder.rescanIntervalS}} s</td>
+                      <td class="text-right">{{folder.RescanIntervalS}} s</td>
                    </tr>
-                    <tr ng-if="folder.versioning.type">
+                    <tr ng-if="folder.Versioning.Type">
                      <th><span class="glyphicon glyphicon-tags"></span>&emsp;<span translate>File Versioning</span></th>
-                      <td class="text-right" ng-switch="folder.versioning.type">
+                      <td class="text-right" ng-switch="folder.Versioning.Type">
                        <span ng-switch-when="staggered" translate>Staggered File Versioning</span>
                        <span ng-switch-when="simple" translate>Simple File Versioning</span>
-                        <span ng-switch-when="external" translate>External File Versioning</span>
                      </td>
                    </tr>
                    <tr>
                      <th><span class="glyphicon glyphicon-share-alt"></span>&emsp;<span translate>Shared With</span></th>
                      <td class="text-right">{{sharesFolder(folder)}}</td>
                    </tr>
-                    <tr ng-if="!folder.readOnly && folderStats[folder.id].lastFile">
+                    <tr ng-if="!folder.readOnly && folderStats[folder.ID].LastFile">
                      <th><span class="glyphicon glyphicon-transfer"></span>&emsp;<span translate>Last File Received</span></th>
                      <td class="text-right">
-                        <span title="{{folderStats[folder.id].lastFile.filename}} @ {{folderStats[folder.id].lastFile.at | date:'yyyy-MM-dd HH:mm'}}">
-                          {{folderStats[folder.id].lastFile.filename | basename}}
+                        <span title="{{folderStats[folder.ID].LastFile.Filename}} @ {{folderStats[folder.ID].LastFile.At | date:'yyyy-MM-dd HH:mm'}}">
+                          {{folderStats[folder.ID].LastFile.Filename | basename}}
                        </span>
                      </td>
                    </tr>
@@ -256,9 +261,9 @@
                </table>
              </div>
              <div class="panel-footer">
-                <button class="btn btn-sm btn-danger pull-left" ng-if="folder.readOnly && model[folder.id].needFiles > 0" ng-click="override(folder.id)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></button>
+                <button class="btn btn-sm btn-danger pull-left" ng-if="folder.ReadOnly && model[folder.ID].needFiles > 0" ng-click="override(folder.ID)" href=""><span class="glyphicon glyphicon-upload"></span>&emsp;<span translate>Override Changes</span></button>
                <span class="pull-right">
-                  <button class="btn btn-sm btn-default" href="" ng-show="folderStatus(folder) == 'idle'" ng-click="rescanFolder(folder.id)"><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan</span></button>
+                  <button class="btn btn-sm btn-default" href="" ng-show="folderStatus(folder) == 'idle'" ng-click="rescanFolder(folder.ID)"><span class="glyphicon glyphicon-refresh"></span>&emsp;<span translate>Rescan</span></button>
                  <button class="btn btn-sm btn-default" href="" ng-click="editFolder(folder)"><span class="glyphicon glyphicon-pencil"></span>&emsp;<span translate>Edit</span></button>
                </span>
                <div class="clearfix"></div>
@@ -283,7 +288,7 @@
        <div class="panel panel-default" ng-repeat="deviceCfg in [thisDevice()]">
          <div class="panel-heading" data-toggle="collapse" href="#device-this" style="cursor: pointer">
            <h3 class="panel-title">
-              <identicon data-value="deviceCfg.deviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
+              <identicon data-value="deviceCfg.DeviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
            </h3>
          </div>
          <div id="device-this" class="panel-collapse collapse in">
@@ -292,11 +297,11 @@
                <tbody>
                  <tr>
                    <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
-                    <td class="text-right">{{connections['total'].inbps | binary}}B/s ({{connections['total'].inBytesTotal | binary}}B)</td>
+                    <td class="text-right">{{connections['total'].inbps | binary}}B/s ({{connections['total'].InBytesTotal | binary}}B)</td>
                  </tr>
                  <tr>
                    <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
-                    <td class="text-right">{{connections['total'].outbps | binary}}B/s ({{connections['total'].outBytesTotal | binary}}B)</td>
+                    <td class="text-right">{{connections['total'].outbps | binary}}B/s ({{connections['total'].OutBytesTotal | binary}}B)</td>
                  </tr>
                  <tr>
                    <th><span class="glyphicon glyphicon-th"></span>&emsp;<span translate>RAM Utilization</span></th>
@@ -334,13 +339,13 @@
        <div class="panel-group" id="devices">
          <div class="panel panel-default" ng-repeat="deviceCfg in otherDevices()">
            <div class="panel-heading" data-toggle="collapse" data-parent="#devices" href="#device-{{$index}}" style="cursor: pointer">
-              <div class="panel-progress" ng-show="deviceStatus(deviceCfg) == 'syncing'" ng-attr-style="width: {{completion[deviceCfg.deviceID]._total | number:0}}%"></div>
+              <div class="panel-progress" ng-show="deviceStatus(deviceCfg) == 'syncing'" ng-attr-style="width: {{completion[deviceCfg.DeviceID]._total | number:0}}%"></div>
              <h3 class="panel-title">
-                <identicon data-value="deviceCfg.deviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
+                <identicon data-value="deviceCfg.DeviceID"></identicon>&emsp;{{deviceName(deviceCfg)}}
                <span ng-switch="deviceStatus(deviceCfg)" class="pull-right text-{{deviceClass(deviceCfg)}}">
                  <span ng-switch-when="insync"><span class="hidden-xs" translate>Up to Date</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="syncing">
-                    <span class="hidden-xs" translate>Syncing</span> ({{completion[deviceCfg.deviceID]._total | number:0}}%)
+                    <span class="hidden-xs" translate>Syncing</span> ({{completion[deviceCfg.DeviceID]._total | number:0}}%)
                  </span>
                  <span ng-switch-when="disconnected"><span class="hidden-xs" translate>Disconnected</span><span class="visible-xs">&#9724;</span></span>
                  <span ng-switch-when="unused"><span class="hidden-xs" translate>Unused</span><span class="visible-xs">&#9724;</span></span>
@@ -351,37 +356,37 @@
              <div class="panel-body">
                <table class="table table-condensed table-striped">
                  <tbody>
-                    <tr ng-if="connections[deviceCfg.deviceID]">
+                    <tr ng-if="connections[deviceCfg.DeviceID]">
                      <th><span class="glyphicon glyphicon-cloud-download"></span>&emsp;<span translate>Download Rate</span></th>
-                      <td class="text-right">{{connections[deviceCfg.deviceID].inbps | binary}}B/s ({{connections[deviceCfg.deviceID].inBytesTotal | binary}}B)</td>
+                      <td class="text-right">{{connections[deviceCfg.DeviceID].inbps | binary}}B/s ({{connections[deviceCfg.DeviceID].InBytesTotal | binary}}B)</td>
                    </tr>
-                    <tr ng-if="connections[deviceCfg.deviceID]">
+                    <tr ng-if="connections[deviceCfg.DeviceID]">
                      <th><span class="glyphicon glyphicon-cloud-upload"></span>&emsp;<span translate>Upload Rate</span></th>
-                      <td class="text-right">{{connections[deviceCfg.deviceID].outbps | binary}}B/s ({{connections[deviceCfg.deviceID].outBytesTotal | binary}}B)</td>
+                      <td class="text-right">{{connections[deviceCfg.DeviceID].outbps | binary}}B/s ({{connections[deviceCfg.DeviceID].OutBytesTotal | binary}}B)</td>
                    </tr>
                    <tr>
                      <th><span class="glyphicon glyphicon-link"></span>&emsp;<span translate>Address</span></th>
                      <td class="text-right">{{deviceAddr(deviceCfg)}}</td>
                    </tr>
-                    <tr ng-if="deviceCfg.compression != 'metadata'">
+                    <tr ng-if="deviceCfg.Compression != 'metadata'">
                      <th><span class="glyphicon glyphicon-compressed"></span>&emsp;<span translate>Compression</span></th>
                      <td class="text-right">
-                        <span ng-if="deviceCfg.compression == 'always'" translate>All Data</span>
-                        <span ng-if="deviceCfg.compression == 'never'" translate>Off</span>
+                        <span ng-if="deviceCfg.Compression == 'always'" translate>All Data</span>
+                        <span ng-if="deviceCfg.Compression == 'never'" translate>Off</span>
                      </td>
                    </tr>
-                    <tr ng-if="deviceCfg.introducer">
+                    <tr ng-if="deviceCfg.Introducer">
                      <th><span class="glyphicon glyphicon-thumbs-up"></span>&emsp;<span translate>Introducer</span></th>
                      <td translate class="text-right">Yes</td>
                    </tr>
-                    <tr ng-if="connections[deviceCfg.deviceID]">
+                    <tr ng-if="connections[deviceCfg.DeviceID]">
                      <th><span class="glyphicon glyphicon-tag"></span>&emsp;<span translate>Version</span></th>
-                      <td class="text-right">{{connections[deviceCfg.deviceID].clientVersion}}</td>
+                      <td class="text-right">{{connections[deviceCfg.DeviceID].ClientVersion}}</td>
                    </tr>
-                    <tr ng-if="!connections[deviceCfg.deviceID]">
+                    <tr ng-if="!connections[deviceCfg.DeviceID]">
                      <th><span class="glyphicon glyphicon-eye-open"></span>&emsp;<span translate>Last seen</span></th>
-                      <td translate ng-if="!deviceStats[deviceCfg.deviceID].lastSeenDays || deviceStats[deviceCfg.deviceID].lastSeenDays >= 365" class="text-right">Never</td>
-                      <td ng-if="deviceStats[deviceCfg.deviceID].lastSeenDays < 365" class="text-right">{{deviceStats[deviceCfg.deviceID].lastSeen | date:"yyyy-MM-dd HH:mm"}}</td>
+                      <td translate ng-if="!deviceStats[deviceCfg.DeviceID].LastSeenDays || deviceStats[deviceCfg.DeviceID].LastSeenDays >= 365" class="text-right">Never</td>
+                      <td ng-if="deviceStats[deviceCfg.DeviceID].LastSeenDays < 365" class="text-right">{{deviceStats[deviceCfg.DeviceID].LastSeen | date:"yyyy-MM-dd HH:mm"}}</td>
                    </tr>
                    <tr ng-if="deviceFolders(deviceCfg).length > 0">
                      <th><span class="glyphicon glyphicon-hdd"></span>&emsp;<span translate>Folders</span></th>
@@ -461,6 +466,35 @@
    <img ng-if="myID" class="center-block img-thumbnail" src="qr/?text={{myID}}"/>
  </modal>

+  <!-- Major upgrade modal -->
+
+  <div id="majorUpgrade" class="modal fade" tabindex="-1" data-backdrop="true" data-keyboard="true">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header alert alert-danger">
+          <h4 class="modal-title">
+            <span ng-if="icon" class="glyphicon glyphicon-chevron-up"></span>
+            <span translate>Major Upgrade</span>
+          </h4>
+        </div>
+        <div class="modal-body">
+          <p>
+            <span translate>This is a major version upgrade.</span>
+            <span translate>A new major version may not be compatible with previous versions.</span>
+            <span translate>Please consult the release notes before performing a major upgrade.</span>
+          </p>
+          <p>
+            <a href="https://github.com/syncthing/syncthing/releases/latest" target="_blank" translate>Release Notes</a>
+          </p>
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-primary btn-sm" ng-click="upgrade()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Upgrade</span></button>
+          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
+        </div>
+      </div>
+    </div>
+  </div>
+
  <!-- Device editor modal -->

  <div id="editDevice" class="modal fade" tabindex="-1">
@@ -474,11 +508,11 @@
          <form role="form" name="deviceEditor">
            <div class="form-group" ng-class="{'has-error': deviceEditor.deviceID.$invalid && deviceEditor.deviceID.$dirty}">
              <label translate for="deviceID">Device ID</label>
-              <input ng-if="!editingExisting" name="deviceID" id="deviceID" class="form-control text-monospace" type="text" ng-model="currentDevice.deviceID" required valid-deviceid list="discovery-list" />
+              <input ng-if="!editingExisting" name="deviceID" id="deviceID" class="form-control text-monospace" type="text" ng-model="currentDevice.DeviceID" required valid-deviceid list="discovery-list" />
              <datalist id="discovery-list" ng-if="!editingExisting">
                <option ng-repeat="(id,address) in discovery" value="{{ id }}" />
              </datalist>
-              <div ng-if="editingExisting" class="well well-sm text-monospace">{{currentDevice.deviceID}}</div>
+              <div ng-if="editingExisting" class="well well-sm text-monospace">{{currentDevice.DeviceID}}</div>
              <p class="help-block">
                <span translate ng-if="deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine">The device ID to enter here can be found in the "Edit > Show ID" dialog on the other device. Spaces and dashes are optional (ignored).</span>
                <span translate ng-show="!editingExisting && (deviceEditor.deviceID.$valid || deviceEditor.deviceID.$pristine)">When adding a new device, keep in mind that this device must be added on the other side too.</span>
@@ -488,18 +522,18 @@
            </div>
            <div class="form-group">
              <label translate for="name">Device Name</label>
-              <input id="name" class="form-control" type="text" ng-model="currentDevice.name"></input>
-              <p translate ng-if="currentDevice.deviceID == myID" class="help-block">Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.</p>
-              <p translate ng-if="currentDevice.deviceID != myID" class="help-block">Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.</p>
+              <input id="name" class="form-control" type="text" ng-model="currentDevice.Name"></input>
+              <p translate ng-if="currentDevice.DeviceID == myID" class="help-block">Shown instead of Device ID in the cluster status. Will be advertised to other devices as an optional default name.</p>
+              <p translate ng-if="currentDevice.DeviceID != myID" class="help-block">Shown instead of Device ID in the cluster status. Will be updated to the name the device advertises if left empty.</p>
            </div>
            <div class="form-group">
              <label translate for="addresses">Addresses</label>
-              <input ng-disabled="currentDevice.deviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice.addressesStr"></input>
+              <input ng-disabled="currentDevice.DeviceID == myID" id="addresses" class="form-control" type="text" ng-model="currentDevice.AddressesStr"></input>
              <p translate class="help-block">Enter comma separated "ip:port" addresses or "dynamic" to perform automatic discovery of the address.</p>
            </div>
            <div ng-if="!editingSelf" class="form-group">
              <label translate>Compression</label>
-              <select class="form-control" ng-model="currentDevice.compression">
+              <select class="form-control" ng-model="currentDevice.Compression">
                <option value="always" translate>All Data</option>
                <option value="metadata" translate>Metadata Only</option>
                <option value="never" translate>Off</option>
@@ -508,7 +542,7 @@
            <div ng-if="!editingSelf" class="form-group">
              <div class="checkbox">
                <label>
-                  <input type="checkbox" ng-model="currentDevice.introducer"> <span translate>Introducer</span>
+                  <input type="checkbox" ng-model="currentDevice.Introducer"> <span translate>Introducer</span>
                </label>
                <p translate class="help-block">Any devices configured on an introducer device will be added to this device as well.</p>
              </div>
@@ -522,7 +556,7 @@
                  <div class="three-columns">
                    <div class="checkbox" ng-repeat="folder in folderList()">
                      <label>
-                        <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.id]"> {{folder.id}}
+                        <input type="checkbox" ng-model="currentDevice.selectedFolders[folder.ID]"> {{folder.ID}}
                      </label>
                    </div>
                  </div>
@@ -556,7 +590,7 @@
              <div class="col-md-12">
                <div class="form-group" ng-class="{'has-error': folderEditor.folderID.$invalid && folderEditor.folderID.$dirty}">
                  <label for="folderID"><span translate>Folder ID</span></label>
-                  <input name="folderID" ng-readonly="editingExisting" id="folderID" class="form-control" type="text" ng-model="currentFolder.id" required unique-folder ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
+                  <input name="folderID" ng-readonly="editingExisting" id="folderID" class="form-control" type="text" ng-model="currentFolder.ID" required unique-folder ng-pattern="/^[a-zA-Z0-9-_.]{1,64}$/"></input>
                  <p class="help-block">
                    <span translate ng-if="folderEditor.folderID.$valid || folderEditor.folderID.$pristine">Short identifier for the folder. Must be the same on all cluster devices.</span>
                    <span translate ng-if="folderEditor.folderID.$error.uniqueFolder">The folder ID must be unique.</span>
@@ -566,7 +600,7 @@
                </div>
                <div class="form-group" ng-class="{'has-error': folderEditor.folderPath.$invalid && folderEditor.folderPath.$dirty}">
                  <label translate for="folderPath">Folder Path</label>
-                  <input name="folderPath" ng-readonly="editingExisting" id="folderPath" class="form-control" type="text" ng-model="currentFolder.path" list="directory-list" required />
+                  <input name="folderPath" ng-readonly="editingExisting" id="folderPath" class="form-control" type="text" ng-model="currentFolder.Path" list="directory-list" required />
                  <datalist id="directory-list">
                    <option ng-repeat="directory in directoryList" value="{{ directory }}" />
                  </datalist>
@@ -577,7 +611,7 @@
                </div>
                <div class="form-group" ng-class="{'has-error': folderEditor.rescanIntervalS.$invalid && folderEditor.rescanIntervalS.$dirty}">
                  <label for="rescanIntervalS"><span translate>Rescan Interval</span> (s)</label>
-                  <input name="rescanIntervalS" id="rescanIntervalS" class="form-control" type="number" ng-model="currentFolder.rescanIntervalS" required min="0"></input>
+                  <input name="rescanIntervalS" id="rescanIntervalS" class="form-control" type="number" ng-model="currentFolder.RescanIntervalS" required min="0"></input>
                  <p class="help-block">
                    <span translate ng-if="!folderEditor.rescanIntervalS.$valid && folderEditor.rescanIntervalS.$dirty">The rescan interval must be a non-negative number of seconds.</span>
                  </p>
@@ -589,7 +623,7 @@
                <div class="form-group">
                  <div class="checkbox">
                    <label>
-                      <input type="checkbox" ng-model="currentFolder.readOnly"> <span translate>Folder Master</span>
+                      <input type="checkbox" ng-model="currentFolder.ReadOnly"> <span translate>Folder Master</span>
                    </label>
                  </div>
                  <p translate class="help-block">Files are protected from changes made on other devices, but changes made on this device will be sent to the rest of the cluster.</p>
@@ -597,7 +631,7 @@
                <div class="form-group">
                  <div class="checkbox">
                    <label>
-                      <input type="checkbox" ng-model="currentFolder.ignorePerms"> <span translate>Ignore Permissions</span>
+                      <input type="checkbox" ng-model="currentFolder.IgnorePerms"> <span translate>Ignore Permissions</span>
                    </label>
                  </div>
                  <p translate class="help-block">File permission bits are ignored when looking for changes. Use on FAT filesystems.</p>
@@ -608,26 +642,21 @@
                  <label translate>File Versioning</label>
                  <div class="radio">
                    <label>
-                      <input type="radio" ng-model="currentFolder.fileVersioningSelector" value="none"> <span translate>No File Versioning</span>
+                      <input type="radio" ng-model="currentFolder.FileVersioningSelector" value="none"> <span translate>No File Versioning</span>
                    </label>
                  </div>
                  <div class="radio">
                    <label>
-                      <input type="radio" ng-model="currentFolder.fileVersioningSelector" value="simple"> <span translate>Simple File Versioning</span>
+                      <input type="radio" ng-model="currentFolder.FileVersioningSelector" value="simple"> <span translate>Simple File Versioning</span>
                    </label>
                  </div>
                  <div class="radio">
                    <label>
-                      <input type="radio" ng-model="currentFolder.fileVersioningSelector" value="staggered"> <span translate>Staggered File Versioning</span>
-                    </label>
-                  </div>
-                  <div class="radio">
-                    <label>
-                      <input type="radio" ng-model="currentFolder.fileVersioningSelector" value="external"> <span translate>External File Versioning</span>
+                      <input type="radio" ng-model="currentFolder.FileVersioningSelector" value="staggered"> <span translate>Staggered File Versioning</span>
                    </label>
                  </div>
                </div>
-                <div class="form-group" ng-if="currentFolder.fileVersioningSelector=='simple'" ng-class="{'has-error': folderEditor.simpleKeep.$invalid && folderEditor.simpleKeep.$dirty}">
+                <div class="form-group" ng-if="currentFolder.FileVersioningSelector=='simple'" ng-class="{'has-error': folderEditor.simpleKeep.$invalid && folderEditor.simpleKeep.$dirty}">
                  <p translate class="help-block">Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.</p>
                  <label translate for="simpleKeep">Keep Versions</label>
                  <input name="simpleKeep" id="simpleKeep" class="form-control" type="number" ng-model="currentFolder.simpleKeep" required min="1"></input>
@@ -637,7 +666,7 @@
                    <span translate ng-if="folderEditor.simpleKeep.$error.min && folderEditor.simpleKeep.$dirty">You must keep at least one version.</span>
                  </p>
                </div>
-                <div class="form-group" ng-if="currentFolder.fileVersioningSelector=='staggered'" ng-class="{'has-error': folderEditor.staggeredMaxAge.$invalid && folderEditor.staggeredMaxAge.$dirty}">
+                <div class="form-group" ng-if="currentFolder.FileVersioningSelector=='staggered'" ng-class="{'has-error': folderEditor.staggeredMaxAge.$invalid && folderEditor.staggeredMaxAge.$dirty}">
                  <p class="help-block"><span translate>Files are moved to date stamped versions in a .stversions folder when replaced or deleted by syncthing.</span> <span translate>Versions are automatically deleted if they are older than the maximum age or exceed the number of files allowed in an interval.</span></p>
                  <p translate class="help-block">The following intervals are used: for the first hour a version is kept every 30 seconds, for the first day a version is kept every hour, for the first 30 days a version is kept every day, until the maximum age a version is kept every week.</p>
                  <label translate for="staggeredMaxAge">Maximum Age</label>
@@ -647,20 +676,11 @@
                    <span translate ng-if="folderEditor.staggeredMaxAge.$error.required && folderEditor.staggeredMaxAge.$dirty">The maximum age must be a number and cannot be blank.</span>
                  </p>
                </div>
-                <div class="form-group" ng-if="currentFolder.fileVersioningSelector == 'staggered'">
+                <div class="form-group" ng-if="currentFolder.FileVersioningSelector == 'staggered'">
                  <label translate for="staggeredVersionsPath">Versions Path</label>
                  <input name="staggeredVersionsPath" id="staggeredVersionsPath" class="form-control" type="text" ng-model="currentFolder.staggeredVersionsPath"></input>
                  <p translate class="help-block">Path where versions should be stored (leave empty for the default .stversions folder in the folder).</p>
                </div>
-                <div class="form-group" ng-if="currentFolder.fileVersioningSelector=='external'" ng-class="{'has-error': folderEditor.externalCommand.$invalid && folderEditor.externalCommand.$dirty}">
-                  <p translate class="help-block">A external command handles the versioning. It has to remove the file from the synced folder.</p>
-                  <label translate for="externalCommand">Command</label>
-                  <input name="externalCommand" id="externalCommand" class="form-control" type="text" ng-model="currentFolder.externalCommand" required></input>
-                  <p class="help-block">
-                    <span translate ng-if="folderEditor.externalCommand.$valid || folderEditor.externalCommand.$pristine">The first command line parameter is the folder path and the second parameter is the relative path in the folder.</span>
-                    <span translate ng-if="folderEditor.externalCommand.$error.required  && folderEditor.externalCommand.$dirty">The path cannot be blank.</span>
-                  </p>
-                </div>
              </div>
            </div>

@@ -672,7 +692,7 @@
                  <div class="three-columns">
                    <div class="checkbox" ng-repeat="device in otherDevices()">
                      <label>
-                        <input type="checkbox" ng-model="currentFolder.selectedDevices[device.deviceID]"> {{deviceName(device)}}
+                        <input type="checkbox" ng-model="currentFolder.selectedDevices[device.DeviceID]"> {{deviceName(device)}}
                      </label>
                    </div>
                  </div>
@@ -716,7 +736,7 @@
          </dl>
        </div>
        <div class="modal-footer">
-          <div class="pull-left"><span translate>Editing</span> <code>{{currentFolder.path}}{{system.pathSeparator}}.stignore</code></div>
+          <div class="pull-left"><span translate>Editing</span> <code>{{currentFolder.Path}}{{system.pathSeparator}}.stignore</code></div>
          <button type="button" class="btn btn-primary btn-sm" data-dismiss="modal" ng-click="saveIgnores()"><span class="glyphicon glyphicon-ok"></span>&emsp;<span translate>Save</span></button>
          <button type="button" class="btn btn-default btn-sm" data-dismiss="modal"><span class="glyphicon glyphicon-remove"></span>&emsp;<span translate>Close</span></button>
        </div>
@@ -739,32 +759,32 @@
              <div class="col-md-6">
                <div class="form-group">
                  <label translate for="DeviceName">Device Name</label>
-                  <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.deviceName">
+                  <input id="DeviceName" class="form-control" type="text" ng-model="tmpOptions.DeviceName">
                </div>
                <div class="form-group">
                  <label translate for="ListenAddressStr">Sync Protocol Listen Addresses</label>
-                  <input id="ListenAddressStr" class="form-control" type="text" ng-model="tmpOptions.listenAddressStr">
+                  <input id="ListenAddressStr" class="form-control" type="text" ng-model="tmpOptions.ListenAddressStr">
                </div>
                <div class="form-group">
                  <label translate for="MaxRecvKbps">Incoming Rate Limit (KiB/s)</label>
-                  <input id="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.maxRecvKbps">
+                  <input id="MaxRecvKbps" class="form-control" type="number" ng-model="tmpOptions.MaxRecvKbps">
                </div>
                <div class="form-group">
                  <label translate for="MaxSendKbps">Outgoing Rate Limit (KiB/s)</label>
-                  <input id="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.maxSendKbps">
+                  <input id="MaxSendKbps" class="form-control" type="number" ng-model="tmpOptions.MaxSendKbps">
                </div>
                <div class="col-md-6">
                  <div class="form-group">
                    <div class="checkbox">
                      <label>
-                        <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.upnpEnabled"> <span translate>Enable UPnP</span>
+                        <input id="UPnPEnabled" type="checkbox" ng-model="tmpOptions.UPnPEnabled"> <span translate>Enable UPnP</span>
                      </label>
                    </div>
                  </div>
                  <div class="form-group">
                    <div class="checkbox">
                      <label>
-                        <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.globalAnnounceEnabled"> <span translate>Global Discovery</span>
+                        <input id="GlobalAnnEnabled" type="checkbox" ng-model="tmpOptions.GlobalAnnEnabled"> <span translate>Global Discovery</span>
                      </label>
                    </div>
                  </div>
@@ -773,55 +793,55 @@
                  <div class="form-group">
                    <div class="checkbox">
                      <label ng-if="upgradeInfo">
-                        <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.autoUpgradeEnabled"> <span translate>Automatic upgrades</span>
+                        <input id="AutoUpgradeEnabled" type="checkbox" ng-model="tmpOptions.AutoUpgradeEnabled"> <span translate>Automatic upgrades</span>
                      </label>
                    </div>
                  </div>
                  <div class="form-group">
                    <div class="checkbox">
                      <label>
-                        <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.localAnnounceEnabled"> <span translate>Local Discovery</span>
+                        <input id="LocalAnnEnabled" type="checkbox" ng-model="tmpOptions.LocalAnnEnabled"> <span translate>Local Discovery</span>
                      </label>
                    </div>
                  </div>
                </div>
                <div class="form-group">
                  <label translate for="GlobalAnnServersStr">Global Discovery Server</label>
-                  <input ng-disabled="!tmpOptions.globalAnnounceEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions.globalAnnounceServersStr">
+                  <input ng-disabled="!tmpOptions.GlobalAnnEnabled" id="GlobalAnnServersStr" class="form-control" type="text" ng-model="tmpOptions.GlobalAnnServersStr">
                </div>
              </div>

              <div class="col-md-6">
                <div class="form-group">
                  <label translate for="Address">GUI Listen Addresses</label>
-                  <input id="Address" class="form-control" type="text" ng-model="tmpGUI.address">
+                  <input id="Address" class="form-control" type="text" ng-model="tmpGUI.Address">
                </div>
                <div class="form-group">
                  <label translate for="User">GUI Authentication User</label>
-                  <input id="User" class="form-control" type="text" ng-model="tmpGUI.user">
+                  <input id="User" class="form-control" type="text" ng-model="tmpGUI.User">
                </div>
                <div class="form-group">
                  <label translate for="Password">GUI Authentication Password</label>
-                  <input id="Password" class="form-control" type="password" ng-model="tmpGUI.password">
+                  <input id="Password" class="form-control" type="password" ng-model="tmpGUI.Password">
                </div>
                <div class="form-group">
                  <div class="checkbox">
                    <label>
-                      <input id="UseTLS" type="checkbox" ng-model="tmpGUI.useTLS"> <span translate>Use HTTPS for GUI</span>
+                      <input id="UseTLS" type="checkbox" ng-model="tmpGUI.UseTLS"> <span translate>Use HTTPS for GUI</span>
                    </label>
                  </div>
                </div>
                <div class="form-group">
                  <div class="checkbox">
                    <label>
-                      <input id="StartBrowser" type="checkbox" ng-model="tmpOptions.startBrowser"> <span translate>Start Browser</span>
+                      <input id="StartBrowser" type="checkbox" ng-model="tmpOptions.StartBrowser"> <span translate>Start Browser</span>
                    </label>
                  </div>
                </div>
                <div class="form-group">
                  <div class="checkbox">
                    <label>
-                      <input id="UREnabled" type="checkbox" ng-model="tmpOptions.urEnabled"> <span translate>Anonymous Usage Reporting</span> (<a translate ng-click="showURPreview()" href="#">Preview</a>)
+                      <input id="UREnabled" type="checkbox" ng-model="tmpOptions.UREnabled"> <span translate>Anonymous Usage Reporting</span> (<a translate ng-click="showURPreview()" href="#">Preview</a>)
                    </label>
                  </div>
                </div>
@@ -830,7 +850,7 @@

                <div class="form-group">
                  <label><span translate>API Key</span></label>
-                  <div class="well well-sm text-monospace">{{tmpGUI.apiKey || "-"}}</div>
+                  <div class="well well-sm text-monospace">{{tmpGUI.APIKey || "-"}}</div>
                  <button translate type="button" class="btn btn-sm btn-default" ng-click="setAPIKey(tmpGUI)">Generate</button>
                </div>
              </div>
@@ -904,34 +924,34 @@
    <table class="table table-striped table-condensed">
      <tr ng-repeat="f in needed.progress" ng-init="a = needAction(f)">
        <td class="small-data"><span class="glyphicon glyphicon-{{needIcons[a]}}"></span> {{needActions[a]}}</td>
-        <td title="{{f.name}}">{{f.name | basename}}</td>
-        <td ng-if="a == 'sync' && progress[neededFolder] && progress[neededFolder][f.name]">
+        <td title="{{f.Name}}">{{f.Name | basename}}</td>
+        <td ng-if="a == 'sync' && progress[neededFolder] && progress[neededFolder][f.Name]">
          <div class="progress">
-            <div class="progress-bar progress-bar-success" style="width: {{progress[neededFolder][f.name].reused}}%"></div>
-            <div class="progress-bar" style="width: {{progress[neededFolder][f.name].copiedFromOrigin}}%"></div>
-            <div class="progress-bar progress-bar-info" style="width: {{progress[neededFolder][f.name].copiedFromElsewhere}}%"></div>
-            <div class="progress-bar progress-bar-warning" style="width: {{progress[neededFolder][f.name].pulled}}%"></div>
-            <div class="progress-bar progress-bar-danger progress-bar-striped active" style="width: {{progress[neededFolder][f.name].pulling}}%"></div>
+            <div class="progress-bar progress-bar-success" style="width: {{progress[neededFolder][f.Name].Reused}}%"></div>
+            <div class="progress-bar" style="width: {{progress[neededFolder][f.Name].CopiedFromOrigin}}%"></div>
+            <div class="progress-bar progress-bar-info" style="width: {{progress[neededFolder][f.Name].CopiedFromElsewhere}}%"></div>
+            <div class="progress-bar progress-bar-warning" style="width: {{progress[neededFolder][f.Name].Pulled}}%"></div>
+            <div class="progress-bar progress-bar-danger progress-bar-striped active" style="width: {{progress[neededFolder][f.Name].Pulling}}%"></div>
            <span class="show frontal">
-              {{progress[neededFolder][f.name].bytesDone | binary}}B / {{progress[neededFolder][f.name].bytesTotal | binary}}B
+              {{progress[neededFolder][f.Name].BytesDone | binary}}B / {{progress[neededFolder][f.Name].BytesTotal | binary}}B
            </span>
          </div>
        </td>
-        <td class="text-right small-data" ng-if="a != 'sync' || !progress[neededFolder] || !progress[neededFolder][f.name]">
-          <span ng-if="f.size > 0">{{f.size | binary}}B</span>
+        <td class="text-right small-data" ng-if="a != 'sync' || !progress[neededFolder] || !progress[neededFolder][f.Name]">
+          <span ng-if="f.Size > 0">{{f.Size | binary}}B</span>
        </td>
      </tr>
      <tr ng-repeat="f in needed.queued" ng-init="a = needAction(f)">
        <td class="small-data"><span class="glyphicon glyphicon-{{needIcons[a]}}"></span> {{needActions[a]}}</td>
-        <td><a href="" ng-if="$index != 0" ng-click="bumpFile(neededFolder, f.name)" title="{{'Move to top of queue' | translate}}"><span class="glyphicon glyphicon-eject"></span></a><span ng-if="$index != 0">&ensp;</span><span title="{{f.name}}">{{f.name | basename}}</span></td>
+        <td><a href="" ng-if="$index != 0" ng-click="bumpFile(neededFolder, f.Name)" title="{{'Move to top of queue' | translate}}"><span class="glyphicon glyphicon-eject"></span></a><span ng-if="$index != 0">&ensp;</span><span title="{{f.Name}}">{{f.Name | basename}}</span></td>
        <td class="text-right small-data">
-          <span ng-if="f.size > 0">{{f.size | binary}}B</span>
+          <span ng-if="f.Size > 0">{{f.Size | binary}}B</span>
         </td>
      </tr>
      <tr ng-repeat="f in needed.rest" ng-init="a = needAction(f)">
        <td class="small-data"><span class="glyphicon glyphicon-{{needIcons[a]}}"></span> {{needActions[a]}}</td>
-        <td title="{{f.name}}">{{f.name | basename}}</td>
-        <td class="text-right small-data"><span ng-if="f.size > 0">{{f.size | binary}}B</span></td>
+        <td title="{{f.Name}}">{{f.Name | basename}}</td>
+        <td class="text-right small-data"><span ng-if="f.Size > 0">{{f.Size | binary}}B</span></td>
      </tr>
    </table>

@@ -70,7 +70,7 @@ function folderCompare(a, b) {
 function folderMap(l) {
    var m = {};
    l.forEach(function (r) {
-        m[r.id] = r;
+        m[r.ID] = r;
    });
    return m;
 }
@@ -1,4 +1,7 @@
 angular.module('syncthing.core')
+    .config(function($locationProvider) {
+        $locationProvider.html5Mode(true).hashPrefix('!');
+    })
    .controller('SyncthingController', function ($scope, $http, $location, LocaleService) {
        'use strict';

@@ -141,8 +144,8 @@ angular.module('syncthing.core')
            refreshFolderStats();

            // Update completion status for all devices that we share this folder with.
-            $scope.folders[data.folder].devices.forEach(function (deviceCfg) {
-                refreshCompletion(deviceCfg.deviceID, data.folder);
+            $scope.folders[data.folder].Devices.forEach(function (deviceCfg) {
+                refreshCompletion(deviceCfg.DeviceID, data.folder);
            });
        });

@@ -162,9 +165,9 @@ angular.module('syncthing.core')
                $scope.connections[arg.data.id] = {
                    inbps: 0,
                    outbps: 0,
-                    inBytesTotal: 0,
-                    outBytesTotal: 0,
-                    address: arg.data.addr
+                    InBytesTotal: 0,
+                    OutBytesTotal: 0,
+                    Address: arg.data.addr
                };
                $scope.completion[arg.data.id] = {
                    _total: 100
@@ -173,7 +176,7 @@ angular.module('syncthing.core')
        });

        $scope.$on('ConfigLoaded', function (event) {
-            if ($scope.config.options.urAccepted === 0) {
+            if ($scope.config.Options.URAccepted === 0) {
                // If usage reporting has been neither accepted nor declined,
                // we want to ask the user to make a choice. But we don't want
                // to bug them during initial setup, so we set a cookie with
@@ -216,23 +219,23 @@ angular.module('syncthing.core')
                progress[folder] = {};
                for (var file in stats[folder]) {
                    var s = stats[folder][file];
-                    var reused = 100 * s.reused / s.total;
-                    var copiedFromOrigin = 100 * s.copiedFromOrigin / s.total;
-                    var copiedFromElsewhere = 100 * s.copiedFromElsewhere / s.total;
-                    var pulled = 100 * s.pulled / s.total;
-                    var pulling = 100 * s.pulling / s.total;
+                    var reused = 100 * s.Reused / s.Total;
+                    var copiedFromOrigin = 100 * s.CopiedFromOrigin / s.Total;
+                    var copiedFromElsewhere = 100 * s.CopiedFromElsewhere / s.Total;
+                    var pulled = 100 * s.Pulled / s.Total;
+                    var pulling = 100 * s.Pulling / s.Total;
                    // We try to round up pulling to atleast a percent so that it would be atleast a bit visible.
                    if (pulling < 1 && pulled + copiedFromElsewhere + copiedFromOrigin + reused <= 99) {
                        pulling = 1;
                    }
                    progress[folder][file] = {
-                        reused: reused,
-                        copiedFromOrigin: copiedFromOrigin,
-                        copiedFromElsewhere: copiedFromElsewhere,
-                        pulled: pulled,
-                        pulling: pulling,
-                        bytesTotal: s.bytesTotal,
-                        bytesDone: s.bytesDone,
+                        Reused: reused,
+                        CopiedFromOrigin: copiedFromOrigin,
+                        CopiedFromElsewhere: copiedFromElsewhere,
+                        Pulled: pulled,
+                        Pulling: pulling,
+                        BytesTotal: s.BytesTotal,
+                        BytesDone: s.BytesDone,
                    };
                }
            }
@@ -278,21 +281,22 @@ angular.module('syncthing.core')
            var hasConfig = !isEmptyObject($scope.config);

            $scope.config = config;
-            $scope.config.options.listenAddressStr = $scope.config.options.listenAddress.join(', ');
-            $scope.config.options.globalAnnounceServersStr = $scope.config.options.globalAnnounceServers.join(', ');
+            $scope.config.Options.ListenAddressStr = $scope.config.Options.ListenAddress.join(', ');
+            $scope.config.Options.GlobalAnnServersStr = $scope.config.Options.GlobalAnnServers.join(', ');

-            $scope.devices = $scope.config.devices;
+            $scope.devices = $scope.config.Devices;
            $scope.devices.forEach(function (deviceCfg) {
-                $scope.completion[deviceCfg.deviceID] = {
+                $scope.completion[deviceCfg.DeviceID] = {
                    _total: 100
                };
            });
            $scope.devices.sort(deviceCompare);
-            $scope.folders = folderMap($scope.config.folders);
+
+            $scope.folders = folderMap($scope.config.Folders);
            Object.keys($scope.folders).forEach(function (folder) {
                refreshFolder(folder);
-                $scope.folders[folder].devices.forEach(function (deviceCfg) {
-                    refreshCompletion(deviceCfg.deviceID, folder);
+                $scope.folders[folder].Devices.forEach(function (deviceCfg) {
+                    refreshCompletion(deviceCfg.DeviceID, folder);
                });
            });

@@ -361,8 +365,8 @@ angular.module('syncthing.core')
                        continue;
                    }
                    try {
-                        data[id].inbps = Math.max(0, (data[id].inBytesTotal - $scope.connections[id].inBytesTotal) / td);
-                        data[id].outbps = Math.max(0, (data[id].outBytesTotal - $scope.connections[id].outBytesTotal) / td);
+                        data[id].inbps = Math.max(0, (data[id].InBytesTotal - $scope.connections[id].InBytesTotal) / td);
+                        data[id].outbps = Math.max(0, (data[id].OutBytesTotal - $scope.connections[id].OutBytesTotal) / td);
                    } catch (e) {
                        data[id].inbps = 0;
                        data[id].outbps = 0;
@@ -404,8 +408,8 @@ angular.module('syncthing.core')
            $http.get(urlbase + "/stats/device").success(function (data) {
                $scope.deviceStats = data;
                for (var device in $scope.deviceStats) {
-                    $scope.deviceStats[device].lastSeen = new Date($scope.deviceStats[device].lastSeen);
-                    $scope.deviceStats[device].lastSeenDays = (new Date() - $scope.deviceStats[device].lastSeen) / 1000 / 86400;
+                    $scope.deviceStats[device].LastSeen = new Date($scope.deviceStats[device].LastSeen);
+                    $scope.deviceStats[device].LastSeenDays = (new Date() - $scope.deviceStats[device].LastSeen) / 1000 / 86400;
                }
                console.log("refreshDeviceStats", data);
            }).error($scope.emitHTTPError);
@@ -415,8 +419,8 @@ angular.module('syncthing.core')
            $http.get(urlbase + "/stats/folder").success(function (data) {
                $scope.folderStats = data;
                for (var folder in $scope.folderStats) {
-                    if ($scope.folderStats[folder].lastFile) {
-                        $scope.folderStats[folder].lastFile.at = new Date($scope.folderStats[folder].lastFile.at);
+                    if ($scope.folderStats[folder].LastFile) {
+                        $scope.folderStats[folder].LastFile.At = new Date($scope.folderStats[folder].LastFile.At);
                    }
                }
                console.log("refreshfolderStats", data);
@@ -430,38 +434,38 @@ angular.module('syncthing.core')
        };

        $scope.folderStatus = function (folderCfg) {
-            if (typeof $scope.model[folderCfg.id] === 'undefined') {
+            if (typeof $scope.model[folderCfg.ID] === 'undefined') {
                return 'unknown';
            }

-            if (folderCfg.devices.length <= 1) {
+            if (folderCfg.Devices.length <= 1) {
                return 'unshared';
            }

-            if ($scope.model[folderCfg.id].invalid !== '') {
+            if ($scope.model[folderCfg.ID].invalid !== '') {
                return 'stopped';
            }

-            return '' + $scope.model[folderCfg.id].state;
+            return '' + $scope.model[folderCfg.ID].state;
        };

        $scope.folderClass = function (folderCfg) {
-            if (typeof $scope.model[folderCfg.id] === 'undefined') {
+            if (typeof $scope.model[folderCfg.ID] === 'undefined') {
                // Unknown
                return 'info';
            }

-            if (folderCfg.devices.length <= 1) {
+            if (folderCfg.Devices.length <= 1) {
                // Unshared
                return 'warning';
            }

-            if ($scope.model[folderCfg.id].invalid !== '') {
+            if ($scope.model[folderCfg.ID].invalid !== '') {
                // Errored
                return 'danger';
            }

-            var state = '' + $scope.model[folderCfg.id].state;
+            var state = '' + $scope.model[folderCfg.ID].state;
            if (state == 'idle') {
                return 'success';
            }
@@ -487,8 +491,8 @@ angular.module('syncthing.core')
        };

        $scope.deviceIcon = function (deviceCfg) {
-            if ($scope.connections[deviceCfg.deviceID]) {
-                if ($scope.completion[deviceCfg.deviceID] && $scope.completion[deviceCfg.deviceID]._total === 100) {
+            if ($scope.connections[deviceCfg.DeviceID]) {
+                if ($scope.completion[deviceCfg.DeviceID] && $scope.completion[deviceCfg.DeviceID]._total === 100) {
                    return 'ok';
                } else {
                    return 'refresh';
@@ -503,8 +507,8 @@ angular.module('syncthing.core')
                return 'unused';
            }

-            if ($scope.connections[deviceCfg.deviceID]) {
-                if ($scope.completion[deviceCfg.deviceID] && $scope.completion[deviceCfg.deviceID]._total === 100) {
+            if ($scope.connections[deviceCfg.DeviceID]) {
+                if ($scope.completion[deviceCfg.DeviceID] && $scope.completion[deviceCfg.DeviceID]._total === 100) {
                    return 'insync';
                } else {
                    return 'syncing';
@@ -521,8 +525,8 @@ angular.module('syncthing.core')
                return 'warning';
            }

-            if ($scope.connections[deviceCfg.deviceID]) {
-                if ($scope.completion[deviceCfg.deviceID] && $scope.completion[deviceCfg.deviceID]._total === 100) {
+            if ($scope.connections[deviceCfg.DeviceID]) {
+                if ($scope.completion[deviceCfg.DeviceID] && $scope.completion[deviceCfg.DeviceID]._total === 100) {
                    return 'success';
                } else {
                    return 'primary';
@@ -534,24 +538,24 @@ angular.module('syncthing.core')
        };

        $scope.deviceAddr = function (deviceCfg) {
-            var conn = $scope.connections[deviceCfg.deviceID];
+            var conn = $scope.connections[deviceCfg.DeviceID];
            if (conn) {
-                return conn.address;
+                return conn.Address;
            }
            return '?';
        };

        $scope.deviceCompletion = function (deviceCfg) {
-            var conn = $scope.connections[deviceCfg.deviceID];
+            var conn = $scope.connections[deviceCfg.DeviceID];
            if (conn) {
-                return conn.completion + '%';
+                return conn.Completion + '%';
            }
            return '';
        };

        $scope.findDevice = function (deviceID) {
            var matches = $scope.devices.filter(function (n) {
-                return n.deviceID == deviceID;
+                return n.DeviceID == deviceID;
            });
            if (matches.length != 1) {
                return undefined;
@@ -563,10 +567,10 @@ angular.module('syncthing.core')
            if (typeof deviceCfg === 'undefined') {
                return "";
            }
-            if (deviceCfg.name) {
-                return deviceCfg.name;
+            if (deviceCfg.Name) {
+                return deviceCfg.Name;
            }
-            return deviceCfg.deviceID.substr(0, 6);
+            return deviceCfg.DeviceID.substr(0, 6);
        };

        $scope.thisDeviceName = function () {
@@ -574,19 +578,19 @@ angular.module('syncthing.core')
            if (typeof device === 'undefined') {
                return "(unknown device)";
            }
-            if (device.name) {
-                return device.name;
+            if (device.Name) {
+                return device.Name;
            }
-            return device.deviceID.substr(0, 6);
+            return device.DeviceID.substr(0, 6);
        };

        $scope.editSettings = function () {
            // Make a working copy
-            $scope.tmpOptions = angular.copy($scope.config.options);
-            $scope.tmpOptions.urEnabled = ($scope.tmpOptions.urAccepted > 0);
-            $scope.tmpOptions.deviceName = $scope.thisDevice().name;
-            $scope.tmpOptions.autoUpgradeEnabled = ($scope.tmpOptions.autoUpgradeIntervalH > 0);
-            $scope.tmpGUI = angular.copy($scope.config.gui);
+            $scope.tmpOptions = angular.copy($scope.config.Options);
+            $scope.tmpOptions.UREnabled = ($scope.tmpOptions.URAccepted > 0);
+            $scope.tmpOptions.DeviceName = $scope.thisDevice().Name;
+            $scope.tmpOptions.AutoUpgradeEnabled = ($scope.tmpOptions.AutoUpgradeIntervalH > 0);
+            $scope.tmpGUI = angular.copy($scope.config.GUI);
            $('#settings').modal();
        };

@@ -606,34 +610,34 @@ angular.module('syncthing.core')

        $scope.saveSettings = function () {
            // Make sure something changed
-            var changed = !angular.equals($scope.config.options, $scope.tmpOptions) || !angular.equals($scope.config.gui, $scope.tmpGUI);
+            var changed = !angular.equals($scope.config.Options, $scope.tmpOptions) || !angular.equals($scope.config.GUI, $scope.tmpGUI);
            if (changed) {
                // Check if usage reporting has been enabled or disabled
-                if ($scope.tmpOptions.urEnabled && $scope.tmpOptions.urAccepted <= 0) {
-                    $scope.tmpOptions.urAccepted = 1000;
-                } else if (!$scope.tmpOptions.urEnabled && $scope.tmpOptions.urAccepted > 0) {
-                    $scope.tmpOptions.urAccepted = -1;
+                if ($scope.tmpOptions.UREnabled && $scope.tmpOptions.URAccepted <= 0) {
+                    $scope.tmpOptions.URAccepted = 1000;
+                } else if (!$scope.tmpOptions.UREnabled && $scope.tmpOptions.URAccepted > 0) {
+                    $scope.tmpOptions.URAccepted = -1;
                }

                // Check if auto-upgrade has been enabled or disabled
-                if ($scope.tmpOptions.autoUpgradeEnabled) {
-                    $scope.tmpOptions.autoUpgradeIntervalH = $scope.tmpOptions.autoUpgradeIntervalH || 12;
+                if ($scope.tmpOptions.AutoUpgradeEnabled) {
+                    $scope.tmpOptions.AutoUpgradeIntervalH = $scope.tmpOptions.AutoUpgradeIntervalH || 12;
                } else {
-                    $scope.tmpOptions.autoUpgradeIntervalH = 0;
+                    $scope.tmpOptions.AutoUpgradeIntervalH = 0;
                }

                // Check if protocol will need to be changed on restart
-                if ($scope.config.gui.useTLS !== $scope.tmpGUI.useTLS) {
+                if ($scope.config.GUI.UseTLS !== $scope.tmpGUI.UseTLS) {
                    $scope.protocolChanged = true;
                }

                // Apply new settings locally
-                $scope.thisDevice().name = $scope.tmpOptions.deviceName;
-                $scope.config.options = angular.copy($scope.tmpOptions);
-                $scope.config.gui = angular.copy($scope.tmpGUI);
+                $scope.thisDevice().Name = $scope.tmpOptions.DeviceName;
+                $scope.config.Options = angular.copy($scope.tmpOptions);
+                $scope.config.GUI = angular.copy($scope.tmpGUI);

-                ['listenAddress', 'globalAnnounceServers'].forEach(function (key) {
-                    $scope.config.options[key] = $scope.config.options[key + "Str"].split(/[ ,]+/).map(function (x) {
+                ['ListenAddress', 'GlobalAnnServers'].forEach(function (key) {
+                    $scope.config.Options[key] = $scope.config.Options[key + "Str"].split(/[ ,]+/).map(function (x) {
                        return x.trim();
                    });
                });
@@ -654,7 +658,7 @@ angular.module('syncthing.core')
            if ($scope.protocolChanged) {
                var protocol = 'http';

-                if ($scope.config.gui.useTLS) {
+                if ($scope.config.GUI.UseTLS) {
                    protocol = 'https';
                }

@@ -668,6 +672,7 @@ angular.module('syncthing.core')

        $scope.upgrade = function () {
            restarting = true;
+            $('#majorUpgrade').modal('hide');
            $('#upgrading').modal();
            $http.post(urlbase + '/upgrade').success(function () {
                $('#restarting').modal();
@@ -677,6 +682,10 @@ angular.module('syncthing.core')
            });
        };

+        $scope.upgradeMajor = function () {
+            $('#majorUpgrade').modal();
+        };
+
        $scope.shutdown = function () {
            restarting = true;
            $http.post(urlbase + '/shutdown').success(function () {
@@ -688,8 +697,8 @@ angular.module('syncthing.core')
        $scope.editDevice = function (deviceCfg) {
            $scope.currentDevice = $.extend({}, deviceCfg);
            $scope.editingExisting = true;
-            $scope.editingSelf = (deviceCfg.deviceID == $scope.myID);
-            $scope.currentDevice.addressesStr = deviceCfg.addresses.join(', ');
+            $scope.editingSelf = (deviceCfg.DeviceID == $scope.myID);
+            $scope.currentDevice.AddressesStr = deviceCfg.Addresses.join(', ');
            if (!$scope.editingSelf) {
                $scope.currentDevice.selectedFolders = {};
                $scope.deviceFolders($scope.currentDevice).forEach(function (folder) {
@@ -711,9 +720,9 @@ angular.module('syncthing.core')
                })
                .then(function () {
                    $scope.currentDevice = {
-                        addressesStr: 'dynamic',
-                        compression: 'metadata',
-                        introducer: false,
+                        AddressesStr: 'dynamic',
+                        Compression: 'metadata',
+                        Introducer: false,
                        selectedFolders: {}
                    };
                    $scope.editingExisting = false;
@@ -730,18 +739,18 @@ angular.module('syncthing.core')
            }

            $scope.devices = $scope.devices.filter(function (n) {
-                return n.deviceID !== $scope.currentDevice.deviceID;
+                return n.DeviceID !== $scope.currentDevice.DeviceID;
            });
-            $scope.config.devices = $scope.devices;
+            $scope.config.Devices = $scope.devices;
            // In case we later added the device manually, remove the ignoral
            // record.
-            $scope.config.ignoredDevices = $scope.config.ignoredDevices.filter(function (id) {
-                return id !== $scope.currentDevice.deviceID;
+            $scope.config.IgnoredDevices = $scope.config.IgnoredDevices.filter(function (id) {
+                return id !== $scope.currentDevice.DeviceID;
            });

            for (var id in $scope.folders) {
-                $scope.folders[id].devices = $scope.folders[id].devices.filter(function (n) {
-                    return n.deviceID !== $scope.currentDevice.deviceID;
+                $scope.folders[id].Devices = $scope.folders[id].Devices.filter(function (n) {
+                    return n.DeviceID !== $scope.currentDevice.DeviceID;
                });
            }

@@ -755,10 +764,10 @@ angular.module('syncthing.core')

        $scope.addNewDeviceID = function (device) {
            var deviceCfg = {
-                deviceID: device,
-                addressesStr: 'dynamic',
-                compression: 'metadata',
-                introducer: false,
+                DeviceID: device,
+                AddressesStr: 'dynamic',
+                Compression: 'metadata',
+                Introducer: false,
                selectedFolders: {}
            };
            $scope.saveDeviceConfig(deviceCfg);
@@ -767,13 +776,13 @@ angular.module('syncthing.core')

        $scope.saveDeviceConfig = function (deviceCfg) {
            var done, i;
-            deviceCfg.addresses = deviceCfg.addressesStr.split(',').map(function (x) {
+            deviceCfg.Addresses = deviceCfg.AddressesStr.split(',').map(function (x) {
                return x.trim();
            });

            done = false;
            for (i = 0; i < $scope.devices.length; i++) {
-                if ($scope.devices[i].deviceID === deviceCfg.deviceID) {
+                if ($scope.devices[i].DeviceID === deviceCfg.DeviceID) {
                    $scope.devices[i] = deviceCfg;
                    done = true;
                    break;
@@ -785,32 +794,32 @@ angular.module('syncthing.core')
            }

            $scope.devices.sort(deviceCompare);
-            $scope.config.devices = $scope.devices;
+            $scope.config.Devices = $scope.devices;
            // In case we are adding the device manually, remove the ignoral
            // record.
-            $scope.config.ignoredDevices = $scope.config.ignoredDevices.filter(function (id) {
-                return id !== deviceCfg.deviceID;
+            $scope.config.IgnoredDevices = $scope.config.IgnoredDevices.filter(function (id) {
+                return id !== deviceCfg.DeviceID;
            });

            if (!$scope.editingSelf) {
                for (var id in deviceCfg.selectedFolders) {
                    if (deviceCfg.selectedFolders[id]) {
                        var found = false;
-                        for (i = 0; i < $scope.folders[id].devices.length; i++) {
-                            if ($scope.folders[id].devices[i].deviceID == deviceCfg.deviceID) {
+                        for (i = 0; i < $scope.folders[id].Devices.length; i++) {
+                            if ($scope.folders[id].Devices[i].DeviceID == deviceCfg.DeviceID) {
                                found = true;
                                break;
                            }
                        }

                        if (!found) {
-                            $scope.folders[id].devices.push({
-                                deviceID: deviceCfg.deviceID
+                            $scope.folders[id].Devices.push({
+                                DeviceID: deviceCfg.DeviceID
                            });
                        }
                    } else {
-                        $scope.folders[id].devices = $scope.folders[id].devices.filter(function (n) {
-                            return n.deviceID != deviceCfg.deviceID;
+                        $scope.folders[id].Devices = $scope.folders[id].Devices.filter(function (n) {
+                            return n.DeviceID != deviceCfg.DeviceID;
                        });
                    }
                }
@@ -824,14 +833,14 @@ angular.module('syncthing.core')
        };

        $scope.ignoreRejectedDevice = function (device) {
-            $scope.config.ignoredDevices.push(device);
+            $scope.config.IgnoredDevices.push(device);
            $scope.saveConfig();
            $scope.dismissDeviceRejection(device);
        };

        $scope.otherDevices = function () {
            return $scope.devices.filter(function (n) {
-                return n.deviceID !== $scope.myID;
+                return n.DeviceID !== $scope.myID;
            });
        };

@@ -840,7 +849,7 @@ angular.module('syncthing.core')

            for (i = 0; i < $scope.devices.length; i++) {
                n = $scope.devices[i];
-                if (n.deviceID === $scope.myID) {
+                if (n.DeviceID === $scope.myID) {
                    return n;
                }
            }
@@ -854,19 +863,19 @@ angular.module('syncthing.core')

        $scope.errorList = function () {
            return $scope.errors.filter(function (e) {
-                return e.time > $scope.seenError;
+                return e.Time > $scope.seenError;
            });
        };

        $scope.clearErrors = function () {
-            $scope.seenError = $scope.errors[$scope.errors.length - 1].time;
+            $scope.seenError = $scope.errors[$scope.errors.length - 1].Time;
            $http.post(urlbase + '/error/clear');
        };

        $scope.friendlyDevices = function (str) {
            for (var i = 0; i < $scope.devices.length; i++) {
                var cfg = $scope.devices[i];
-                str = str.replace(cfg.deviceID, $scope.deviceName(cfg));
+                str = str.replace(cfg.DeviceID, $scope.deviceName(cfg));
            }
            return str;
        };
@@ -877,7 +886,7 @@ angular.module('syncthing.core')

        $scope.directoryList = [];

-        $scope.$watch('currentFolder.path', function (newvalue) {
+        $scope.$watch('currentFolder.Path', function (newvalue) {
            $http.get(urlbase + '/autocomplete/directory', {
                params: { current: newvalue }
            }).success(function (data) {
@@ -887,29 +896,25 @@ angular.module('syncthing.core')

        $scope.editFolder = function (folderCfg) {
            $scope.currentFolder = angular.copy(folderCfg);
-            if ($scope.currentFolder.path.slice(-1) == $scope.system.pathSeparator) {
-                $scope.currentFolder.path = $scope.currentFolder.path.slice(0, -1);
+            if ($scope.currentFolder.Path.slice(-1) == $scope.system.pathSeparator) {
+                $scope.currentFolder.Path = $scope.currentFolder.Path.slice(0, -1);
            }
            $scope.currentFolder.selectedDevices = {};
-            $scope.currentFolder.devices.forEach(function (n) {
-                $scope.currentFolder.selectedDevices[n.deviceID] = true;
+            $scope.currentFolder.Devices.forEach(function (n) {
+                $scope.currentFolder.selectedDevices[n.DeviceID] = true;
            });
-            if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "simple") {
+            if ($scope.currentFolder.Versioning && $scope.currentFolder.Versioning.Type === "simple") {
                $scope.currentFolder.simpleFileVersioning = true;
-                $scope.currentFolder.fileVersioningSelector = "simple";
-                $scope.currentFolder.simpleKeep = +$scope.currentFolder.versioning.params.keep;
-            } else if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "staggered") {
+                $scope.currentFolder.FileVersioningSelector = "simple";
+                $scope.currentFolder.simpleKeep = +$scope.currentFolder.Versioning.Params.keep;
+            } else if ($scope.currentFolder.Versioning && $scope.currentFolder.Versioning.Type === "staggered") {
                $scope.currentFolder.staggeredFileVersioning = true;
-                $scope.currentFolder.fileVersioningSelector = "staggered";
-                $scope.currentFolder.staggeredMaxAge = Math.floor(+$scope.currentFolder.versioning.params.maxAge / 86400);
-                $scope.currentFolder.staggeredCleanInterval = +$scope.currentFolder.versioning.params.cleanInterval;
-                $scope.currentFolder.staggeredVersionsPath = $scope.currentFolder.versioning.params.versionsPath;
-            } else if ($scope.currentFolder.versioning && $scope.currentFolder.versioning.type === "external") {
-                $scope.currentFolder.externalFileVersioning = true;
-                $scope.currentFolder.fileVersioningSelector = "external";
-                $scope.currentFolder.externalCommand = $scope.currentFolder.versioning.params.command;
+                $scope.currentFolder.FileVersioningSelector = "staggered";
+                $scope.currentFolder.staggeredMaxAge = Math.floor(+$scope.currentFolder.Versioning.Params.maxAge / 86400);
+                $scope.currentFolder.staggeredCleanInterval = +$scope.currentFolder.Versioning.Params.cleanInterval;
+                $scope.currentFolder.staggeredVersionsPath = $scope.currentFolder.Versioning.Params.versionsPath;
            } else {
-                $scope.currentFolder.fileVersioningSelector = "none";
+                $scope.currentFolder.FileVersioningSelector = "none";
            }
            $scope.currentFolder.simpleKeep = $scope.currentFolder.simpleKeep || 5;
            $scope.currentFolder.staggeredCleanInterval = $scope.currentFolder.staggeredCleanInterval || 3600;
@@ -921,7 +926,6 @@ angular.module('syncthing.core')
            if (typeof $scope.currentFolder.staggeredMaxAge === 'undefined') {
                $scope.currentFolder.staggeredMaxAge = 365;
            }
-            $scope.currentFolder.externalCommand = $scope.currentFolder.externalCommand || "";

            $scope.editingExisting = true;
            $scope.folderEditor.$setPristine();
@@ -932,13 +936,12 @@ angular.module('syncthing.core')
            $scope.currentFolder = {
                selectedDevices: {}
            };
-            $scope.currentFolder.rescanIntervalS = 60;
-            $scope.currentFolder.fileVersioningSelector = "none";
+            $scope.currentFolder.RescanIntervalS = 60;
+            $scope.currentFolder.FileVersioningSelector = "none";
            $scope.currentFolder.simpleKeep = 5;
            $scope.currentFolder.staggeredMaxAge = 365;
            $scope.currentFolder.staggeredCleanInterval = 3600;
            $scope.currentFolder.staggeredVersionsPath = "";
-            $scope.currentFolder.externalCommand = "";
            $scope.currentFolder.autoNormalize = true;
            $scope.editingExisting = false;
            $scope.folderEditor.$setPristine();
@@ -953,13 +956,12 @@ angular.module('syncthing.core')
            };
            $scope.currentFolder.selectedDevices[device] = true;

-            $scope.currentFolder.rescanIntervalS = 60;
-            $scope.currentFolder.fileVersioningSelector = "none";
+            $scope.currentFolder.RescanIntervalS = 60;
+            $scope.currentFolder.FileVersioningSelector = "none";
            $scope.currentFolder.simpleKeep = 5;
            $scope.currentFolder.staggeredMaxAge = 365;
            $scope.currentFolder.staggeredCleanInterval = 3600;
            $scope.currentFolder.staggeredVersionsPath = "";
-            $scope.currentFolder.externalCommand = "";
            $scope.currentFolder.autoNormalize = true;
            $scope.editingExisting = false;
            $scope.folderEditor.$setPristine();
@@ -967,10 +969,10 @@ angular.module('syncthing.core')
        };

        $scope.shareFolderWithDevice = function (folder, device) {
-            $scope.folders[folder].devices.push({
-                deviceID: device
+            $scope.folders[folder].Devices.push({
+                DeviceID: device
            });
-            $scope.config.folders = folderList($scope.folders);
+            $scope.config.Folders = folderList($scope.folders);
            $scope.saveConfig();
            $scope.dismissFolderRejection(folder, device);
        };
@@ -980,19 +982,19 @@ angular.module('syncthing.core')

            $('#editFolder').modal('hide');
            folderCfg = $scope.currentFolder;
-            folderCfg.devices = [];
+            folderCfg.Devices = [];
            folderCfg.selectedDevices[$scope.myID] = true;
            for (var deviceID in folderCfg.selectedDevices) {
                if (folderCfg.selectedDevices[deviceID] === true) {
-                    folderCfg.devices.push({
-                        deviceID: deviceID
+                    folderCfg.Devices.push({
+                        DeviceID: deviceID
                    });
                }
            }
            delete folderCfg.selectedDevices;

-            if (folderCfg.fileVersioningSelector === "simple") {
-                folderCfg.versioning = {
+            if (folderCfg.FileVersioningSelector === "simple") {
+                folderCfg.Versioning = {
                    'Type': 'simple',
                    'Params': {
                        'keep': '' + folderCfg.simpleKeep
@@ -1000,10 +1002,10 @@ angular.module('syncthing.core')
                };
                delete folderCfg.simpleFileVersioning;
                delete folderCfg.simpleKeep;
-            } else if (folderCfg.fileVersioningSelector === "staggered") {
-                folderCfg.versioning = {
-                    'type': 'staggered',
-                    'params': {
+            } else if (folderCfg.FileVersioningSelector === "staggered") {
+                folderCfg.Versioning = {
+                    'Type': 'staggered',
+                    'Params': {
                        'maxAge': '' + (folderCfg.staggeredMaxAge * 86400),
                        'cleanInterval': '' + folderCfg.staggeredCleanInterval,
                        'versionsPath': '' + folderCfg.staggeredVersionsPath
@@ -1014,21 +1016,12 @@ angular.module('syncthing.core')
                delete folderCfg.staggeredCleanInterval;
                delete folderCfg.staggeredVersionsPath;

-            } else if (folderCfg.fileVersioningSelector === "external") {
-                folderCfg.versioning = {
-                    'Type': 'external',
-                    'Params': {
-                        'command': '' + folderCfg.externalCommand
-                    }
-                };
-                delete folderCfg.externalFileVersioning;
-                delete folderCfg.externalCommand;
            } else {
-                delete folderCfg.versioning;
+                delete folderCfg.Versioning;
            }

-            $scope.folders[folderCfg.id] = folderCfg;
-            $scope.config.folders = folderList($scope.folders);
+            $scope.folders[folderCfg.ID] = folderCfg;
+            $scope.config.Folders = folderList($scope.folders);

            $scope.saveConfig();
        };
@@ -1039,9 +1032,9 @@ angular.module('syncthing.core')

        $scope.sharesFolder = function (folderCfg) {
            var names = [];
-            folderCfg.devices.forEach(function (device) {
-                if (device.deviceID != $scope.myID) {
-                    names.push($scope.deviceName($scope.findDevice(device.deviceID)));
+            folderCfg.Devices.forEach(function (device) {
+                if (device.DeviceID != $scope.myID) {
+                    names.push($scope.deviceName($scope.findDevice(device.DeviceID)));
                }
            });
            names.sort();
@@ -1051,9 +1044,9 @@ angular.module('syncthing.core')
        $scope.deviceFolders = function (deviceCfg) {
            var folders = [];
            for (var folderID in $scope.folders) {
-                var devices = $scope.folders[folderID].devices
+                var devices = $scope.folders[folderID].Devices
                for (var i = 0; i < devices.length; i++) {
-                    if (devices[i].deviceID == deviceCfg.deviceID) {
+                    if (devices[i].DeviceID == deviceCfg.DeviceID) {
                        folders.push(folderID);
                        break;
                    }
@@ -1070,8 +1063,8 @@ angular.module('syncthing.core')
                return;
            }

-            delete $scope.folders[$scope.currentFolder.id];
-            $scope.config.folders = folderList($scope.folders);
+            delete $scope.folders[$scope.currentFolder.ID];
+            $scope.config.Folders = folderList($scope.folders);

            $scope.saveConfig();
        };
@@ -1082,7 +1075,7 @@ angular.module('syncthing.core')
            }

            $('#editIgnoresButton').attr('disabled', 'disabled');
-            $http.get(urlbase + '/ignores?folder=' + encodeURIComponent($scope.currentFolder.id))
+            $http.get(urlbase + '/ignores?folder=' + encodeURIComponent($scope.currentFolder.ID))
                .success(function (data) {
                    data.ignore = data.ignore || [];

@@ -1109,13 +1102,13 @@ angular.module('syncthing.core')
                return;
            }

-            $http.post(urlbase + '/ignores?folder=' + encodeURIComponent($scope.currentFolder.id), {
+            $http.post(urlbase + '/ignores?folder=' + encodeURIComponent($scope.currentFolder.ID), {
                ignore: $('#editIgnores textarea').val().split('\n')
            });
        };

        $scope.setAPIKey = function (cfg) {
-            cfg.apiKey = randomString(32);
+            cfg.APIKey = randomString(32);
        };

        $scope.showURPreview = function () {
@@ -1126,13 +1119,13 @@ angular.module('syncthing.core')
        };

        $scope.acceptUR = function () {
-            $scope.config.options.urAccepted = 1000; // Larger than the largest existing report version
+            $scope.config.Options.URAccepted = 1000; // Larger than the largest existing report version
            $scope.saveConfig();
            $('#ur').modal('hide');
        };

        $scope.declineUR = function () {
-            $scope.config.options.urAccepted = -1;
+            $scope.config.Options.URAccepted = -1;
            $scope.saveConfig();
            $('#ur').modal('hide');
        };
@@ -1150,11 +1143,11 @@ angular.module('syncthing.core')
            var fDelete = 4096;
            var fDirectory = 16384;

-            if ((file.flags & (fDelete + fDirectory)) === fDelete + fDirectory) {
+            if ((file.Flags & (fDelete + fDirectory)) === fDelete + fDirectory) {
                return 'rmdir';
-            } else if ((file.flags & fDelete) === fDelete) {
+            } else if ((file.Flags & fDelete) === fDelete) {
                return 'rm';
-            } else if ((file.flags & fDirectory) === fDirectory) {
+            } else if ((file.Flags & fDirectory) === fDirectory) {
                return 'touch';
            } else {
                return 'sync';
@@ -30,12 +30,12 @@ var l = logger.DefaultLogger
 const CurrentVersion = 10

 type Configuration struct {
-	Version        int                   `xml:"version,attr" json:"version"`
-	Folders        []FolderConfiguration `xml:"folder" json:"folders"`
-	Devices        []DeviceConfiguration `xml:"device" json:"devices"`
-	GUI            GUIConfiguration      `xml:"gui" json:"gui"`
-	Options        OptionsConfiguration  `xml:"options" json:"options"`
-	IgnoredDevices []protocol.DeviceID   `xml:"ignoredDevice" json:"ignoredDevices"`
+	Version        int                   `xml:"version,attr"`
+	Folders        []FolderConfiguration `xml:"folder"`
+	Devices        []DeviceConfiguration `xml:"device"`
+	GUI            GUIConfiguration      `xml:"gui"`
+	Options        OptionsConfiguration  `xml:"options"`
+	IgnoredDevices []protocol.DeviceID   `xml:"ignoredDevice"`
 	XMLName        xml.Name              `xml:"configuration" json:"-"`

 	OriginalVersion         int                   `xml:"-" json:"-"` // The version we read from disk, before any conversion
@@ -44,20 +44,20 @@ type Configuration struct {
 }

 type FolderConfiguration struct {
-	ID              string                      `xml:"id,attr" json:"id"`
-	Path            string                      `xml:"path,attr" json:"path"`
-	Devices         []FolderDeviceConfiguration `xml:"device" json:"devices"`
-	ReadOnly        bool                        `xml:"ro,attr" json:"readOnly"`
-	RescanIntervalS int                         `xml:"rescanIntervalS,attr" json:"rescanIntervalS"`
-	IgnorePerms     bool                        `xml:"ignorePerms,attr" json:"ignorePerms"`
-	AutoNormalize   bool                        `xml:"autoNormalize,attr" json:"autoNormalize"`
-	Versioning      VersioningConfiguration     `xml:"versioning" json:"versioning"`
-	LenientMtimes   bool                        `xml:"lenientMtimes" json:"lenientMTimes"`
-	Copiers         int                         `xml:"copiers" json:"copiers"` // This defines how many files are handled concurrently.
-	Pullers         int                         `xml:"pullers" json:"pullers"` // Defines how many blocks are fetched at the same time, possibly between separate copier routines.
-	Hashers         int                         `xml:"hashers" json:"hashers"` // Less than one sets the value to the number of cores. These are CPU bound due to hashing.
+	ID              string                      `xml:"id,attr"`
+	Path            string                      `xml:"path,attr"`
+	Devices         []FolderDeviceConfiguration `xml:"device"`
+	ReadOnly        bool                        `xml:"ro,attr"`
+	RescanIntervalS int                         `xml:"rescanIntervalS,attr"`
+	IgnorePerms     bool                        `xml:"ignorePerms,attr"`
+	AutoNormalize   bool                        `xml:"autoNormalize,attr"`
+	Versioning      VersioningConfiguration     `xml:"versioning"`
+	LenientMtimes   bool                        `xml:"lenientMtimes"`
+	Copiers         int                         `xml:"copiers"` // This defines how many files are handled concurrently.
+	Pullers         int                         `xml:"pullers"` // Defines how many blocks are fetched at the same time, possibly between separate copier routines.
+	Hashers         int                         `xml:"hashers"` // Less than one sets the value to the number of cores. These are CPU bound due to hashing.

-	Invalid string `xml:"-" json:"invalid"` // Set at runtime when there is an error, not saved
+	Invalid string `xml:"-"` // Set at runtime when there is an error, not saved

 	deviceIDs []protocol.DeviceID

@@ -97,8 +97,8 @@ func (f *FolderConfiguration) DeviceIDs() []protocol.DeviceID {
 }

 type VersioningConfiguration struct {
-	Type   string            `xml:"type,attr" json:"type"`
-	Params map[string]string `json:"params"`
+	Type   string `xml:"type,attr"`
+	Params map[string]string
 }

 type InternalVersioningConfiguration struct {
@@ -138,44 +138,44 @@ func (c *VersioningConfiguration) UnmarshalXML(d *xml.Decoder, start xml.StartEl
 }

 type DeviceConfiguration struct {
-	DeviceID    protocol.DeviceID    `xml:"id,attr" json:"deviceID"`
-	Name        string               `xml:"name,attr,omitempty" json:"name"`
-	Addresses   []string             `xml:"address,omitempty" json:"addresses"`
-	Compression protocol.Compression `xml:"compression,attr" json:"compression"`
-	CertName    string               `xml:"certName,attr,omitempty" json:"certName"`
-	Introducer  bool                 `xml:"introducer,attr" json:"introducer"`
+	DeviceID    protocol.DeviceID    `xml:"id,attr"`
+	Name        string               `xml:"name,attr,omitempty"`
+	Addresses   []string             `xml:"address,omitempty"`
+	Compression protocol.Compression `xml:"compression,attr"`
+	CertName    string               `xml:"certName,attr,omitempty"`
+	Introducer  bool                 `xml:"introducer,attr"`
 }

 type FolderDeviceConfiguration struct {
-	DeviceID protocol.DeviceID `xml:"id,attr" json:"deviceID"`
+	DeviceID protocol.DeviceID `xml:"id,attr"`

 	Deprecated_Name      string   `xml:"name,attr,omitempty" json:"-"`
 	Deprecated_Addresses []string `xml:"address,omitempty" json:"-"`
 }

 type OptionsConfiguration struct {
-	ListenAddress           []string `xml:"listenAddress" json:"listenAddress" default:"0.0.0.0:22000"`
-	GlobalAnnServers        []string `xml:"globalAnnounceServer" json:"globalAnnounceServers" json:"globalAnnounceServer" default:"udp4://announce.syncthing.net:22026, udp6://announce-v6.syncthing.net:22026"`
-	GlobalAnnEnabled        bool     `xml:"globalAnnounceEnabled" json:"globalAnnounceEnabled" default:"true"`
-	LocalAnnEnabled         bool     `xml:"localAnnounceEnabled" json:"localAnnounceEnabled" default:"true"`
-	LocalAnnPort            int      `xml:"localAnnouncePort" json:"localAnnouncePort" default:"21025"`
-	LocalAnnMCAddr          string   `xml:"localAnnounceMCAddr" json:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
-	MaxSendKbps             int      `xml:"maxSendKbps" json:"maxSendKbps"`
-	MaxRecvKbps             int      `xml:"maxRecvKbps" json:"maxRecvKbps"`
-	ReconnectIntervalS      int      `xml:"reconnectionIntervalS" json:"reconnectionIntervalS" default:"60"`
-	StartBrowser            bool     `xml:"startBrowser" json:"startBrowser" default:"true"`
-	UPnPEnabled             bool     `xml:"upnpEnabled" json:"upnpEnabled" default:"true"`
-	UPnPLease               int      `xml:"upnpLeaseMinutes" json:"upnpLeaseMinutes" default:"0"`
-	UPnPRenewal             int      `xml:"upnpRenewalMinutes" json:"upnpRenewalMinutes" default:"30"`
-	URAccepted              int      `xml:"urAccepted" json:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
-	URUniqueID              string   `xml:"urUniqueID" json:"urUniqueId"` // Unique ID for reporting purposes, regenerated when UR is turned on.
-	RestartOnWakeup         bool     `xml:"restartOnWakeup" json:"restartOnWakeup" default:"true"`
-	AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" json:"autoUpgradeIntervalH" default:"12"` // 0 for off
-	KeepTemporariesH        int      `xml:"keepTemporariesH" json:"keepTemporariesH" default:"24"`         // 0 for off
-	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" json:"cacheIgnoredFiles" default:"true"`
-	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" json:"progressUpdateIntervalS" default:"5"`
-	SymlinksEnabled         bool     `xml:"symlinksEnabled" json:"symlinksEnabled" default:"true"`
-	LimitBandwidthInLan     bool     `xml:"limitBandwidthInLan" json:"limitBandwidthInLan" default:"false"`
+	ListenAddress           []string `xml:"listenAddress" default:"0.0.0.0:22000"`
+	GlobalAnnServers        []string `xml:"globalAnnounceServer" default:"udp4://announce.syncthing.net:22026, udp6://announce-v6.syncthing.net:22026"`
+	GlobalAnnEnabled        bool     `xml:"globalAnnounceEnabled" default:"true"`
+	LocalAnnEnabled         bool     `xml:"localAnnounceEnabled" default:"true"`
+	LocalAnnPort            int      `xml:"localAnnouncePort" default:"21025"`
+	LocalAnnMCAddr          string   `xml:"localAnnounceMCAddr" default:"[ff32::5222]:21026"`
+	MaxSendKbps             int      `xml:"maxSendKbps"`
+	MaxRecvKbps             int      `xml:"maxRecvKbps"`
+	ReconnectIntervalS      int      `xml:"reconnectionIntervalS" default:"60"`
+	StartBrowser            bool     `xml:"startBrowser" default:"true"`
+	UPnPEnabled             bool     `xml:"upnpEnabled" default:"true"`
+	UPnPLease               int      `xml:"upnpLeaseMinutes" default:"0"`
+	UPnPRenewal             int      `xml:"upnpRenewalMinutes" default:"30"`
+	URAccepted              int      `xml:"urAccepted"` // Accepted usage reporting version; 0 for off (undecided), -1 for off (permanently)
+	URUniqueID              string   `xml:"urUniqueID"` // Unique ID for reporting purposes, regenerated when UR is turned on.
+	RestartOnWakeup         bool     `xml:"restartOnWakeup" default:"true"`
+	AutoUpgradeIntervalH    int      `xml:"autoUpgradeIntervalH" default:"12"` // 0 for off
+	KeepTemporariesH        int      `xml:"keepTemporariesH" default:"24"`     // 0 for off
+	CacheIgnoredFiles       bool     `xml:"cacheIgnoredFiles" default:"true"`
+	ProgressUpdateIntervalS int      `xml:"progressUpdateIntervalS" default:"5"`
+	SymlinksEnabled         bool     `xml:"symlinksEnabled" default:"true"`
+	LimitBandwidthInLan     bool     `xml:"limitBandwidthInLan" default:"false"`

 	Deprecated_RescanIntervalS int    `xml:"rescanIntervalS,omitempty" json:"-"`
 	Deprecated_UREnabled       bool   `xml:"urEnabled,omitempty" json:"-"`
@@ -186,12 +186,12 @@ type OptionsConfiguration struct {
 }

 type GUIConfiguration struct {
-	Enabled  bool   `xml:"enabled,attr" json:"enabled" default:"true"`
-	Address  string `xml:"address" json:"address" default:"127.0.0.1:8080"`
-	User     string `xml:"user,omitempty" json:"user"`
-	Password string `xml:"password,omitempty" json:"password"`
-	UseTLS   bool   `xml:"tls,attr" json:"useTLS"`
-	APIKey   string `xml:"apikey,omitempty" json:"apiKey"`
+	Enabled  bool   `xml:"enabled,attr" default:"true"`
+	Address  string `xml:"address" default:"127.0.0.1:8080"`
+	User     string `xml:"user,omitempty"`
+	Password string `xml:"password,omitempty"`
+	UseTLS   bool   `xml:"tls,attr"`
+	APIKey   string `xml:"apikey,omitempty"`
 }

 func New(myID protocol.DeviceID) Configuration {
@@ -370,6 +370,11 @@ func (cfg *Configuration) prepare(myID protocol.DeviceID) {
 		}
 	}

+	// Very short reconnection intervals are annoying
+	if cfg.Options.ReconnectIntervalS < 5 {
+		cfg.Options.ReconnectIntervalS = 5
+	}
+
 	cfg.Options.ListenAddress = uniqueStrings(cfg.Options.ListenAddress)
 	cfg.Options.GlobalAnnServers = uniqueStrings(cfg.Options.GlobalAnnServers)

@@ -27,14 +27,17 @@ type Discoverer struct {
 	localBcastIntv  time.Duration
 	localBcastStart time.Time
 	cacheLifetime   time.Duration
+	negCacheCutoff  time.Duration
 	broadcastBeacon beacon.Interface
 	multicastBeacon beacon.Interface
-	registry        map[protocol.DeviceID][]CacheEntry
-	registryLock    sync.RWMutex
 	extPort         uint16
 	localBcastTick  <-chan time.Time
 	forcedBcastTick chan time.Time

+	registryLock sync.RWMutex
+	registry     map[protocol.DeviceID][]CacheEntry
+	lastLookup   map[protocol.DeviceID]time.Time
+
 	clients []Client
 	mut     sync.RWMutex
 }
@@ -54,7 +57,9 @@ func NewDiscoverer(id protocol.DeviceID, addresses []string) *Discoverer {
 		listenAddrs:    addresses,
 		localBcastIntv: 30 * time.Second,
 		cacheLifetime:  5 * time.Minute,
+		negCacheCutoff: 3 * time.Minute,
 		registry:       make(map[protocol.DeviceID][]CacheEntry),
+		lastLookup:     make(map[protocol.DeviceID]time.Time),
 	}
 }

@@ -155,18 +160,28 @@ func (d *Discoverer) ExtAnnounceOK() map[string]bool {
 func (d *Discoverer) Lookup(device protocol.DeviceID) []string {
 	d.registryLock.RLock()
 	cached := d.filterCached(d.registry[device])
+	lastLookup := d.lastLookup[device]
 	d.registryLock.RUnlock()

 	d.mut.RLock()
 	defer d.mut.RUnlock()

-	var addrs []string
 	if len(cached) > 0 {
-		addrs = make([]string, len(cached))
+		// There are cached address entries.
+		addrs := make([]string, len(cached))
 		for i := range cached {
 			addrs[i] = cached[i].Address
 		}
-	} else if len(d.clients) != 0 && time.Since(d.localBcastStart) > d.localBcastIntv {
+		return addrs
+	}
+
+	if time.Since(lastLookup) < d.negCacheCutoff {
+		// We have recently tried to lookup this address and failed. Lets
+		// chill for a while.
+		return nil
+	}
+
+	if len(d.clients) != 0 && time.Since(d.localBcastStart) > d.localBcastIntv {
 		// Only perform external lookups if we have at least one external
 		// server client and one local announcement interval has passed. This is
 		// to avoid finding local peers on their remote address at startup.
@@ -187,6 +202,7 @@ func (d *Discoverer) Lookup(device protocol.DeviceID) []string {
 		seen := make(map[string]struct{})
 		now := time.Now()

+		var addrs []string
 		for result := range results {
 			for _, addr := range result {
 				_, ok := seen[addr]
@@ -203,9 +219,13 @@ func (d *Discoverer) Lookup(device protocol.DeviceID) []string {

 		d.registryLock.Lock()
 		d.registry[device] = cached
+		d.lastLookup[device] = time.Now()
 		d.registryLock.Unlock()
+
+		return addrs
 	}
-	return addrs
+
+	return nil
 }

 func (d *Discoverer) Hint(device string, addrs []string) {
@@ -9,7 +9,6 @@ package model
 import (
 	"bufio"
 	"crypto/tls"
-	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -190,16 +189,6 @@ type ConnectionInfo struct {
 	ClientVersion string
 }

-func (info ConnectionInfo) MarshalJSON() ([]byte, error) {
-	return json.Marshal(map[string]interface{}{
-		"at":            info.At,
-		"inBytesTotal":  info.InBytesTotal,
-		"outBytesTotal": info.OutBytesTotal,
-		"address":       info.Address,
-		"clientVersion": info.ClientVersion,
-	})
-}
-
 // ConnectionStats returns a map with connection statistics for each connected device.
 func (m *Model) ConnectionStats() map[string]ConnectionInfo {
 	type remoteAddrer interface {
@@ -489,7 +489,11 @@ func (p *rwFolder) handleDir(file protocol.FileInfo) {
 		// we can pass it to InWritableDir. We use a regular Mkdir and
 		// not MkdirAll because the parent should already exist.
 		mkdir := func(path string) error {
-			return os.Mkdir(path, mode)
+			err = os.Mkdir(path, mode)
+			if err != nil || p.ignorePerms {
+				return err
+			}
+			return os.Chmod(path, mode)
 		}

 		if err = osutil.InWritableDir(mkdir, realName); err == nil {
@@ -40,14 +40,14 @@ type sharedPullerState struct {

 // A momentary state representing the progress of the puller
 type pullerProgress struct {
-	Total               int   `json:"total"`
-	Reused              int   `json:"reused"`
-	CopiedFromOrigin    int   `json:"copiedFromOrigin"`
-	CopiedFromElsewhere int   `json:"copiedFromElsewhere"`
-	Pulled              int   `json:"pulled"`
-	Pulling             int   `json:"pulling"`
-	BytesDone           int64 `json:"bytesDone"`
-	BytesTotal          int64 `json:"bytesTotal"`
+	Total               int
+	Reused              int
+	CopiedFromOrigin    int
+	CopiedFromElsewhere int
+	Pulled              int
+	Pulling             int
+	BytesDone           int64
+	BytesTotal          int64
 }

 // A lockedWriterAt synchronizes WriteAt calls with an external mutex.
@@ -111,7 +111,8 @@ func (w *Walker) walkAndHashFiles(fchan chan protocol.FileInfo) filepath.WalkFun
 		// Return value used when we are returning early and don't want to
 		// process the item. For directories, this means do-not-descend.
 		var skip error // nil
-		if info.IsDir() {
+		// info nil when error is not nil
+		if info != nil && info.IsDir() {
 			skip = filepath.SkipDir
 		}

@@ -259,6 +259,14 @@ func TestNormalization(t *testing.T) {
 	}
 }

+func TestIssue1507(t *testing.T) {
+	w := Walker{}
+	c := make(chan protocol.FileInfo, 100)
+	fn := w.walkAndHashFiles(c)
+
+	fn("", nil, protocol.ErrClosed)
+}
+
 func walkDir(dir string) ([]protocol.FileInfo, error) {
 	w := Walker{
 		Dir:           dir,
@@ -15,7 +15,7 @@ import (
 )

 type DeviceStatistics struct {
-	LastSeen time.Time `json:"lastSeen"`
+	LastSeen time.Time
 }

 type DeviceStatisticsReference struct {
@@ -14,7 +14,7 @@ import (
 )

 type FolderStatistics struct {
-	LastFile LastFile `json:"lastFile"`
+	LastFile LastFile
 }

 type FolderStatisticsReference struct {
@@ -23,8 +23,8 @@ type FolderStatisticsReference struct {
 }

 type LastFile struct {
-	At       time.Time `json:"at"`
-	Filename string    `json:"filename"`
+	At       time.Time
+	Filename string
 }

 func NewFolderStatisticsReference(ldb *leveldb.DB, folder string) *FolderStatisticsReference {
@@ -23,36 +23,70 @@ import (
 	"path"
 	"path/filepath"
 	"runtime"
+	"sort"
 	"strings"
 )

-// Returns the latest release, including prereleases or not depending on the argument
-func LatestRelease(prerelease bool) (Release, error) {
-	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=10")
+// Returns the latest releases, including prereleases or not depending on the argument
+func LatestGithubReleases(version string) ([]Release, error) {
+	resp, err := http.Get("https://api.github.com/repos/syncthing/syncthing/releases?per_page=30")
 	if err != nil {
-		return Release{}, err
+		return nil, err
 	}
 	if resp.StatusCode > 299 {
-		return Release{}, fmt.Errorf("API call returned HTTP error: %s", resp.Status)
+		return nil, fmt.Errorf("API call returned HTTP error: %s", resp.Status)
 	}

 	var rels []Release
 	json.NewDecoder(resp.Body).Decode(&rels)
 	resp.Body.Close()

+	return rels, nil
+}
+
+type SortByRelease []Release
+
+func (s SortByRelease) Len() int {
+	return len(s)
+}
+func (s SortByRelease) Swap(i, j int) {
+	s[i], s[j] = s[j], s[i]
+}
+func (s SortByRelease) Less(i, j int) bool {
+	return CompareVersions(s[i].Tag, s[j].Tag) > 0
+}
+
+func LatestRelease(version string) (Release, error) {
+	rels, _ := LatestGithubReleases(version)
+	return SelectLatestRelease(version, rels)
+}
+
+func SelectLatestRelease(version string, rels []Release) (Release, error) {
 	if len(rels) == 0 {
 		return Release{}, ErrVersionUnknown
 	}

-	if prerelease {
-		// We are a beta version. Use the latest.
-		return rels[0], nil
-	}
+	sort.Sort(SortByRelease(rels))
+	// Check for a beta build
+	beta := strings.Contains(version, "-beta")

-	// We are a regular release. Only consider non-prerelease versions for upgrade.
 	for _, rel := range rels {
-		if !rel.Prerelease {
-			return rel, nil
+		if rel.Prerelease && !beta {
+			continue
+		}
+		for _, asset := range rel.Assets {
+			assetName := path.Base(asset.Name)
+			// Check for the architecture
+			expectedRelease := releaseName(rel.Tag)
+			if debug {
+				l.Debugf("expected release asset %q", expectedRelease)
+			}
+			if debug {
+				l.Debugln("considering release", assetName)
+			}
+			if strings.HasPrefix(assetName, expectedRelease) {
+				return rel, nil
+			}
 		}
 	}
 	return Release{}, ErrVersionUnknown
@@ -4,11 +4,17 @@
 // License, v. 2.0. If a copy of the MPL was not distributed with this file,
 // You can obtain one at http://mozilla.org/MPL/2.0/.

+// +build !noupgrade
+
 package upgrade

-import "testing"
+import (
+	"encoding/json"
+	"os"
+	"testing"
+)

-var testcases = []struct {
+var versions = []struct {
 	a, b string
 	r    Relation
 }{
@@ -27,6 +33,7 @@ var testcases = []struct {
 	{"0.10.0", "0.2.0", MajorNewer},
 	{"30.10.0", "4.9.0", MajorNewer},
 	{"0.9.0-beta7", "0.9.0-beta6", Newer},
+	{"0.9.0-beta7", "1.0.0-alpha", MajorOlder},
 	{"1.0.0-alpha", "1.0.0-alpha.1", Older},
 	{"1.0.0-alpha.1", "1.0.0-alpha.beta", Older},
 	{"1.0.0-alpha.beta", "1.0.0-beta", Older},
@@ -44,9 +51,46 @@ var testcases = []struct {
 }

 func TestCompareVersions(t *testing.T) {
-	for _, tc := range testcases {
-		if r := CompareVersions(tc.a, tc.b); r != tc.r {
-			t.Errorf("compareVersions(%q, %q): %d != %d", tc.a, tc.b, r, tc.r)
+	for _, v := range versions {
+		if r := CompareVersions(v.a, v.b); r != v.r {
+			t.Errorf("compareVersions(%q, %q): %d != %d", v.a, v.b, r, v.r)
 		}
 	}
 }
+
+var upgrades = map[string]string{
+	"v0.10.21":                        "v0.10.30",
+	"v0.10.29":                        "v0.10.30",
+	"v0.10.31":                        "v0.10.30",
+	"v0.10.0-alpha":                   "v0.10.30",
+	"v0.10.0-beta":                    "v0.11.0-beta0",
+	"v0.11.0-beta0+40-g53cb66e-dirty": "v0.11.0-beta0",
+}
+
+func TestGithubRelease(t *testing.T) {
+	fd, err := os.Open("testdata/github-releases.json")
+	if err != nil {
+		t.Errorf("Missing github-release test data")
+	}
+	defer fd.Close()
+
+	var rels []Release
+	json.NewDecoder(fd).Decode(&rels)
+
+	for old, target := range upgrades {
+		upgrade, err := SelectLatestRelease(old, rels)
+		if err != nil {
+			t.Error("Error retrieving latest version", err)
+		}
+		if upgrade.Tag != target {
+			t.Errorf("Invalid upgrade release: %v -> %v, but got %v", old, target, upgrade.Tag)
+		}
+	}
+}
+
+func TestErrorRelease(t *testing.T) {
+	_, err := SelectLatestRelease("v0.11.0-beta", nil)
+	if err == nil {
+		t.Error("Should return an error when no release were available")
+	}
+}
@@ -16,6 +16,6 @@ func upgradeToURL(binary, url string) error {
 	return ErrUpgradeUnsupported
 }

-func LatestRelease(prerelease bool) (Release, error) {
+func LatestRelease(version string) (Release, error) {
 	return Release{}, ErrUpgradeUnsupported
 }
@@ -1,89 +0,0 @@
-// Copyright (C) 2015 The Syncthing Authors.
-//
-// This Source Code Form is subject to the terms of the Mozilla Public
-// License, v. 2.0. If a copy of the MPL was not distributed with this file,
-// You can obtain one at http://mozilla.org/MPL/2.0/.
-
-package versioner
-
-import (
-	"errors"
-	"os"
-	"os/exec"
-	"path/filepath"
-	"strings"
-)
-
-func init() {
-	// Register the constructor for this type of versioner with the name "external"
-	Factories["external"] = NewExternal
-}
-
-// The type holds our configuration
-type External struct {
-	command    string
-	folderPath string
-}
-
-// The constructor function takes a map of parameters and creates the type.
-func NewExternal(folderID, folderPath string, params map[string]string) Versioner {
-	command := params["command"]
-
-	s := External{
-		command:    command,
-		folderPath: folderPath,
-	}
-
-	if debug {
-		l.Debugf("instantiated %#v", s)
-	}
-	return s
-}
-
-// Move away the named file to a version archive. If this function returns
-// nil, the named file does not exist any more (has been archived).
-func (v External) Archive(filePath string) error {
-	_, err := os.Lstat(filePath)
-	if os.IsNotExist(err) {
-		if debug {
-			l.Debugln("not archiving nonexistent file", filePath)
-		}
-		return nil
-	} else if err != nil {
-		return err
-	}
-
-	if debug {
-		l.Debugln("archiving", filePath)
-	}
-
-	inFolderPath, err := filepath.Rel(v.folderPath, filePath)
-	if err != nil {
-		return err
-	}
-
-	if v.command == "" {
-		return errors.New("Versioner: command is empty, please enter a valid command")
-	}
-
-	cmd := exec.Command(v.command, v.folderPath, inFolderPath)
-	env := os.Environ()
-	// filter STGUIAUTH and STGUIAPIKEY from environment variables
-	filteredEnv := []string{}
-	for _, x := range env {
-		if !strings.HasPrefix(x, "STGUIAUTH=") && !strings.HasPrefix(x, "STGUIAPIKEY=") {
-			filteredEnv = append(filteredEnv, x)
-		}
-	}
-	cmd.Env = filteredEnv
-	err = cmd.Run()
-	if err != nil {
-		return err
-	}
-
-	// return error if the file was not removed
-	if _, err = os.Lstat(filePath); os.IsNotExist(err) {
-		return nil
-	}
-	return errors.New("Versioner: file was not removed by external script")
-}
@@ -47,12 +47,13 @@ func NewSimple(folderID, folderPath string, params map[string]string) Versioner
 // nil, the named file does not exist any more (has been archived).
 func (v Simple) Archive(filePath string) error {
 	fileInfo, err := os.Lstat(filePath)
-	if os.IsNotExist(err) {
-		if debug {
-			l.Debugln("not archiving nonexistent file", filePath)
+	if err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("not archiving nonexistent file", filePath)
+			}
+			return nil
 		}
-		return nil
-	} else if err != nil {
 		return err
 	}

@@ -281,13 +281,13 @@ func (v Staggered) Archive(filePath string) error {
 	v.mutex.Lock()
 	defer v.mutex.Unlock()

-	_, err := os.Lstat(filePath)
-	if os.IsNotExist(err) {
-		if debug {
-			l.Debugln("not archiving nonexistent file", filePath)
+	if _, err := os.Lstat(filePath); err != nil {
+		if os.IsNotExist(err) {
+			if debug {
+				l.Debugln("not archiving nonexistent file", filePath)
+			}
+			return nil
 		}
-		return nil
-	} else if err != nil {
 		return err
 	}
Author	SHA1	Message	Date
Audrius Butkevicius	2470875d14	Merge pull request #1681 from calmh/major-upgrade Allow major upgrades [v0.10]	2015-04-22 14:11:18 +01:00
Jakob Borg	930e90289f	Backport the v0.11 upgrade system	2015-04-22 21:27:13 +09:00
Jakob Borg	bf959a77e2	Allow major upgrade (fixes #1680 )	2015-04-22 21:22:16 +09:00
Jakob Borg	3cc4cb0a0b	Translation update	2015-03-29 09:46:44 +02:00
Jakob Borg	e6cba61740	Don't allow arbitrarily short reconnection intervals (fixes #1524 )	2015-03-29 09:44:20 +02:00
Jakob Borg	cd7ce73f59	Add negative cache time to global discovery This reduces the amount of external queries by not repeating a query for a given address if we have failed within the last three minutes.	2015-03-26 08:43:55 +01:00
KAMADA Ken'ichiandJakob Borg	fab4e33c58	Preserve the permission of a newly created directory We need an explicit chmod() when creating a new directory. Otherwise a new directory may be created with a different permission from the one received from an originating device, because the umask is applied to the mode given to mkdir(). The incorrect permission is later sent back to the originating device and the original permission will be lost.	2015-03-26 08:43:16 +01:00
Audrius ButkeviciusandJakob Borg	b79b13a75b	Configure location provider	2015-03-26 08:43:06 +01:00
Audrius Butkevicius	c294d5f087	Fix crash on walker error (fixes #1507 )	2015-03-22 14:09:14 +00:00
Jakob Borg	10ead2e61f	Send correct MIME type for SVG images (fixes #1506 )	2015-03-22 12:56:50 +01:00
Jakob Borg	960b40fa89	Translation update	2015-03-22 10:34:45 +01:00
Stefan TatschnerandJakob Borg	afad329e99	systemd: Set -logflags to 0, provide -no-browser flag Syncthing should not try to start a browser when invoked by systemd. Furthermore we do not need any timestamps in the journal as systemd already handles this for us.	2015-03-22 10:26:53 +01:00
Jakob Borg	4025284fba	Update integration test configs to v10	2015-03-22 10:26:53 +01:00
Jakob Borg	a595e814dd	Set defaults correctly for autoNormalize The default:"foo" struct tags aren't actually used for folder configs.	2015-03-22 10:26:51 +01:00
Alexander GrafandJakob Borg	963d8121d9	use Lstat instead of Stat to prevent errors with symlinks	2015-03-22 08:48:37 +01:00
Audrius ButkeviciusandJakob Borg	03019988b1	Skip unspecified IPs	2015-03-22 08:48:37 +01:00
Audrius ButkeviciusandJakob Borg	97115afa32	Print LANs on startup	2015-03-22 08:48:37 +01:00
Jakob Borg	c9f5bae177	Decide once and for all to return filepath.SkipDir or nil	2015-03-22 08:47:36 +01:00
Jakob Borg	2bd11ca4e3	Automatically fix file name normalization errors (fixes #430 )	2015-03-22 08:47:34 +01:00
Jakob Borg	a5de1acb46	Use SVG format logos	2015-03-22 08:46:54 +01:00
Jakob Borg	5581751e9d	Rename files to match type names	2015-03-22 08:46:43 +01:00
Jakob Borg	055ae92273	Refactor state tracking (...) Move state tracking into the puller/scanner objects. This is a first step towards resolving #1391. Rename Puller and Scanner to roFolder and rwFolder as they have more duties than just pulling and scanning, and don't need to be exported.	2015-03-22 08:46:43 +01:00
Audrius ButkeviciusandJakob Borg	dea7c77055	Rebuild assets	2015-03-22 08:46:41 +01:00
Audrius ButkeviciusandJakob Borg	765dda6ad7	Fix build	2015-03-22 08:46:26 +01:00
Jakob Borg	28702a1c9d	Add /rest/filestatus	2015-03-22 08:46:26 +01:00
Jakob Borg	40d1226612	MPLv2	2015-03-22 08:46:25 +01:00
Johan VromansandJakob Borg	effe8ce8a9	Suppress 'Last File Received' if a node is folder master (fixes #1472 )	2015-03-22 08:46:24 +01:00
Jakob Borg	4c3ba24826	Add sciurius	2015-03-22 08:45:42 +01:00