diff --git a/docs/UpgradeReadme.txt b/docs/UpgradeReadme.txt deleted file mode 100644 index 189b5184f9..0000000000 --- a/docs/UpgradeReadme.txt +++ /dev/null @@ -1,65 +0,0 @@ -* //TODO: All removed files will be in the umbraco.Legacy project unless otherwise noted - -* DataType: 'editor' removed (editor.cs) -* removed WysiwygDataType.cs - -* Many files have been removed but a zip file containing all removed files has been supplied - -* Remove umbraco.controls.helper.cs? - -* Any packages that have pages containing Umbraco Controls should now have a -DependencyLoader registered on them, otherwise the controls will not down register client files -to be downlaoded (perhaps theres a better way to implement this... (i.e. check if a DependencyLoader -exists in the current context, and if it doesn't it registers the scripts?) - -* Umbraco_Client folder path needs to be specified in AppSettings - -* The old TinyMCE was not upgraded to use ClientDependency but it's paths have been changed -to use the UmbracoClientPath setting - -* removed CheckBoxTree.cs [permanently!, not in legacy package] -* removed windowCloser.cs - -* All references to the old Client Dependency libraries have been removed completely. - -* Moved treeIcons.css to ~/[UmbracoClientFolder]/Tree/treeIcons.css - -* Removed all IFormHandler dependencies and therefore removed the idea of FormHandlers all together: -- IFormHandler -- /umbraco/formhandler.cs -- StandardFormHandlers - -* So far only minor database upgrade (not structure just data) - -* Moved all old TinyMCE supporting files to legacy project -* Moved all old TinyMCE code files (that are not used to legacy project) -* Moved all old TinyMCE plugins to legacy project - -* Moved jquery-fieldselection.js to umbraco_client/Application/jQuery - -* Removed old internal indexer/searcher/SearchItem -* Removed OnBeforeIndexing, OnAfterIndexing, AddToIndexEventArgs, IndexEventHandler, BeforeAddToIndex, -FireBeforeAddToIndex, AfterAddToIndex, FireAfterAddToIndex, Document.Index - -* Removed /umbraco/dashboard/webService.cs as it wasn't doing anything -* Removed /umbraco/dashboard/search.aspx as this is an old handler used by quickEdit.ascx -* Removed /umbraco/dashboard/quickEdit.ascx and replaced with /umbraco/Search/QuickSearch.ascx -* Removed /umbraco/dashboard/quickEdit.js and repalced with /umbraco/Search/quickEdit.js -* Moved jquery autocomplete to /umbraco_client/Application/Jquery -* Removed /umbraco/webservices/Search.asmx as the SearchItem object has been removed -* Removed /umbraco/reindex.aspx - -* Removed /umbraco/dialogs/editImage.aspx since it didn't do anything at all - -* MediaPicker has been completely overhauled in regards to the JavaScript implementation and should now work in live editing mode - -* /umbraco/plugins/tinymce3/insertImage.aspx has been overhauled to use the tree control, image viewer control and upload media image control - -* /umbraco/treeInit.aspx has been marked obsolete -** All pages that used to use TreeInit now use TreeControl (except for Legacy project) -* /umbraco/dialog/treePicker.aspx has been marked obsolete -* /umbraco/dialog/uploadImage.aspx has been marked obsolete -* /umbraco/dialog/imageViewer.aspx has been marked obsolete - -* subModal library moved to legacy and no longer used -* JavaScript Modal window framework overhauled and replaced \ No newline at end of file diff --git a/INDIGO64.testrunconfig b/src/INDIGO64.testrunconfig similarity index 100% rename from INDIGO64.testrunconfig rename to src/INDIGO64.testrunconfig diff --git a/SHANDEMVAIO.testrunconfig b/src/SHANDEMVAIO.testrunconfig similarity index 100% rename from SHANDEMVAIO.testrunconfig rename to src/SHANDEMVAIO.testrunconfig diff --git a/SHOCKING.testrunconfig b/src/SHOCKING.testrunconfig similarity index 100% rename from SHOCKING.testrunconfig rename to src/SHOCKING.testrunconfig diff --git a/SolutionInfo.cs b/src/SolutionInfo.cs similarity index 78% rename from SolutionInfo.cs rename to src/SolutionInfo.cs index 483a13c3d6..4ffe6a35dd 100644 --- a/SolutionInfo.cs +++ b/src/SolutionInfo.cs @@ -2,7 +2,7 @@ using System.Reflection; using System.Resources; [assembly: AssemblyCompany("umbraco")] -[assembly: AssemblyCopyright("Copyright © 2010")] +[assembly: AssemblyCopyright("Copyright © Umbraco 2012")] [assembly: AssemblyTrademark("")] [assembly: AssemblyCulture("")] diff --git a/UMBRACOELISE.testrunconfig b/src/UMBRACOELISE.testrunconfig similarity index 100% rename from UMBRACOELISE.testrunconfig rename to src/UMBRACOELISE.testrunconfig diff --git a/UMBRACOHUMMER.testrunconfig b/src/UMBRACOHUMMER.testrunconfig similarity index 100% rename from UMBRACOHUMMER.testrunconfig rename to src/UMBRACOHUMMER.testrunconfig diff --git a/src/umbraco.MacroEngines.Iron/umbraco.MacroEngines.Iron.csproj b/src/umbraco.MacroEngines.Iron/umbraco.MacroEngines.Iron.csproj index f66e6db055..8143fa3451 100644 --- a/src/umbraco.MacroEngines.Iron/umbraco.MacroEngines.Iron.csproj +++ b/src/umbraco.MacroEngines.Iron/umbraco.MacroEngines.Iron.csproj @@ -43,7 +43,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.MacroEngines/Properties/AssemblyInfo.cs b/src/umbraco.MacroEngines/Properties/AssemblyInfo.cs index 27cda2e055..208cc4509b 100644 --- a/src/umbraco.MacroEngines/Properties/AssemblyInfo.cs +++ b/src/umbraco.MacroEngines/Properties/AssemblyInfo.cs @@ -7,11 +7,9 @@ using System.Runtime.InteropServices; [assembly: AssemblyTitle("umbraco.MacroEngines")] [assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("Microsoft")] [assembly: AssemblyProduct("umbraco.MacroEngines")] -[assembly: AssemblyCopyright("Copyright © Microsoft 2010")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] + + // Setting ComVisible to false makes the types in this assembly not visible // to COM components. If you need to access a type in this assembly from @@ -21,15 +19,4 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("207a5ae9-5f35-4dec-a649-d3cf4d0efbd9")] -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] + diff --git a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj index 2a62c0d142..e0410b583b 100644 --- a/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj +++ b/src/umbraco.MacroEngines/umbraco.MacroEngines.csproj @@ -75,7 +75,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.businesslogic/umbraco.businesslogic.csproj b/src/umbraco.businesslogic/umbraco.businesslogic.csproj index 98cb6ea072..6ed348f909 100644 --- a/src/umbraco.businesslogic/umbraco.businesslogic.csproj +++ b/src/umbraco.businesslogic/umbraco.businesslogic.csproj @@ -131,7 +131,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.cms/umbraco.cms.csproj b/src/umbraco.cms/umbraco.cms.csproj index a0337b396c..97fe440ccf 100644 --- a/src/umbraco.cms/umbraco.cms.csproj +++ b/src/umbraco.cms/umbraco.cms.csproj @@ -158,7 +158,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.controls/umbraco.controls.csproj b/src/umbraco.controls/umbraco.controls.csproj index 69c0aff7c3..8358c2a432 100644 --- a/src/umbraco.controls/umbraco.controls.csproj +++ b/src/umbraco.controls/umbraco.controls.csproj @@ -82,7 +82,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.datalayer/umbraco.datalayer.csproj b/src/umbraco.datalayer/umbraco.datalayer.csproj index 3872791272..a29f587dd3 100644 --- a/src/umbraco.datalayer/umbraco.datalayer.csproj +++ b/src/umbraco.datalayer/umbraco.datalayer.csproj @@ -81,7 +81,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.editorControls/umbraco.editorControls.csproj b/src/umbraco.editorControls/umbraco.editorControls.csproj index a5a6bf0ab6..5c6b88a9a0 100644 --- a/src/umbraco.editorControls/umbraco.editorControls.csproj +++ b/src/umbraco.editorControls/umbraco.editorControls.csproj @@ -168,7 +168,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.interfaces/umbraco.interfaces.csproj b/src/umbraco.interfaces/umbraco.interfaces.csproj index 63b9c2e458..bd1fc58684 100644 --- a/src/umbraco.interfaces/umbraco.interfaces.csproj +++ b/src/umbraco.interfaces/umbraco.interfaces.csproj @@ -119,7 +119,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj b/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj index 3c3c6acdac..7019123af9 100644 --- a/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj +++ b/src/umbraco.macroRenderings/umbraco.macroRenderings.csproj @@ -153,7 +153,7 @@ - + Properties\SolutionInfo.cs diff --git a/src/umbraco.presentation.targets b/src/umbraco.presentation.targets new file mode 100644 index 0000000000..28872ac15a --- /dev/null +++ b/src/umbraco.presentation.targets @@ -0,0 +1,43 @@ + + + + + $(MSBuildStartupDirectory) + + + + + $(SolutionDir) + $(Computername). + + + + web.Template.$(ConfigEnvironment)$(Configuration).config + + + + web.Template.$(Configuration).config + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/umbraco.presentation.csproj b/src/umbraco.presentation/umbraco.presentation.csproj index 0ce974a4e0..88d4f66b7b 100644 --- a/src/umbraco.presentation/umbraco.presentation.csproj +++ b/src/umbraco.presentation/umbraco.presentation.csproj @@ -191,7 +191,7 @@ - + Properties\SolutionInfo.cs @@ -1747,8 +1747,6 @@ - - @@ -2033,7 +2031,6 @@ - @@ -2231,8 +2228,6 @@ - - @@ -2243,11 +2238,6 @@ - - - - - @@ -2263,24 +2253,15 @@ - - - Designer - - - Designer - - - @@ -2339,7 +2320,6 @@ - Component @@ -2655,6 +2635,18 @@ + + Web.Template.config + Designer + + + Web.Template.config + Designer + + + Web.Template.config + Designer + SettingsSingleFileGenerator Settings1.Designer.cs @@ -3227,10 +3219,7 @@ - - - - + Designer @@ -3300,6 +3289,57 @@ Designer + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + + + Web.Template.config + @@ -3334,12 +3374,6 @@ - - - - - - @@ -3356,6 +3390,8 @@ + + diff --git a/src/umbraco.presentation/web.STANDARD.config b/src/umbraco.presentation/web.STANDARD.config deleted file mode 100644 index 6bccc8deed..0000000000 --- a/src/umbraco.presentation/web.STANDARD.config +++ /dev/null @@ -1,273 +0,0 @@ - - - -
- - - - - -
- - -
-
-
- - - -
-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.13INCHER.Debug.config b/src/umbraco.presentation/web.Template.13INCHER.Debug.config new file mode 100644 index 0000000000..943c4afe5f --- /dev/null +++ b/src/umbraco.presentation/web.Template.13INCHER.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.APOWELL-BC-WIN7.Debug.config b/src/umbraco.presentation/web.Template.APOWELL-BC-WIN7.Debug.config new file mode 100644 index 0000000000..eefa0a3b79 --- /dev/null +++ b/src/umbraco.presentation/web.Template.APOWELL-BC-WIN7.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.Blueberry.Debug.config b/src/umbraco.presentation/web.Template.Blueberry.Debug.config new file mode 100644 index 0000000000..67e8b530f7 --- /dev/null +++ b/src/umbraco.presentation/web.Template.Blueberry.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.Debug.config b/src/umbraco.presentation/web.Template.Debug.config new file mode 100644 index 0000000000..f5b8cb7701 --- /dev/null +++ b/src/umbraco.presentation/web.Template.Debug.config @@ -0,0 +1,31 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.EQUIUM-SAT1.Debug.config b/src/umbraco.presentation/web.Template.EQUIUM-SAT1.Debug.config new file mode 100644 index 0000000000..83d850982f --- /dev/null +++ b/src/umbraco.presentation/web.Template.EQUIUM-SAT1.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.INDIGO64.Debug.config b/src/umbraco.presentation/web.Template.INDIGO64.Debug.config new file mode 100644 index 0000000000..52647ab354 --- /dev/null +++ b/src/umbraco.presentation/web.Template.INDIGO64.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.INDIGO64SSD.Debug.config b/src/umbraco.presentation/web.Template.INDIGO64SSD.Debug.config new file mode 100644 index 0000000000..1fa646638e --- /dev/null +++ b/src/umbraco.presentation/web.Template.INDIGO64SSD.Debug.config @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.NIBBLE-LAPTOP.Debug.config b/src/umbraco.presentation/web.Template.NIBBLE-LAPTOP.Debug.config new file mode 100644 index 0000000000..0da2f090cb --- /dev/null +++ b/src/umbraco.presentation/web.Template.NIBBLE-LAPTOP.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.PETER-MAC.Debug.config b/src/umbraco.presentation/web.Template.PETER-MAC.Debug.config new file mode 100644 index 0000000000..8d0da62ae8 --- /dev/null +++ b/src/umbraco.presentation/web.Template.PETER-MAC.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.PETER-PC.Debug.config b/src/umbraco.presentation/web.Template.PETER-PC.Debug.config new file mode 100644 index 0000000000..cab18ec4b8 --- /dev/null +++ b/src/umbraco.presentation/web.Template.PETER-PC.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.Release.config b/src/umbraco.presentation/web.Template.Release.config new file mode 100644 index 0000000000..33761142d5 --- /dev/null +++ b/src/umbraco.presentation/web.Template.Release.config @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.SONIC.Debug.config b/src/umbraco.presentation/web.Template.SONIC.Debug.config new file mode 100644 index 0000000000..4b50d128ea --- /dev/null +++ b/src/umbraco.presentation/web.Template.SONIC.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.ShandemVaio.Debug.config b/src/umbraco.presentation/web.Template.ShandemVaio.Debug.config new file mode 100644 index 0000000000..ca20bd8113 --- /dev/null +++ b/src/umbraco.presentation/web.Template.ShandemVaio.Debug.config @@ -0,0 +1,43 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.UMBRACOELISE.Debug.config b/src/umbraco.presentation/web.Template.UMBRACOELISE.Debug.config new file mode 100644 index 0000000000..4b2e4bb8da --- /dev/null +++ b/src/umbraco.presentation/web.Template.UMBRACOELISE.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.UMBRACOHUMMER.Debug.config b/src/umbraco.presentation/web.Template.UMBRACOHUMMER.Debug.config new file mode 100644 index 0000000000..e75a5d98de --- /dev/null +++ b/src/umbraco.presentation/web.Template.UMBRACOHUMMER.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.UMBRACOTOSH.Debug.config b/src/umbraco.presentation/web.Template.UMBRACOTOSH.Debug.config new file mode 100644 index 0000000000..845b44b651 --- /dev/null +++ b/src/umbraco.presentation/web.Template.UMBRACOTOSH.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.User-VAIO.Debug.config b/src/umbraco.presentation/web.Template.User-VAIO.Debug.config new file mode 100644 index 0000000000..4d424d453a --- /dev/null +++ b/src/umbraco.presentation/web.Template.User-VAIO.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.config b/src/umbraco.presentation/web.Template.config new file mode 100644 index 0000000000..561144f7d9 --- /dev/null +++ b/src/umbraco.presentation/web.Template.config @@ -0,0 +1,273 @@ + + + +
+ + + + + +
+ + +
+
+
+ + + +
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.slacebox.Debug.config b/src/umbraco.presentation/web.Template.slacebox.Debug.config new file mode 100644 index 0000000000..76201c1317 --- /dev/null +++ b/src/umbraco.presentation/web.Template.slacebox.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.ssaodsk01.Debug.config b/src/umbraco.presentation/web.Template.ssaodsk01.Debug.config new file mode 100644 index 0000000000..6e151cbeb5 --- /dev/null +++ b/src/umbraco.presentation/web.Template.ssaodsk01.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.Template.ssaolap01.Debug.config b/src/umbraco.presentation/web.Template.ssaolap01.Debug.config new file mode 100644 index 0000000000..a8f9a250a9 --- /dev/null +++ b/src/umbraco.presentation/web.Template.ssaolap01.Debug.config @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.config b/src/umbraco.presentation/web.config index 6bccc8deed..7443750d45 100644 --- a/src/umbraco.presentation/web.config +++ b/src/umbraco.presentation/web.config @@ -1,249 +1,249 @@ - + - -
- - - -
- + +
+ -
-
-
+
+
+
- - -
-
- - - - - - - - + + +
+
+ + + + + + + + - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + - - - - - - - - - - - - - + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - + + + + + - - + + - - + + - - - + + + - - - - - - - - + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - + + + + + + + + + - - - + + + + + + + + - + + + + + - - - - - - - - + + + + + + + + - - - + - - - - - - - - - - - - + + + + + + + + + + + + \ No newline at end of file diff --git a/src/umbraco.presentation/web.config.13INCHER.xslt b/src/umbraco.presentation/web.config.13INCHER.xslt deleted file mode 100644 index 98ea8ddf3e..0000000000 --- a/src/umbraco.presentation/web.config.13INCHER.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=v46;user id=umbracouser;password=farmer - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.APOWELL-BC-WIN7.xslt b/src/umbraco.presentation/web.config.APOWELL-BC-WIN7.xslt deleted file mode 100644 index 57b4d3d2a7..0000000000 --- a/src/umbraco.presentation/web.config.APOWELL-BC-WIN7.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umbraco-4.1;integrated security=false;user id=umbraco;pwd=umbraco - - - - 4.1.0.betaII - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.Blueberry.xslt b/src/umbraco.presentation/web.config.Blueberry.xslt deleted file mode 100644 index 9612a05374..0000000000 --- a/src/umbraco.presentation/web.config.Blueberry.xslt +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - server=.\SQLEXPRESS;database="Umbraco 4.8";integrated security=true - - - - - 4.8.0 - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.EQUIUM-SAT1.xslt b/src/umbraco.presentation/web.config.EQUIUM-SAT1.xslt deleted file mode 100644 index 79c04d3da0..0000000000 --- a/src/umbraco.presentation/web.config.EQUIUM-SAT1.xslt +++ /dev/null @@ -1,31 +0,0 @@ - - - - - - - server=10.198.22.143;database=umbraco41;integrated security=false;user id=umbraco;pwd=umbraco - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.INDIGO64.xslt b/src/umbraco.presentation/web.config.INDIGO64.xslt deleted file mode 100644 index 9a244c17f8..0000000000 --- a/src/umbraco.presentation/web.config.INDIGO64.xslt +++ /dev/null @@ -1,24 +0,0 @@ - - - - - - - Data Source=.\SQLEXPRESS;Initial Catalog=BB_Umbraco_Sandbox1;integrated security=false;user id=umbraco;pwd=umbraco - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.INDIGO64SSD.xslt b/src/umbraco.presentation/web.config.INDIGO64SSD.xslt deleted file mode 100644 index 7bd0dc92fa..0000000000 --- a/src/umbraco.presentation/web.config.INDIGO64SSD.xslt +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - Data Source=.\SQLEXPRESS;Initial Catalog=Dev.Umbraco.4x;integrated security=false;user id=umbraco;pwd=umbraco - - - - - - true - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.NIBBLE-LAPTOP.xslt b/src/umbraco.presentation/web.config.NIBBLE-LAPTOP.xslt deleted file mode 100644 index 304d6e834d..0000000000 --- a/src/umbraco.presentation/web.config.NIBBLE-LAPTOP.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umbracov41source;user id=sa;password=pennywise - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.PETER-MAC-PC.xslt b/src/umbraco.presentation/web.config.PETER-MAC-PC.xslt deleted file mode 100644 index 65b4bead30..0000000000 --- a/src/umbraco.presentation/web.config.PETER-MAC-PC.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=4.6-beta;integrated security=false;user id=sa;pwd=password! - - - - 4.6.0.beta - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.PETER-PC.xslt b/src/umbraco.presentation/web.config.PETER-PC.xslt deleted file mode 100644 index 86a60fe5cd..0000000000 --- a/src/umbraco.presentation/web.config.PETER-PC.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=4.6-beta;integrated security=false;user id=sa;pwd=password - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.SHANDEMVAIO.xslt b/src/umbraco.presentation/web.config.SHANDEMVAIO.xslt deleted file mode 100644 index 0323a57b71..0000000000 --- a/src/umbraco.presentation/web.config.SHANDEMVAIO.xslt +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - server=.\sqlexpress;database=v4;user id=sa;password=test;Application Name=Umbraco41 - - - - 4.8.0 - - - - ~/App_Data/umbraco.config - - - - ~/App_Data - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.SHOCKING.xslt b/src/umbraco.presentation/web.config.SHOCKING.xslt deleted file mode 100644 index aa520081dc..0000000000 --- a/src/umbraco.presentation/web.config.SHOCKING.xslt +++ /dev/null @@ -1,52 +0,0 @@ - - - - - - - server=SHOCKING\SQLEXPRESS;database=UmbracoTest5;user id=sa;password=test - - - - 4.1.0.betaII - - - - ~/App_Data/umbraco.config - - - - ~/App_Data - - - - ~/umbraco - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.SONIC.xslt b/src/umbraco.presentation/web.config.SONIC.xslt deleted file mode 100644 index e5ce342701..0000000000 --- a/src/umbraco.presentation/web.config.SONIC.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umb_41;integrated security=true - - - - 4.1.0.alpha - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.UMBRACOELISE.xslt b/src/umbraco.presentation/web.config.UMBRACOELISE.xslt deleted file mode 100644 index 15ad0f0411..0000000000 --- a/src/umbraco.presentation/web.config.UMBRACOELISE.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=v47;user id=DBUSER;password=DBPASSWORD - - - - 4.7.0.beta - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.UMBRACOHUMMER.xslt b/src/umbraco.presentation/web.config.UMBRACOHUMMER.xslt deleted file mode 100644 index 23f8ffe545..0000000000 --- a/src/umbraco.presentation/web.config.UMBRACOHUMMER.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\mojosqlserver;database=v472;integrated security=false;user id=DBUSER;password=DBPASSWORD - - - - 4.7.2 - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.UMBRACOTOSH.xslt b/src/umbraco.presentation/web.config.UMBRACOTOSH.xslt deleted file mode 100644 index f50b184c1b..0000000000 --- a/src/umbraco.presentation/web.config.UMBRACOTOSH.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umbraco41;integrated security=true - - - - - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.User-VAIO.xslt b/src/umbraco.presentation/web.config.User-VAIO.xslt deleted file mode 100644 index 4fcc40f49e..0000000000 --- a/src/umbraco.presentation/web.config.User-VAIO.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=Juno;integrated security=false;user id=sa;password=pennywise - - - - 4.7.0 - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.slacebox.xslt b/src/umbraco.presentation/web.config.slacebox.xslt deleted file mode 100644 index c2fa36a990..0000000000 --- a/src/umbraco.presentation/web.config.slacebox.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=.\sqlexpress;database=umbraco-nightly;integrated security=true; - - - - 4.6.0.Alpha - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.ssaodsk01.xslt b/src/umbraco.presentation/web.config.ssaodsk01.xslt deleted file mode 100644 index 93bb64c7c9..0000000000 --- a/src/umbraco.presentation/web.config.ssaodsk01.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=ssaodev2;database=udev;user id=dev;password=dev - - - - 4.7.0 - - - - - - - - - - - - - - diff --git a/src/umbraco.presentation/web.config.ssaolap01.xslt b/src/umbraco.presentation/web.config.ssaolap01.xslt deleted file mode 100644 index 39c8ae368f..0000000000 --- a/src/umbraco.presentation/web.config.ssaolap01.xslt +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - server=ssaolap01;database=udev;integrated security=false;user id=dev;pwd=dev - - - - 4.7.0 - - - - - - - - - - - - - - diff --git a/src/umbraco.providers/umbraco.providers.csproj b/src/umbraco.providers/umbraco.providers.csproj index cecef40ab5..8b44d97e91 100644 --- a/src/umbraco.providers/umbraco.providers.csproj +++ b/src/umbraco.providers/umbraco.providers.csproj @@ -75,7 +75,7 @@ - + Properties\SolutionInfo.cs diff --git a/umbraco.sln b/src/umbraco.sln similarity index 72% rename from umbraco.sln rename to src/umbraco.sln index 14294d1120..696ba1b22c 100644 --- a/umbraco.sln +++ b/src/umbraco.sln @@ -10,31 +10,52 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution UMBRACOHUMMER.testrunconfig = UMBRACOHUMMER.testrunconfig EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.presentation", "src\umbraco.presentation\umbraco.presentation.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.presentation", "umbraco.presentation\umbraco.presentation.csproj", "{651E1350-91B6-44B7-BD60-7207006D7003}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "src\umbraco.businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.businesslogic", "umbraco.businesslogic\umbraco.businesslogic.csproj", "{E469A9CE-1BEC-423F-AC44-713CD72457EA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.cms", "src\umbraco.cms\umbraco.cms.csproj", "{CCD75EC3-63DB-4184-B49D-51C1DD337230}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.cms", "umbraco.cms\umbraco.cms.csproj", "{CCD75EC3-63DB-4184-B49D-51C1DD337230}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.interfaces", "src\umbraco.interfaces\umbraco.interfaces.csproj", "{511F6D8D-7717-440A-9A57-A507E9A8B27F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.interfaces", "umbraco.interfaces\umbraco.interfaces.csproj", "{511F6D8D-7717-440A-9A57-A507E9A8B27F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.editorControls", "src\umbraco.editorControls\umbraco.editorControls.csproj", "{255F5DF1-4E43-4758-AC05-7A0B68EB021B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.editorControls", "umbraco.editorControls\umbraco.editorControls.csproj", "{255F5DF1-4E43-4758-AC05-7A0B68EB021B}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.macroRenderings", "src\umbraco.macroRenderings\umbraco.macroRenderings.csproj", "{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.macroRenderings", "umbraco.macroRenderings\umbraco.macroRenderings.csproj", "{52AB8F1F-FB76-4E8C-885F-0747B6CE71EC}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.providers", "src\umbraco.providers\umbraco.providers.csproj", "{D7636876-0756-43CB-A192-138C6F0D5E42}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.providers", "umbraco.providers\umbraco.providers.csproj", "{D7636876-0756-43CB-A192-138C6F0D5E42}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "src\umbraco.datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.datalayer", "umbraco.datalayer\umbraco.datalayer.csproj", "{C7CB79F0-1C97-4B33-BFA7-00731B579AE2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.controls", "src\umbraco.controls\umbraco.controls.csproj", "{6EDD2061-82F2-461B-BB6E-879245A832DE}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.controls", "umbraco.controls\umbraco.controls.csproj", "{6EDD2061-82F2-461B-BB6E-879245A832DE}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.webservices", "src\umbraco.webservices\umbraco.webservices.csproj", "{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.webservices", "umbraco.webservices\umbraco.webservices.csproj", "{CBDB56AC-FF02-4421-9FD4-ED82E339D8E2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCE4Umbraco", "src\SQLCE4Umbraco\SqlCE4Umbraco.csproj", "{5BA5425F-27A7-4677-865E-82246498AA2E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SqlCE4Umbraco", "SQLCE4Umbraco\SqlCE4Umbraco.csproj", "{5BA5425F-27A7-4677-865E-82246498AA2E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "src\umbraco.MacroEngines\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines", "umbraco.MacroEngines\umbraco.MacroEngines.csproj", "{89C09045-1064-466B-B94A-DB3AFE2A5853}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron", "src\umbraco.MacroEngines.Iron\umbraco.MacroEngines.Iron.csproj", "{98CBA7E2-1B62-497C-8AA3-B868704068D7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "umbraco.MacroEngines.Iron", "umbraco.MacroEngines.Iron\umbraco.MacroEngines.Iron.csproj", "{98CBA7E2-1B62-497C-8AA3-B868704068D7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Build", "Build", "{2849E9D4-3B4E-40A3-A309-F3CB4F0E125F}" + ProjectSection(SolutionItems) = preProject + build\aspnet35.build = build\aspnet35.build + build\aspnet35.config = build\aspnet35.config + build\build.xml = build\build.xml + build\default.build = build\default.build + build\nuget.build = build\nuget.build + build\umbraco weekly.build = build\umbraco weekly.build + build\umbraco.build = build\umbraco.build + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Docs", "Docs", "{FD962632-184C-4005-A5F3-E705D92FC645}" + ProjectSection(SolutionItems) = preProject + docs\4.5-changelog.docx = docs\4.5-changelog.docx + docs\GettingStarted.txt = docs\GettingStarted.txt + docs\IronPython License.Rtf = docs\IronPython License.Rtf + docs\License.txt = docs\License.txt + docs\README.txt = docs\README.txt + docs\ReleaseNotes.txt = docs\ReleaseNotes.txt + EndProjectSection EndProject Global GlobalSection(TestCaseManagementSettings) = postSolution diff --git a/umbraco.vsmdi b/src/umbraco.vsmdi similarity index 100% rename from umbraco.vsmdi rename to src/umbraco.vsmdi diff --git a/umbraco.vssscc b/src/umbraco.vssscc similarity index 100% rename from umbraco.vssscc rename to src/umbraco.vssscc diff --git a/src/umbraco.webservices/umbraco.webservices.csproj b/src/umbraco.webservices/umbraco.webservices.csproj index 99b053a864..c7c7c63008 100644 --- a/src/umbraco.webservices/umbraco.webservices.csproj +++ b/src/umbraco.webservices/umbraco.webservices.csproj @@ -74,7 +74,7 @@ - + Properties\SolutionInfo.cs diff --git a/umbraco1.vsmdi b/src/umbraco1.vsmdi similarity index 100% rename from umbraco1.vsmdi rename to src/umbraco1.vsmdi diff --git a/umbraco2.vsmdi b/src/umbraco2.vsmdi similarity index 100% rename from umbraco2.vsmdi rename to src/umbraco2.vsmdi diff --git a/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx b/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx new file mode 100644 index 0000000000..dcb6614dda --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/DocumentService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="DocumentService.asmx.cs" Class=umbraco.webservices.documents.documentService %> \ No newline at end of file diff --git a/umbraco/presentation/umbraco/webservices/api/FileService.asmx b/umbraco/presentation/umbraco/webservices/api/FileService.asmx new file mode 100644 index 0000000000..e8a68ff354 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/FileService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="FileService.asmx.cs" Class="umbraco.webservices.files.fileService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx b/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx new file mode 100644 index 0000000000..fc9f8aba21 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MaintanceService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MaintanceService.asmx.cs" Class="umbraco.webservices.maintenance.maintenanceService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MediaService.asmx b/umbraco/presentation/umbraco/webservices/api/MediaService.asmx new file mode 100644 index 0000000000..cfaded1cb1 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MediaService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MediaService.asmx.cs" Class="umbraco.webservices.media.mediaService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/MemberService.asmx b/umbraco/presentation/umbraco/webservices/api/MemberService.asmx new file mode 100644 index 0000000000..f65beb00c6 --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/MemberService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="MemberService.asmx.cs" Class="umbraco.webservices.members.memberService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx b/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx new file mode 100644 index 0000000000..4d98082f6c --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/StylesheetService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="StylesheetService.asmx.cs" Class="umbraco.webservices.stylesheets.stylesheetService" %> diff --git a/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx b/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx new file mode 100644 index 0000000000..8af78e62dd --- /dev/null +++ b/umbraco/presentation/umbraco/webservices/api/TemplateService.asmx @@ -0,0 +1 @@ +<%@ WebService Language="C#" CodeBehind="TemplateService.asmx.cs" Class="umbraco.webservices.templates.templateService" %>