v8.3.1 - Release Files

KevinJump · Dec 10, 2019 · 5df3600 · 5df3600
1 parent 9a4f0d8
commit 5df3600
Show file tree

Hide file tree

Showing 7 changed files with 21 additions and 13 deletions.
diff --git a/Dist/8.3.1/uSync.ContentEdition_8.3.1.zip b/Dist/8.3.1/uSync.ContentEdition_8.3.1.zip
diff --git a/Dist/8.3.1/uSync_8.3.1.zip b/Dist/8.3.1/uSync_8.3.1.zip
diff --git a/Dist/package.cmd b/Dist/package.cmd
@@ -6,6 +6,7 @@ nuget pack ..\uSync8.BackOffice\uSync.nuspec -build  -OutputDirectory %1 -versio
 nuget pack ..\uSync8.BackOffice\uSync.BackOffice.Core.nuspec -build  -OutputDirectory %1 -version %1 -properties "depends=%1;Configuration=release"
 nuget pack ..\uSync8.Community.Contrib\uSync.Community.Contrib.nuspec  -OutputDirectory %1 -build -version %1 -properties "depends=%1;Configuration=release"
 nuget pack ..\uSync8.ContentEdition\uSync.ContentEdition.nuspec  -OutputDirectory %1 -build -version %1 -properties "depends=%1;Configuration=release"
+nuget pack ..\uSync8.ContentEdition\uSync.ContentEdition.Core.nuspec  -OutputDirectory %1 -build -version %1 -properties "depends=%1;Configuration=release"
 
 call CreatePackages %1
 

diff --git a/uSync8.Site/App_Plugins/uSync8/changeDialog.html b/uSync8.Site/App_Plugins/uSync8/changeDialog.html
@@ -61,6 +61,13 @@ <h4>No Changes detected</h4>
                                 is processed.
                             </p>
                         </div>
+
+                        <div ng-if="vm.item.Change == 'Create'" class="alert alert-success">
+                            <h4>Create</h4>
+                            <p>
+                                This item doesn't currently exist, and will be created on import.
+                            </p>
+                        </div>
                     </umb-box-content>
                 </umb-box-container>
             </umb-box>

diff --git a/uSync8.Site/App_Plugins/uSync8/package.manifest b/uSync8.Site/App_Plugins/uSync8/package.manifest
@@ -1,19 +1,19 @@
 {
   "javascript": [
-    "~/app_plugins/uSync8/backoffice/uSync8/uSyncDashboardController.js",
-    "~/app_plugins/uSync8/settings/settingsController.js",
-    "~/app_plugins/uSync8/settings/expansionController.js",
-    "~/app_plugins/uSync8/settings/uSyncController.js",
+    "~/App_Plugins/uSync8/backoffice/uSync8/uSyncDashboardController.js?",
+    "~/App_Plugins/uSync8/settings/settingsController.js",
+    "~/App_Plugins/uSync8/settings/expansionController.js",
+    "~/App_Plugins/uSync8/settings/uSyncController.js",
 
-    "~/app_plugins/uSync8/uSyncService.js",
-    "~/app_plugins/uSync8/uSyncHub.js",
-    "~/app_plugins/uSync8/changeDialogController.js",
+    "~/App_Plugins/uSync8/uSyncService.js",
+    "~/App_Plugins/uSync8/uSyncHub.js",
+    "~/App_Plugins/uSync8/changeDialogController.js",
 
-    "~/app_plugins/uSync8/components/uSyncReportViewComponent.js",
-    "~/app_plugins/uSync8/components/uSyncProgressViewComponent.js"
+    "~/App_Plugins/uSync8/components/uSyncReportViewComponent.js",
+    "~/App_Plugins/uSync8/components/uSyncProgressViewComponent.js"
   ],
   "css": [
-    "~/app_plugins/uSync8/usync.css"
+    "~/App_Plugins/uSync8/usync.css"
   ],
 
 }
diff --git a/uSync8.Site/App_Plugins/uSync8/settings/settings.html b/uSync8.Site/App_Plugins/uSync8/settings/settings.html
@@ -45,7 +45,7 @@
                         </div>
                     </div>
 
-                    <div class="umb-permission">
+                    <div class="umb-permission" ng-if="vm.umbracoVersion < '8.4.0'">
                         <umb-toggle class="umb-permission__toggle"
                                     checked="vm.settings.RebuildCacheOnCompletion"
                                     on-click="vm.settings.RebuildCacheOnCompletion = !vm.settings.RebuildCacheOnCompletion">
@@ -55,8 +55,6 @@
                             <div class="umb-permission__description">Request that Umbraco rebuilds its cache after an import</div>
                         </div>
                     </div>
-
-
                 </umb-box-content>
             </umb-box>
 

diff --git a/uSync8.Site/App_Plugins/uSync8/settings/settingsController.js b/uSync8.Site/App_Plugins/uSync8/settings/settingsController.js
@@ -9,6 +9,8 @@
         vm.working = false; 
         vm.loading = true; 
 
+        vm.umbracoVersion = Umbraco.Sys.ServerVariables.application.version;
+
         vm.saveSettings = saveSettings;
 
         init();