swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,907 Commits 73 Branches 219 Tags
fcaa4ad8d686dfd4c90be09d10bc6b136dc3e5fa
Commit Graph

135 Commits

Author SHA1 Message Date
Stephan 2a6b559b6e U4-7739 - added more options to ViewHelper.GetDefaultFileContent 2016-01-22 10:41:54 +01:00
Shannon 9c58e82169 publicized required method for externally setting template markup, removes logic from core for this 2016-01-20 12:47:09 +01:00
Per Ploug 6763e93af3 Cleanup of default template code 
Moves it to the ViewHelper instead of inside of contenttypecontroller
 2015-12-30 09:56:09 +01:00
Sebastiaan Janssen 1bf2a3b1bf Merge branch 'dev-v7' of https://github.com/TimoPerplex/Umbraco-CMS into TimoPerplex-dev-v7 
Conflicts:
	src/Umbraco.Web/Editors/ImagesController.cs
 2015-12-15 11:12:13 +01:00
Shannon d3f5090150 Fixes up a couple of missing path updates and incorrect icon resolution and fixed another issue with webservice path reference 2015-11-13 13:38:30 +01:00
TimoPerplex 9b0aa49d4d Merge remote-tracking branch 'refs/remotes/umbraco/dev-v7' into dev-v7 2015-10-27 13:08:32 +01:00
Stephan 3314ab026b U4-7083 - filesystems, polish, fix, and back-compat 2015-09-10 14:20:21 +02:00
Stephan 6b5057b870 U4-7048 - more filesystems cleanup 2015-09-08 17:48:26 +02:00
Stephan e577648efd U4-7048 - refresh IFile instances from disk 2015-09-08 11:34:34 +02:00
Stephan 6b195587c1 U4-7042 - fix root path for tests 2015-09-03 16:24:43 +02:00
Stephan b03d7884bb U4-7042 - bugfix the physical filesystem 2015-09-03 15:11:49 +02:00
TimoPerplex 68ff77f5b6 This commit removes the hardcoded .jpg thumbnails 
This commit removes the hardcoded .jpg thumbnails and uses the image
original extension to create the thumbnail.
Because we now use the original extension the image is no longer masked
as another (extension is .jpg but the file is actually a .png)

This fixes issues with Internet Explorer used in combination with the
no-sniff header.
Ref topic:
https://our.umbraco.org/forum/umbraco-7/using-umbraco-7/66788-adding-nosniff-header-breaks-png-images-in-internet-explorer
 2015-07-24 16:27:26 +02:00
Shannon d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 17:04:25 +02:00
Shannon c2dc896fce working on: U4-6756 Don't ship or generate unnecessary folders 2015-07-16 15:29:46 +02:00
Shannon 9b5d4e5b08 Moves some logic into StringExtensions, updates tests, adds other tests 2015-07-16 10:40:43 +02:00
Shannon 428df7ae4a Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-02-17 15:11:10 +01:00
Shannon 0efb9b72e7 Adds small exif library to read meta data from jpg's so we can attempt to read width/height from exif instead of loading the file into mem with GDI, makes for much faster and far less memory processing.U4-6246 Uploading specific images causes GDI+ Errors 2015-02-10 16:33:59 +11:00
Stephan 470ccd1ffc Merge branch 'dev-v7' into 7.3.0 2015-02-09 08:59:23 +01:00
Shannon 89606d3a05 Goes brute force to try to resolve: U4-4049 Some images fail when uploading multiple media files 2015-02-06 11:19:52 +11:00
Shannon 61fd3fc505 Implements IPublicAccessService and wraps legacy Access class to use the new service, updates the public access data to use int's since using GUIDs atm is a little too complex, that will need to wait. 2015-01-28 13:16:50 +11:00
Shannon ed95ccc18e Creates ProfilingLogger in order to decouple the DisposableTimer from LogHelper and ProfilerResolver 2015-01-16 12:07:29 +11:00
Shannon fff1da2a12 Merge branch 'dev-v7' into 7.3.0 2015-01-02 16:25:52 +11:00
Shannon 7c59c71261 updates PR for U4-6054 to just read directly from the file stream, no need to copy it first. 2015-01-02 15:58:31 +11:00
Shannon Deminick a0c2914ce6 Merge pull request #604 from csharpforevermore/dev-v7 
Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_...
 2015-01-02 15:54:11 +11:00
