Skip to content

Commit

Permalink
Merge pull request #17 from NikRimington/dev-v8
Browse files Browse the repository at this point in the history 
Dev v8
  • Loading branch information
@NikRimington
NikRimington authored Sep 26, 2019
2 parents e7adf5a + 25b91df commit 5f6d30c
Show file tree
Hide file tree
Showing 5,621 changed files with 20,372 additions and 663,637 deletions.
The diff you're trying to view is too large. We only load the first 3000 changed files.
7 changes: 5 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
*.suo
*.user
*.sln.docstates
*.vs/*

# Build results
[Dd]ebug/
Expand Down Expand Up @@ -100,5 +101,7 @@ www/App_Data/umbraco.config
!/BuildPackages/Tools/MSBuildNugetTasks/*
!/BuildPackages/Tools/MSBuildUmbracoTasks/*

TestSite/App_Data/Logs/
TestSite/App_Data/cache/
v8TestSite/App_Data/Logs/
v8TestSite/App_Data/cache/
v8TestSite/Umbraco/**/*

2 changes: 2 additions & 0 deletions BuildPackages/Package.build.v14.cmd
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
nuget restore ../PageNotFoundManager.sln
"C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Current\Bin\MSBuild.exe" Package.build.xml -tv:Current /p:VisualStudioVersion=14.0
10 changes: 5 additions & 5 deletions BuildPackages/Package.build.xml
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" DefaultTargets="Package" ToolsVersion="14.0">

<!-- IMPORTS -->
<PropertyGroup>
Expand All @@ -16,7 +16,7 @@
<!-- SHARED PROPERTIES -->
<PropertyGroup>
<PackageName>Umbraco Page Not Found Manager</PackageName>
<MinUmbracoVersion>7.3.0</MinUmbracoVersion>
<MinUmbracoVersion>8.1.0</MinUmbracoVersion>
<Readme>Easiliy manage your sites 404 pages from the content context menu</Readme>
<AuthorName>Tim Geyssens</AuthorName>
<AuthorUrl>http://nibble.be</AuthorUrl>
Expand All @@ -40,11 +40,11 @@


<PropertyGroup>
<VersionMajor>1</VersionMajor>
<VersionMinor>9</VersionMinor>
<VersionMajor>2</VersionMajor>
<VersionMinor>0</VersionMinor>
<VersionPatch>0</VersionPatch>
<VersionSuffix></VersionSuffix>
<UmbracoVersion>7.3.0</UmbracoVersion>
<UmbracoVersion>8.1.0</UmbracoVersion>
</PropertyGroup>

<PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions BuildPackages/Package.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
<license url="http://www.opensource.org/licenses/mit-license.php">MIT license</license>
<url>http://nibble.be</url>
<requirements>
<major>7</major>
<minor>3</minor>
<major>8</major>
<minor>1</minor>
<patch>0</patch>
</requirements>
</package>
Expand Down
2 changes: 1 addition & 1 deletion BuildPackages/Tools/MSBuildNugetTasks/MSBuild.NuGet.Tasks.Targets
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8" ?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">

<PropertyGroup>
<MSBuildNuGetTasksPath Condition="'$(MSBuildNuGetTasksPath)' == ''">$(MSBuildProjectDirectory)\MSBuildTasks</MSBuildNuGetTasksPath>
Expand Down
Binary file modified BuildPackages/Tools/NuGet.exe
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion BuildPackages/package.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<language></language>
<tags></tags>
<dependencies>
<dependency id="UmbracoCms" version="7.3.0" />
<dependency id="UmbracoCms" version="8.1.0" />
</dependencies>
</metadata>
</package>
5 changes: 5 additions & 0 deletions BuildPackages/readme.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,9 @@

This package is proudly presented to you by Tim Geyssens
http://nibble.be - Umbraco Developer

Version 2.0.0 additional contributors

Nik Rimington
Matthew Wise

