yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,050 Commits 4 Branches 7 Tags
68ba0ca1e2e2ac0c7d6ddcc7191bf835fa9b26ee
Commit Graph

5152 Commits

Author SHA1 Message Date
Claus
cfa7b0a092 U4-10124 Update IFileService to handle MacroScripts and UserControls 2017-07-06 10:44:51 +02:00
Claus
ca752f74bc updating array length. 2017-07-04 17:29:32 +02:00
Claus
b840a0992c adding shadow filesystems. 2017-07-04 14:47:29 +02:00
Claus
51997d0651 U4-10098 Update FileService to support legacy MacroScript and UserControl folders 2017-07-04 14:28:15 +02:00
Claus
f0f25c67c6 refactoring method signatures to prevent breaking changes. 2017-06-29 10:00:16 +02:00
Claus
da8c0726b1 Merge branch 'U4-5454' of git://github.com/trt/Umbraco-CMS into temp-U4-5454 2017-06-29 08:59:45 +02:00
Shannon Deminick
7adbecf9a1 Merge pull request #2019 from lars-erik/U4-6695-internalsvisibleto-unittesting-adapter 
U4-6695 Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter")
 2017-06-27 10:06:36 +10:00
Lars-Erik Aabech
f9252372ea Adds InternalsVisibleTo("Umbraco.UnitTesting.Adapter") for more imperative exposure to custom unit test adapters. 2017-06-26 12:39:57 +02:00
Claus
22af206626 Merge branch 'temp-U4-9464' of git://github.com/benjaminketron/Umbraco-CMS into benjaminketron-temp-U4-9464 2017-06-26 11:23:24 +02:00
Sebastiaan Janssen
af382c171b Merge pull request #2009 from umbraco/temp-U4-10034 
U4-10034 Package install may not wait for app domain restart in all cases
 2017-06-22 11:22:18 +02:00
Stephan
0bd233815e deploy-348 - add support for languages 2017-06-22 10:04:48 +02:00
Sebastiaan Janssen
8681d535f2 Merge pull request #2010 from umbraco/temp-U4-10035 
Turns out when we empty the recycle bin we weren't removing associate…
 2017-06-21 11:51:47 +02:00
Stephan
1a435148d8 U4-10026 - inject idkmap 2017-06-20 08:55:08 +02:00
Shannon
1f6f8df5b5 Turns out when we empty the recycle bin we weren't removing associated cmsTask info. This also adds a null check since a SingleOrDefault call can return null. I've only seen this cause a problem when there is corrupt data but it should still be checked. 2017-06-19 23:48:18 +10:00
Shannon
7920383904 U4-10034 Package install may not wait for app domain restart in all cases 2017-06-19 23:02:06 +10:00
Stephan
464711d3c8 U4-10026 - use id-key map for getting by guid 2017-06-16 14:09:20 +02:00
Shannon Deminick
2fd383960d Merge pull request #1997 from umbraco/temp-U4-10014 
U4-10014 Making package install events public
 2017-06-14 22:41:11 +02:00
Mikkel Holck Madsen
c0616a37bf Merge pull request #1999 from umbraco/temp-tryAscii 
Enable trying to convert urls to ascii
 2017-06-14 10:12:58 +02:00
Shannon Deminick
08c4a75af7 Merge pull request #1945 from protherj/U4-9792-fips-support 
U4-9792 -- Update Umbraco to be FIPS compliant
 2017-06-13 15:05:21 +02:00