Shannon 3f35ca1e77 Fixes merge and file encoding for master pages and templates to have BOM 2014-12-29 14:35:54 +11:00
Shannon 28a01d61a6 Fixes: U4-5981 Umbraco 7.2 Text encoding when saving partial view template 2014-12-29 13:50:33 +11:00
Chris Randle bc776d787e Fixed: U4-6054 "Unit test 'Umbraco.Tests.IO.AbstractFileSystemTests.Can_Get_Size()' fails" by looking at the size of the string not the file which can vary - possibly dependent on encoding. 2014-12-27 00:11:59 +00:00
Sebastiaan Janssen 72004768cf U4-5981 Umbraco 7.2 Text encoding when saving partial view template 
#U4-5981 In Progress Assignee Shandem
 2014-12-18 13:56:50 +01:00
Shannon 2961370b83 Adds some more tests, the legacy template object should now be wrapping the new one completely in regards with business logic (db) 2014-12-05 14:34:34 +11:00
Shannon 641c7dfa04 WIP - more work on templates repository/service 2014-12-02 11:30:30 +11:00
Shannon 95845c8f2e Almost completed U4-5847 Ensure the path is set correctly for templates in the db but needs a db migration script as well, more unit tests 2014-12-01 17:34:22 +11:00
Shannon c656bb632e WIP more template repo work and more unit tests 2014-12-01 16:22:18 +11:00
Shannon bf82a70744 WIP - still working on getting the template repository and models working correctly and adding some more tests. 2014-12-01 14:14:44 +11:00
Shannon 9ffaa8aabb Fixes some of the PhysicalFileSystem issues with paths vs relative paths, this should fix up inconsistencies. 2014-10-22 15:52:32 +10:00
Shannon 6e78a9f98f fix merge 2014-07-16 14:14:02 +10:00
Shannon 92c19ba76c Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
 2014-07-16 14:13:05 +10:00
Shannon b3288f0c91 fixes merge issue 2014-07-10 12:11:10 +10:00
Shannon d5993a4783 Backports fix from 7 for GetDimensions call to ensure the file exists 2014-07-10 12:09:26 +10:00
Shannon b254f81f4a Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 2014-07-10 11:54:05 +10:00
Shannon 17b0547cfc Merge commit '874f464a2b51000920e2323f93bea116546e9b88' into 7.1.5 
Conflicts:
	src/Umbraco.Core/IO/FileSystemExtensions.cs
	src/Umbraco.Core/IO/UmbracoMediaFile.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/channels/UmbracoMetaWeblogAPI.cs
 2014-07-10 11:53:45 +10:00
Shannon 86c2a6e8a9 updates physical file system, now that files are being disposed of properly we don't need to delete first 2014-07-10 11:51:48 +10:00
Shannon 874f464a2b Fixes: U4-5190 Overwrite Media File in 6.2.1 - process cannot access along with a bunch of other undisposed disposables :/ 2014-07-10 11:45:57 +10:00
Morten Christensen 12cdd3326a The CopyFile extension method was not disposing the file stream, so any attempt to delete the source file afterwards would fail. 
Removing unused using statements.
 2014-06-25 16:00:21 +02:00
Shannon 5a779c24d0 Fixes: U4-4428 Upload field on members fails on resizing 2014-03-17 18:39:53 +11:00
Shannon 3e8ada24e4 reverts sebastian's commit as this will cause unwanted other side affects 2014-03-17 16:08:06 +11:00
Sebastiaan Janssen f626738174 DoResize(-1,-1) - I don't know why you'd ever want to attempt to resize to -1,-1. 
Also removed the else clause as it hides the error until later, now size will be null at the appropriate time.
 2014-03-16 11:46:49 +01:00
Shannon c088187a13 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxContext.cs
	src/Umbraco.Core/Persistence/SqlSyntax/SqlSyntaxProviderExtensions.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/umbraco.cms/packages.config
	src/umbraco.controls/packages.config
	src/umbraco.editorControls/packages.config
	src/umbraco.macroRenderings/packages.config
	src/umbraco.macroRenderings/umbraco.macroRenderings.csproj
 2014-01-10 00:09:38 +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 68a25bb5b1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 15:50:03 +11:00
yawka 59391f58ec Remove previous fix, and move it to IsReservedPathOrUrl 2013-11-07 19:06:25 +02:00