diff --git a/BuildTools/UpdateVersionStamp/Program.cs b/BuildTools/UpdateVersionStamp/Program.cs index 076d36570..527993703 100644 --- a/BuildTools/UpdateVersionStamp/Program.cs +++ b/BuildTools/UpdateVersionStamp/Program.cs @@ -19,6 +19,9 @@ namespace UpdateVersionStamp FILEMAP.Add("AssemblyInfo.cs", new Regex(@"(\[assembly\: AssemblyVersion\(\""" + versionre + @"""\)\])|(\[assembly\: AssemblyFileVersion\(\""" + versionre + @"\""\)\])|(\[assembly\: AssemblyFileVersionAttribute\(\""" + versionre + @"\""\)\])")); FILEMAP.Add("UpgradeData.wxi", new Regex(@"\<\?define ProductVersion\=\""" + versionre + @"\"" \?\>")); FILEMAP.Add("AssemblyRedirects.xml", new Regex(@"newVersion\=\""" + versionre + @"\""")); + FILEMAP.Add("index.html", new Regex(@"\?v\=" + versionre)); + FILEMAP.Add("login.html", new Regex(@"\?v\=" + versionre)); + FILEMAP.Add("app.js", new Regex(@"\?v\=" + versionre)); } private class Options diff --git a/Duplicati/Server/webroot/index.html b/Duplicati/Server/webroot/index.html index 97cb90499..7fb82b716 100644 --- a/Duplicati/Server/webroot/index.html +++ b/Duplicati/Server/webroot/index.html @@ -48,8 +48,8 @@ - - + + diff --git a/Duplicati/Server/webroot/login.html b/Duplicati/Server/webroot/login.html index 42e3d1c42..763b17efe 100644 --- a/Duplicati/Server/webroot/login.html +++ b/Duplicati/Server/webroot/login.html @@ -8,11 +8,11 @@ - - + + - - + + diff --git a/Duplicati/Server/webroot/ngax/index.html b/Duplicati/Server/webroot/ngax/index.html index 11b8d3389..9b3817296 100755 --- a/Duplicati/Server/webroot/ngax/index.html +++ b/Duplicati/Server/webroot/ngax/index.html @@ -26,10 +26,10 @@ - - - - + + + + @@ -56,70 +56,70 @@ - - + + - + - - - - - - - - - - - - + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - - - + + + diff --git a/Duplicati/Server/webroot/ngax/scripts/app.js b/Duplicati/Server/webroot/ngax/scripts/app.js index 6f6a05cb0..42c224dab 100644 --- a/Duplicati/Server/webroot/ngax/scripts/app.js +++ b/Duplicati/Server/webroot/ngax/scripts/app.js @@ -11,80 +11,80 @@ var backupApp = angular.module( ); backupApp.constant('appConfig', { - login_url: '/login.html' + login_url: '/login.html?v=2.0.0.7' }); backupApp.config(['$routeProvider', function($routeProvider) { $routeProvider. when('/home', { - templateUrl: 'templates/home.html' + templateUrl: 'templates/home.html?v=2.0.0.7' }). when('/add', { - templateUrl: 'templates/addoredit.html' + templateUrl: 'templates/addoredit.html?v=2.0.0.7' }). when('/add-import', { - templateUrl: 'templates/addoredit.html' + templateUrl: 'templates/addoredit.html?v=2.0.0.7' }). when('/restorestart', { - templateUrl: 'templates/restorewizard.html' + templateUrl: 'templates/restorewizard.html?v=2.0.0.7' }). when('/addstart', { - templateUrl: 'templates/addwizard.html' + templateUrl: 'templates/addwizard.html?v=2.0.0.7' }). when('/edit/:backupid', { - templateUrl: 'templates/addoredit.html' + templateUrl: 'templates/addoredit.html?v=2.0.0.7' }). when('/restoredirect', { - templateUrl: 'templates/restoredirect.html' + templateUrl: 'templates/restoredirect.html?v=2.0.0.7' }). when('/restoredirect-import', { - templateUrl: 'templates/restoredirect.html' + templateUrl: 'templates/restoredirect.html?v=2.0.0.7' }). when('/restore/:backupid', { - templateUrl: 'templates/restore.html' + templateUrl: 'templates/restore.html?v=2.0.0.7' }). when('/settings', { - templateUrl: 'templates/settings.html' + templateUrl: 'templates/settings.html?v=2.0.0.7' }). when('/about', { - templateUrl: 'templates/about.html' + templateUrl: 'templates/about.html?v=2.0.0.7' }). when('/delete/:backupid', { - templateUrl: 'templates/delete.html' + templateUrl: 'templates/delete.html?v=2.0.0.7' }). when('/log/:backupid', { - templateUrl: 'templates/log.html' + templateUrl: 'templates/log.html?v=2.0.0.7' }). when('/log', { - templateUrl: 'templates/log.html' + templateUrl: 'templates/log.html?v=2.0.0.7' }). when('/updatechangelog', { - templateUrl: 'templates/updatechangelog.html' + templateUrl: 'templates/updatechangelog.html?v=2.0.0.7' }). when('/export/:backupid', { - templateUrl: 'templates/export.html' + templateUrl: 'templates/export.html?v=2.0.0.7' }). when('/import', { - templateUrl: 'templates/import.html' + templateUrl: 'templates/import.html?v=2.0.0.7' }). when('/restore-import', { - templateUrl: 'templates/import.html' + templateUrl: 'templates/import.html?v=2.0.0.7' }). when('/localdb/:backupid', { - templateUrl: 'templates/localdatabase.html' + templateUrl: 'templates/localdatabase.html?v=2.0.0.7' }). when('/commandline', { - templateUrl: 'templates/commandline.html' + templateUrl: 'templates/commandline.html?v=2.0.0.7' }). when('/commandline/:backupid', { - templateUrl: 'templates/commandline.html' + templateUrl: 'templates/commandline.html?v=2.0.0.7' }). when('/commandline/view/:viewid', { - templateUrl: 'templates/commandline.html' + templateUrl: 'templates/commandline.html?v=2.0.0.7' }). otherwise({ - templateUrl: 'templates/home.html' + templateUrl: 'templates/home.html?v=2.0.0.7' //redirectTo: '/home' }); }]);