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

18478 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jeavon
ea030d990f Add .editorconfig file to enforce whitespace and line breaks 2017-04-04 18:19:50 +01:00
Claus
2ed4948619 Merge pull request #1854 from umbraco/temp-U4-9720 
U4-9720 No more _thumb thumbnail file generation - all thumbnails should be generated via Image Processor
 2017-04-04 09:49:10 +02:00
Sebastiaan Janssen
0e67c787a8 Bump version to RC :) 2017-04-04 08:05:32 +02:00
Shannon
ebfb2b536f bumps version to RC01 2017-04-04 13:12:03 +10:00
Shannon Deminick
81010444f3 Merge pull request #1852 from umbraco/temp-U4-9707 
fixes: U4-9707 Umbraco 7.6.0 - add border-radius to listview create b…
 2017-04-04 12:51:56 +10:00
Shannon Deminick
bbbc1949bc Merge pull request #1853 from umbraco/temp-U4-9708 
fixes: U4-9708 Make lightbox screenshots in packages section bigger
 2017-04-04 12:48:30 +10:00
Shannon Deminick
7b34e59222 Merge pull request #1851 from umbraco/temp-U4-9706 
fixes: U4-9706 Partial View Macro File is not created but Macro is
 2017-04-04 12:46:29 +10:00
Shannon
3706405bff Obsoletes all methods that perform image manipulation and thumbnail generation, removes thumbnail generation from occurring, fixes the issue of getting the size for an image!! Argh, we were bypassing the Exif data reading and instead still loading the whole image in! 2017-04-04 12:14:06 +10:00
Mads Rasmussen
8a0efd7790 fixes: U4-9708 Make lightbox screenshots in packages section bigger 2017-04-03 15:24:37 +02:00
Mads Rasmussen
bd2ac3d128 fixes: U4-9707 Umbraco 7.6.0 - add border-radius to listview create button 2017-04-03 15:15:39 +02:00
Emil Wangaa
c25b710b80 Using the VirtualPath for creating the partial view macro + file instead of parent+filename 2017-04-03 14:31:21 +02:00
Shannon
09e060ff92 Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-04-03 21:53:21 +10:00
Shannon
2248a85876 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.nuspec
#	src/Umbraco.Core/Services/ContentTypeService.cs
#	src/Umbraco.Web.UI.Client/src/views/dashboard/developer/examinemanagement.html
#	src/Umbraco.Web.UI/packages.config
 2017-04-03 21:50:22 +10:00
Robot for Continuous Integration
a3f4b2db5d Merge pull request #1771 from umbraco/temp-faster-startup-less-scanning 
Temp faster startup less scanning
 2017-04-03 13:45:30 +02:00
Stephan
5947f01590 RIP DirtyBackDoor 2017-04-03 13:45:03 +02:00
Mads Rasmussen
75a006ca87 move create macro logic from partial view macro file dialog to editor 2017-04-03 13:32:15 +02:00
Shannon
cee5880501 Changes TypeHelper back to Ordinal since that is what it was before 2017-04-03 21:16:08 +10:00
Shannon
f65002ea16 Ensures we only write the cache file if we are scanning 2017-04-03 21:15:50 +10:00
Shannon
bd1bfa416c Ensures both IServiceConnector and BaseMapper are IDiscoverable because we scan for them 2017-04-03 21:15:34 +10:00
Shannon
317f96a1bd removes very old logic for rescanning IAction, this is totally unecessary 2017-04-03 21:15:14 +10:00
Shannon
a42d6b954f ensure that we have cache = true for ITree and IApplication because otherwise we'll be scanning but they are implicitly cached because they are IDiscoverable 2017-04-03 21:14:45 +10:00
Stephan
71b8674664 U4-9576 - deal with broken cache file 2017-04-03 09:25:27 +02:00
Shannon
9e3ca51286 fixes build error... though that check will need to be put back in 2017-04-03 17:17:31 +10:00
Shannon
0e6f2b542e Merge branch 'dev-v7.6' into temp-faster-startup-less-scanning 
# Conflicts:
#	src/Umbraco.Core/PluginManager.cs
 2017-04-03 16:57:57 +10:00