19 changes: 11 additions & 8 deletions PageNotFoundManager.sln
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.40629.0
# Visual Studio Version 16
VisualStudioVersion = 16.0.29306.81
MinimumVisualStudioVersion = 10.0.40219.1
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PageNotFoundManager", "PageNotFoundManager\PageNotFoundManager.csproj", "{2F1494AC-E9FA-463D-8658-1E66D40B6E97}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestSite", "TestSite\TestSite.csproj", "{A2FEF370-73C4-453C-AAAD-ACC255E29C26}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{2E0D3FFB-8D06-499B-9D55-48DFA927B4CF}"
ProjectSection(SolutionItems) = preProject
.nuget\NuGet.Config = .nuget\NuGet.Config
Expand All @@ -23,6 +21,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "BuildPackage", "BuildPackag
BuildPackages\web.config.install.xdt = BuildPackages\web.config.install.xdt
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "V8TestSite", "V8TestSite\V8TestSite.csproj", "{B31D293A-414B-4AB9-BF37-B6BDF0DFDF30}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -33,12 +33,15 @@ Global
{2F1494AC-E9FA-463D-8658-1E66D40B6E97}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2F1494AC-E9FA-463D-8658-1E66D40B6E97}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2F1494AC-E9FA-463D-8658-1E66D40B6E97}.Release|Any CPU.Build.0 = Release|Any CPU
{A2FEF370-73C4-453C-AAAD-ACC255E29C26}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{A2FEF370-73C4-453C-AAAD-ACC255E29C26}.Debug|Any CPU.Build.0 = Debug|Any CPU
{A2FEF370-73C4-453C-AAAD-ACC255E29C26}.Release|Any CPU.ActiveCfg = Release|Any CPU
{A2FEF370-73C4-453C-AAAD-ACC255E29C26}.Release|Any CPU.Build.0 = Release|Any CPU
{B31D293A-414B-4AB9-BF37-B6BDF0DFDF30}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{B31D293A-414B-4AB9-BF37-B6BDF0DFDF30}.Debug|Any CPU.Build.0 = Debug|Any CPU
{B31D293A-414B-4AB9-BF37-B6BDF0DFDF30}.Release|Any CPU.ActiveCfg = Release|Any CPU
{B31D293A-414B-4AB9-BF37-B6BDF0DFDF30}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {C3695346-DA67-4037-88CA-457B58E92F36}
EndGlobalSection
EndGlobal
50 changes: 50 additions & 0 deletions PageNotFoundManager/App_Data/NuGetBackup/20190913-203239/CopyLogs/UmbracoBinBackup.log
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@

-------------------------------------------------------------------------------
ROBOCOPY :: Robust File Copy for Windows
-------------------------------------------------------------------------------

Started : 13 September 2019 20:32:39
Source : C:\_coding\PageNotFoundManager\PageNotFoundManager\bin\
Dest : C:\_coding\PageNotFoundManager\PageNotFoundManager\App_Data\NuGetBackup\20190913-203239\bin\

Files : *.*

Options : *.* /S /E /DCOPY:DA /COPY:DAT /R:1000000 /W:30

------------------------------------------------------------------------------

20 C:\_coding\PageNotFoundManager\PageNotFoundManager\bin\
New File 118784 businesslogic.dll 0% 100%
New File 483328 cms.dll 0% 27% 54% 81% 100%
New File 51712 controls.dll 0% 100%
New File 24576 interfaces.dll 0% 100%
New File 258048 log4net.dll 0% 50% 100%
New File 11264 Microsoft.ApplicationBlocks.Data.dll 0% 100%
New File 504320 Newtonsoft.Json.dll 0% 25% 51% 77% 100%
New File 19968 SQLCE4Umbraco.dll 0% 100%
New File 465248 System.Data.SqlServerCe.dll 0% 28% 56% 84% 100%
New File 239968 System.Data.SqlServerCe.Entity.dll 0% 54% 100%
New File 192512 TidyNet.dll 0% 68% 100%
New File 2.2 m Umbraco.Core.dll 0% 21% 43% 65% 87% 100%
New File 38400 umbraco.DataLayer.dll 0% 100%
New File 1.9 m umbraco.dll 0% 12% 25% 38% 50% 63% 76% 89% 100%
New File 372736 umbraco.editorControls.dll 0% 35% 70% 100%
New File 131584 umbraco.MacroEngines.dll 0% 99% 100%
New File 38400 umbraco.providers.dll 0% 100%
New File 61440 Umbraco.Web.UI.dll 0% 100%
New File 57856 UmbracoExamine.dll 0% 100%
New File 22528 UrlRewritingNet.UrlRewriter.dll 0% 100%

------------------------------------------------------------------------------

Total Copied Skipped Mismatch FAILED Extras
Dirs : 1 0 1 0 0 0
Files : 20 20 0 0 0 0
Bytes : 7.19 m 7.19 m 0 0 0 0
Times : 0:00:00 0:00:00 0:00:00 0:00:00


