yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,919 Commits 4 Branches 7 Tags
380e2aff2ebee0bcc5bb3bf4af4e8837c7b013cb
Commit Graph

24919 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
fe508c5a0f Removes MB files that are already included in the MB package 2018-08-29 11:57:31 +10:00
Shannon
09ee58ddad Removes more refs to umbraco_client, fixes up nuspecs 2018-08-29 10:49:55 +10:00
Marcel van Helmont
ec1a3f0fe8 make sure alias is camelCase format 2018-08-28 22:44:53 +02:00
Marcel van Helmont
8ce200bd16 added toggles to allow creating templates for collection and collection item 2018-08-28 21:32:18 +02:00
Søren Kottal
a6fd377f31 Update UmbracoHelper.cs 2018-08-28 20:21:49 +02:00
Søren Kottal
ba22ac4e83 Update HtmlStringUtilities.cs 2018-08-28 20:18:12 +02:00
Stephan
c743ac760d Update ModelsBuilder to -alpha.22 2018-08-28 20:02:25 +02:00
Stephan
f791198817 Version 8.0.0-alpha.49 for ModelsBuilder 2018-08-28 18:45:37 +02:00
Shannon
46c193c9e2 updates nuspec 2018-08-29 01:45:05 +10:00
Shannon
029eff1f8a Some refactoring to decouple web based assemblies from Umbraco.Core and move whatever we can to Umbraco.Web where web based assemblies are used. Decouples System.Drawing entirely from Umbraco.Core and removes the Active Directory dependency from Umbraco.core. 2018-08-29 01:15:46 +10:00
Stephan
eaacdc0514 Deal with fixmes in IContent IsCultureSomething 2018-08-28 15:11:13 +02:00
Shannon
ab6758e7bf Merge branch 'temp8' into temp8-nuget-pkgs 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2018-08-28 20:53:19 +10:00
Shannon Deminick
a151829b26 Merge pull request #2845 from umbraco/temp8-serilog 
Bye bye Log4Net, Hello Serilog
 2018-08-28 20:31:12 +10:00
Warren
91ab3b4894 Comments out a lot of the serilog.user.config to give some guidance and examples on what can be setup & configured 2018-08-28 10:11:08 +01:00
Warren
34452e72c0 Adds the shared option to the File sink to avoid file locking & if app restarts we don't get _001 or _002 files etc 2018-08-28 09:46:51 +01:00
Shannon
61c52913dd Fixes MediaCacheRefresher, it wasn't checking if there was an IMedia cache 2018-08-28 16:50:56 +10:00
Shannon Deminick
e1e435cc33 Merge pull request #2877 from umbraco/temp8-97 
Temp8 97
 2018-08-28 16:11:59 +10:00
Shannon
94cbe3b1b8 updates timing id 2018-08-28 15:40:20 +10:00
Shannon
6506abd451 Simplifies logger calls to proxy all calls to a single method of it's type 2018-08-28 15:38:36 +10:00
Shannon
8d6e297c37 Adds additional Fatal methods to match Error and move Fatal code above error so all logger code goes from Fatal -> Verbose 2018-08-28 15:24:45 +10:00
Mads Rasmussen
db385bbf17 make umb-variant-state directive reusable + reuse in umb-editor-header 2018-08-27 15:53:56 +02:00
Mads Rasmussen
e96d16536b Make sure two overlays can't be open at the same time 2018-08-27 12:36:40 +02:00
Mads Rasmussen
8c663b5993 Add option to prevent close on backdrop click 2018-08-27 11:44:55 +02:00
Mads Rasmussen
db37a34bac fix z-index problem 2018-08-27 11:28:10 +02:00
Shannon
06d08e2cb1 removes last log4net strings i can find 2018-08-27 16:49:54 +10:00
Sebastiaan Janssen
26e2bc6afa Merge pull request #2879 from umbraco/temp-u4-11599 
U4-11599 - do not abort inst processing on error
 2018-08-27 08:45:04 +02:00
Sebastiaan Janssen
546458bcfd Merge pull request #2322 from umbraco/validate-using-schema 
Updates sql to include current schema in queries
 2018-08-27 08:16:57 +02:00