Claus
308c381e17 U4-10014 Making package install events public 2017-06-13 13:28:23 +02:00
Jason Prothero
917a2b78dd Added RFC 4122 compliant GUID support to the ToGuid() method on StrringExtensions.cs. Verified the SHA1 hash works with the ToGuid() method via unit tests. 2017-06-12 13:44:42 -07:00
=
7f75802e4e allow DecimalValueConverter to understand signs in the front of the number. wonder if this could be more configurable as there are many other options avaialble." 2017-06-06 22:18:12 -06:00
Niels Hartvig
1b844421fc Updates to installer to use the new starter kit (and updates core version) 2017-06-04 20:47:33 +02:00
Sebastiaan Janssen
1164f1cdbb Merge branch 'dev-v7' into temp-U4-9980 2017-06-04 14:55:03 +02:00
Niels Hartvig
7f05b80a22 Make Seb happy 2017-06-04 14:02:05 +02:00
Niels Hartvig
20239a9b71 Adds a null check to avoid breaking tests (and to comform to coding standards) 2017-06-04 14:00:51 +02:00
Sebastiaan Janssen
c4b07cc3ae Merge pull request #1974 from umbraco/temp-U4-9980 
Adds support for keys in package content
 2017-06-03 18:36:28 +02:00
Sebastiaan Janssen
771935b8a5 Update PackagingService.cs 2017-06-03 18:36:00 +02:00
Niels Hartvig
73bb401f81 Updating to TryParse to make Sir Janssen happy :-) 2017-06-03 18:34:09 +02:00
Niels Hartvig
8ccbe4c1e4 Adds support for keys in package content 2017-06-03 17:34:31 +02:00
Stephan
a50256d381 Enable trying to convert urls to ascii 2017-06-01 17:58:22 +02:00
Sebastiaan Janssen
7e6f7f8a2b Bumps version 2017-06-01 13:04:31 +02:00
Sebastiaan Janssen
72404e68a0 Merge pull request #1968 from umbraco/temp-u4-9927 
U4-9927 - fix migration
 2017-05-31 16:36:42 +02:00
Sebastiaan Janssen
2c451c5cfe Remove debug tracing 2017-05-31 16:29:26 +02:00
Stephan
af7f83f0f6 U4-9927 - fix migration 2017-05-31 15:49:15 +02:00
mikkelhm
b0a739b4ac Bump version to 7.6.2 2017-05-29 15:07:37 +02:00
Mikkel Holck Madsen
28adbc17ef Merge pull request #1963 from umbraco/temp-deploy-324 
deploy-324 - fix udi encoding
 2017-05-26 13:14:29 +02:00
Sebastiaan Janssen
08eab00627 Adds GetIdForUdi method to IEntityService 2017-05-25 10:48:28 +02:00
Stephan
51186bea24 deploy-324 - fix udi encoding 2017-05-24 11:20:01 +02:00
Sebastiaan Janssen
71db33f4cd Merge pull request #1955 from umbraco/dev-v7.6 
Oops, wrong branch was targetted for U4-9908
 2017-05-20 12:30:56 +02:00
Sebastiaan Janssen
cf7c0dffb0 Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558 2017-05-20 11:48:47 +02:00
Claus
79844154fb U4-9919 Updated media files are deleted 2017-05-18 11:30:11 +02:00
Warren Buckley
120cb964a5 Merge pull request #1949 from umbraco/temp-u4-9926 
U4-9926 - fix partial view macro udis
 2017-05-17 13:39:48 +01:00
Stephan
147a1daf6d U4-9926 - fix partial view macro udis 2017-05-17 12:09:28 +02:00
Shannon
9badb35c05 fix merge issue 2017-05-17 20:08:53 +10:00
Shannon
765decf3b1 Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
#	src/Umbraco.Web/Trees/PartialViewsTree.cs
 2017-05-17 20:00:29 +10:00
mikkelhm
69775c369a Bump version to 7.5.14 2017-05-16 08:33:19 +02:00
Stephan
02136d3060 U4-9908 - fix scope-related issues 2017-05-16 08:09:11 +02:00
Claus
5dc3e0a3fc Merge pull request #1880 from marcemarc/temp-U4-9765 
debug logging when there is a distributed calls config issue
 2017-05-15 10:28:26 +02:00
Jason Prothero
d8811d6b46 Refactored code for FIPS compliance support. Added/converted to using a more generic Hash() method instead of directly using MD5. 2017-05-10 13:35:28 -07:00