Shannon Deminick
218f523022 Merge pull request #1843 from umbraco/temp-U4-9691 
Fixes the Examine mgmt dashboard to look better and to detect if an i…
 2017-04-03 16:28:36 +10:00
Shannon Deminick
50c6fb036a Merge pull request #1839 from umbraco/temp-uaasscrum-827 
uaasscrum-827 - more robust umbraco.config
 2017-04-03 16:19:27 +10:00
Shannon Deminick
bc2115ff0a Merge pull request #1847 from umbraco/temp-u4-9683 
Upgrade to ModelsBuilder 3.0.6
 2017-04-03 16:03:13 +10:00
Shannon Deminick
9eee5c2bc0 Merge pull request #1840 from umbraco/temp-U4-9689 
U4-9689 Content type description isn't always saved the same way
 2017-04-03 15:53:30 +10:00
Claus
038163421b Merge pull request #1849 from umbraco/temp-u4-9702 
U4-9702 - event error when deleting content type container
 2017-03-30 15:28:09 +02:00
Mads Rasmussen
7ce58f6e5f installer image is a jpg 2017-03-30 12:07:43 +02:00
Sebastiaan Janssen
c6470decb2 Merge branch 'temp-U4-9687' into dev-v7.6 2017-03-30 11:46:37 +02:00
Sebastiaan Janssen
8a28639331 Revert commit of test variable 2017-03-30 11:43:48 +02:00
Sebastiaan Janssen
65b2b7cb82 Merge pull request #1848 from umbraco/temp-U4-9687 
Fixes: U4-9687 Update login screen UI
 2017-03-30 11:21:42 +02:00
Sebastiaan Janssen
2daf71aee4 Move LoginBackgroundImage to the content section instead of the security section 2017-03-30 11:15:12 +02:00
Sebastiaan Janssen
339edb2295 Merge branch 'dev-v7.6' into temp-U4-9687 2017-03-30 10:49:03 +02:00
Stephan
e117b764fb U4-9702 - event error when deleting content type container 2017-03-30 10:35:41 +02:00
Mads Rasmussen
ed3096642d Merge pull request #1844 from ryanology/temp-U4-9697 
U4-9697 - Listview create new node ordering
 2017-03-30 10:31:51 +02:00
Emil Wangaa
d51082f651 Bumps version 2017-03-30 10:27:54 +02:00
Stephan
f2fb275b34 Fix post-merge issues 2017-03-30 09:58:27 +02:00
Stephan
95508c4fb7 Upgrade nuspec accordingly 2017-03-30 09:32:22 +02:00
Stephan
4677faff38 Upgrade to ModelsBuilder 3.0.6 2017-03-30 08:54:01 +02:00
Shannon
c5f388f6bc Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-03-30 17:03:51 +11:00
Shannon
4419af427b Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6 2017-03-30 17:02:04 +11:00
Shannon
dbdee5fc2c U4-9655 Html Agility pack assembly binding needs to be updated via code, just in case 2017-03-30 17:01:30 +11:00
Shannon
725b3c5eca Merge branch 'dev-v7' into temp-U4-9691 2017-03-30 16:37:24 +11:00
Shannon
25f5179b29 updates nuspec 2017-03-30 16:36:54 +11:00
Shannon
bf6d084f82 Merge branch 'dev-v7' into temp-U4-9691 2017-03-30 15:50:16 +11:00
Shannon
1a03bd9624 Logs an error if the index is rebuilding due to being corrupt 2017-03-30 15:49:45 +11:00
Shannon
6a1d60c5a7 U4-9692 Update to Examine 0.1.82 2017-03-30 15:43:06 +11:00
Shannon
4fef17190f adds notes 2017-03-30 11:03:07 +11:00