Speed : 65074206 Bytes/sec.
Speed : 3723.575 MegaBytes/min.
Ended : 13 September 2019 20:32:39

Expand Down
82 changes: 47 additions & 35 deletions PageNotFoundManager/App_Plugins/PageNotFoundManager/Backoffice/Dialogs/dialog.html
View file
Original file line number Diff line number Diff line change
@@ -1,43 +1,46 @@
<div ng-controller="PageNotFoundManager.Dialog.Controller">
<div class="umb-dialog-body form-horizontal">
<div class="umb-pane">
<div ng-controller="PageNotFoundManager.Dialog.Controller as vm">
<div class="umb-dialog-body" ng-cloak>
<div class="umb-pane" ng-show="vm.busy || !vm.loaded">
<p class="abstract">
Choose the 404 page for <strong>{{currentNode.name}}</strong> and child pages
</p>
<umb-load-indicator></umb-load-indicator>
</div>
<div class="umb-pane" ng-hide="!vm.loaded">

<div ng-show="error">
<div class="alert alert-error">
<div><strong>{{error.errorMsg}}</strong></div>
<div>{{error.data.message}}</div>
</div>
</div>

<div ng-show="success">
<div class="alert alert-success">
<strong>{{target.name}}</strong> is set as the 404 page for
<strong>{{currentNode.name}}</strong> and it's child pages
</div>
<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
</div>

<p class="abstract" ng-hide="success">
Choose the 404 page for <strong>{{currentNode.name}}</strong> and child pages
</p>

<div ng-if ="pageNotFoundNode">
<div ng-if="pageNotFoundNode">
<ul class="unstyled list-icons">
<li>
<i class="icon {{pageNotFoundNode.icon}} hover-hide"></i>

<a href prevent-default ng-click="clear()">{{pageNotFoundNode.name}}</a>
<a>{{pageNotFoundNode.name}}</a>
<a ng-click="clear()"><i class="icon red icon-delete"></i></a>
</li>
</ul>
</div>


<div class="umb-loader-wrapper" ng-show="busy">
<div class="umb-loader"></div>
</div>

<div class="alert alert-error" ng-show="error">
<h4>{{error.errorMsg}}</h4>
<p>{{error.data.Message}}</p>
</div>

<div class="alert alert-success" ng-show="success">
<p>
<strong>{{target.name}}</strong> is set as the 404 page for
<strong>{{currentNode.name}}</strong> and it's child pages
</p>

<button class="btn btn-primary" ng-click="nav.hideDialog()">Ok</button>
</div>

<div ng-if="!pageNotFoundNode">

<div ng-hide="success">

<div ng-hide="pageNotFoundNode || success">
<div ng-hide="miniListView">
<umb-tree-search-box hide-search-callback="hideSearch"
search-callback="onSearchResults"
search-from-id="{{searchInfo.searchFromId}}"
Expand All @@ -55,25 +58,34 @@ <h4>{{error.errorMsg}}</h4>

<div ng-hide="searchInfo.showSearch">
<umb-tree section="content"
hideheader="true"
hideheader="{{treeModel.hideHeader}}"
hideoptions="true"
isdialog="true"
eventhandler="dialogTreeEventHandler"
api="dialogTreeApi"
on-init="onTreeInit()"
enablelistviewexpand="true"
enablecheckboxes="true">
</umb-tree>
</div>
</div>
</div>

<umb-mini-list-view ng-if="miniListView"
node="miniListView"
entity-type="Document"
on-select="selectListViewNode(node)"
on-close="closeMiniListView()">
</umb-mini-list-view>

</div>
</div>
</div>

<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success">
<a class="btn btn-link" ng-click="nav.hideDialog()" ng-if="!busy">
<div class="umb-dialog-footer btn-toolbar umb-btn-toolbar" ng-hide="success || busy">
<a class="btn btn-link" ng-click="nav.hideDialog()">
<localize key="general_cancel">Cancel</localize>
</a>
<button class="btn btn-primary" ng-click="setNotFoundPage()" ng-disabled="busy">
<button class="btn btn-primary" ng-click="setNotFoundPage()">
<localize key="general_ok">OK</localize>
</button>
</div>

</div>
</div>
4 changes: 0 additions & 4 deletions PageNotFoundManager/App_Plugins/PageNotFoundManager/PageNotFoundManager.config
View file

This file was deleted.

Loading

0 comments on commit 5f6d30c

Please sign in to comment.