Stephan
f2090e9fc7 U4-11599 - do not abort inst processing on error 2018-08-27 08:10:39 +02:00
Sebastiaan Janssen
46b0063921 Fixes U4-11598 Scheduling the content does not reload the page at the same time 2018-08-27 06:56:05 +02:00
Sebastiaan Janssen
7fd1617759 Merge branch 'dev-v7' into validate-using-schema 2018-08-26 23:13:08 +02:00
Sebastiaan Janssen
5e7c9f2341 Merge pull request #2876 from RNHornets/temp-u4-9030 
U4-9030 Moving a RTE between grid cells causes rendering issues for other RTEs
 2018-08-26 22:57:17 +02:00
Sebastiaan Janssen
bec8aabede Merge pull request #2442 from madsoulswe/temp-U4-10962 
U4-10962 - Disable stickyheader when nested, fix margins when disabled
 2018-08-26 22:17:44 +02:00
Sebastiaan Janssen
c07780caff Merge pull request #2481 from SaDa1337/dev-v7.9 
fix x alignment in colorpicker transparent option in umbraco skin
 2018-08-26 22:08:24 +02:00
Sebastiaan Janssen
0c3d3ca545 Merge pull request #2506 from PeteDuncanson/temp-U4-11074 
Added web.config to fonts folder to allow for caching out of the box
 2018-08-26 21:26:45 +02:00
Sebastiaan Janssen
35a0d4451f Merge pull request #2483 from kccsf/U4-4441 
U4-4441 Fix: TinyMCE overlay was showing in front of login overlay
 2018-08-26 21:01:58 +02:00
Sebastiaan Janssen
03fdba6a3b Merge pull request #2512 from NathalieLarsson/dev-v7 
Quick fix for U4-11085 and added filtering to list view in MNTP
 2018-08-26 20:51:53 +02:00
Sebastiaan Janssen
550c383598 Also make sure there's a value for dialogOptions.filterTypes if it doesn't start with "!" 
Else you get errors on `dialogOptions.filterTypes.toLowerCase()`
 2018-08-26 20:47:26 +02:00
Sebastiaan Janssen
9d3d718e16 Merge branch 'dev-v7' into dev-v7 2018-08-26 20:33:00 +02:00
Ben Palmer
b09bf518c6 U4-9237 Validate application parameter when getting application trees (#2315) 2018-08-26 18:12:07 +02:00
Sebastiaan Janssen
8666b222ac Merge pull request #2841 from leekelleher/U4-11556 
U4-11556 - Removed metablogConfig.config
 2018-08-26 18:04:50 +02:00
Sebastiaan Janssen
9e564d70ef Merge branch 'drpeck-U4-8550' into dev-v7 2018-08-26 17:57:00 +02:00
Sebastiaan Janssen
276810be6c Bump to v7.13.0 2018-08-26 17:56:13 +02:00
Sebastiaan Janssen
49df6e7c9d Merge branch 'U4-8550' of https://github.com/drpeck/Umbraco-CMS into drpeck-U4-8550 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/PublishedContentExtensions.cs
 2018-08-26 17:45:34 +02:00
Sebastiaan Janssen
16155ea416 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2018-08-26 17:25:18 +02:00
Sebastiaan Janssen
f183e27cae Merge branch 'jamescoxhead-U4-11166' into dev-v7 2018-08-26 17:24:18 +02:00
Sebastiaan Janssen
a411c9c300 Make sure inactive users get the correct state attached to them 2018-08-26 17:23:52 +02:00
Sebastiaan Janssen
342ac7b1b2 Merge branch 'U4-11166' of https://github.com/jamescoxhead/Umbraco-CMS into jamescoxhead-U4-11166 2018-08-26 16:52:58 +02:00
Sebastiaan Janssen
f5ac5f20a8 Merge pull request #2869 from Bazmech/temp-U4-11594 
U4-11594 HasFocalPoint in ImageCropDataSet does not return correct value
 2018-08-26 16:44:19 +02:00
Chris Houston
56de9ff4ae Fix for issue: U4 11409 - "Create content" tour is failing when doing the tour with the starter kit installed (#2851) 2018-08-26 14:52:14 +02:00
Mads Rasmussen
7fce9799e7 clear editorService and overlayService when a new user logs in 2018-08-24 21:06:48 +02:00