yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,647 Commits 4 Branches 7 Tags
ec08d3e91098d76b7ac1a1c576ab182a4348f002
Commit Graph

295 Commits

Author SHA1 Message Date
Shannon
1faeb76c27 Removes the need for duplicate templates for partial views. Of course we can have partial view only templates if necessary but currently we just borrow them from the partial view macros and update the header 2014-02-10 13:50:31 +11:00
Sebastiaan Janssen
bad118ac6b U4-4046 Rename "empty template" to "empty" 2014-01-15 10:17:46 +01:00
Shannon
aebc30c7a3 Removes the version specific info from the CDF and Examine references in all proj files. 2014-01-13 14:02:50 +11:00
Shannon
4db6ce4b22 Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task 
updates to latest CDF
 2014-01-09 18:08:13 +11:00
Shannon
17883358b6 Fixes some issues with the User membership provider, updates user create dialog to also have an email address (which is required by membership), adds validation to the member and user create dialogs to ensure that the email address is validated to be a correcty formatted address. 2014-01-02 14:13:43 +11:00
Sebastiaan Janssen
af73fd8b68 Merge pull request #218 from dipunm/U4-2551 
Missing languages in RTE insert link dialog.
 2013-12-29 06:11:53 -08:00
Shannon
a43f4b7b7f Completes: U4-1521 Updated back office to use ClientDependency bundles for common files 2013-12-19 15:05:05 +11:00
Shannon
11103c0bc5 proj file 2013-12-16 13:23:07 +11:00
dipunm
a5782a40af Missing languages in RTE insert link dialog. 
Also included files in csproj file to ensure proper build.
 2013-11-07 14:59:00 +00:00
Shannon
0fee434ac2 Working on the password changer control to present the correct inputs based on the membership provider given.... nearly there. 2013-10-17 22:40:38 +11:00
Sebastiaan Janssen
12b7a9d874 Argh, didn't save csproj file before committing. 2013-10-07 13:20:34 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Shannon
90abe8c25f Fixes: U4-2823 RenderRouteHandler.GetUmbracoRouteDefinition() fails to store the route definition when an incidental alias-controller match is made 2013-09-11 12:15:29 +10:00
Sebastiaan Janssen
3d4b54064f I love managing files in csproj files.. NOT. 2013-09-01 15:32:55 +02:00
Sebastiaan Janssen
14303fab0c File move didn't make it into the csproj file previously, leading to build errors. Fixed! 
Also changed default PartialView template and added another Empty one
 2013-09-01 15:05:17 +02:00
Sebastiaan Janssen
2238f81d83 Oops, accidentally killed creating a partial view from the backoffice as it's also using PartialViewTasks.cs (like when you create a partial view macro) 2013-08-29 16:09:23 +02:00
Sebastiaan Janssen
49637e62fe Updated, more robust versions of the Member template/snippets 2013-08-28 17:52:06 +02:00
Sebastiaan Janssen
f26d759c84 Moved controllers and models as per Shannon's suggestion 
Added LoginStatus and updated Register
Updated to use CDF instead of <script> tags
 2013-08-28 13:36:04 +02:00
Sebastiaan Janssen
8274883fa5 Bump version number to 6.2.0 2013-08-28 09:09:21 +02:00
Sebastiaan Janssen
86276206d5 Add register member partial view macro template 2013-08-27 19:29:15 +02:00
Sebastiaan Janssen
53b6fb7b56 Add login template to partial view macros 2013-08-27 11:37:20 +02:00
Sebastiaan Janssen
d17b2cf884 Added ability to have predefined templates for Partial View Macros 2013-08-26 17:28:15 +02:00
Sebastiaan Janssen
76d0ffb797 Merge branch 'wip-changedoctypeui' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-changedoctypeui 
Conflicts:
	.gitignore
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-08-25 15:50:07 +02:00
Shannon
bfabfd9fa5 Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust. 2013-08-13 15:41:40 +10:00
Sebastiaan Janssen
898d25f3cb Include lang files in project so they'll actually end up in the final build 2013-07-31 18:31:39 +02:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Shannon
80f8a9d01c Merge branch '6.1.3' of https://github.com/umbraco/Umbraco-CMS into 6.1.3 2013-07-22 12:44:06 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Sebastiaan Janssen
914005b2b6 Merge pull request #46 from michielvoo/u4-2417 
U4-2417 Could the preview thumbnail link to the full image
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/Images/ImageViewer.ascx.cs
	src/umbraco.editorControls/mediapicker/mediaChooser.cs
 2013-07-19 15:09:07 +02:00
Sebastiaan Janssen
60867af1a7 Fixes U4-2444 Missing image - /umbraco/images/pinnedIcons/umb.ico 
Also fixes casing of folder names
 2013-07-15 16:31:19 +02:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
AndyButland
d3562b797e Back-office UI for change of document type for content item 2013-06-27 21:29:27 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Sebastiaan Janssen
09d9728fb8 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2013-06-23 15:16:44 +02:00
Sebastiaan Janssen
c0df3e0202 Match IIS Express port number to Umbraco version so it's easier to use a few copies of the repo locally 
(you don't have to re-map your port to the correct folder)
 2013-06-23 15:13:27 +02:00
Shannon
24a76f53b4 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/Xml/XmlNodeExtensions.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/config/Dashboard.config
	src/Umbraco.Web/DefaultPublishedContentStore.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/moveOrCopy.aspx.cs
	src/umbraco.businesslogic/BasePages/BasePage.cs
 2013-06-20 15:49:55 +10:00
Shannon
86ce48ddc8 Fixes: #U4-2312 - Moving content with the new API (and in the old api when calling library.UpdateDocumentCache(p.Id)) The document is actually moved properly in the content XML structure without republishing it and then rebuilding the entire XML structure, it just does it inline. Have also updated MoveAndCopy.aspx dialog to use the new API which now saves on about 20+ queries that were not needed. Also updated the MoveAndCopy dialog to have the correct code behind structure. 2013-06-20 15:34:57 +10:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Sebastiaan Janssen
9bd255d9a5 Include ExamineManagementIco.png in project so it's included in the build 2013-05-31 11:35:21 -02:00
Shannon Deminick
5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Shannon Deminick
7d1a18638b missing proj checking 2013-05-12 21:06:53 -10:00
Shannon Deminick
748e88c3e8 added web.config files to the root of xslt folders which will disable the ability for people 
to publicly download other's xslt files .
 2013-05-12 19:29:05 -10:00
Shannon Deminick
cb8d080f1d Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed. 
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
 2013-05-12 19:05:49 -10:00
Shannon Deminick
6f26f7b57c Patching from 6.1 2013-05-08 18:08:55 -10:00
Shannon Deminick
bda2614290 Patching from 6.1 2013-05-08 17:49:48 -10:00
Shannon Deminick
efc482511e Patching from 6.1 2013-05-08 17:48:17 -10:00
Shannon Deminick
a009dfe2a1 Patching from 6.1 2013-05-08 17:39:03 -10:00