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

15961 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
24fed0de2e removes ISqlHelper usages from Web project 2016-03-17 10:35:02 +01:00
Shannon
9ac2d04aea User and User type from the old businesslogic assembly are GONE! 2016-03-16 17:52:08 +01:00
Shannon
f594a1132d Remove IMediaFactory 2016-03-16 15:56:52 +01:00
Shannon
3b191239be Removes all usages of UserType 2016-03-16 15:55:26 +01:00
Shannon
e1f17e848d moves the legacy serialization classes for the super old XmlTree format into Web proj so we can remove the businesslogic DLL first, we'll get to removing those classes later as it will be a bit tricky. 2016-03-16 15:29:08 +01:00
Shannon
88504306ca fixes merge 2016-03-16 15:14:00 +01:00
Shannon
d37d31246e Merge remote-tracking branch 'origin/dev-v7' into dev-v8 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Tests/Persistence/SyntaxProvider/MySqlSyntaxProviderTests.cs
	src/Umbraco.Web.UI/umbraco/create/content.ascx
	src/Umbraco.Web.UI/umbraco/create/member.ascx
	src/Umbraco.Web.UI/umbraco/create/nodeType.ascx
	src/Umbraco.Web/PropertyEditors/TrueFalsePropertyEditor.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/Security/Identity/BackOfficeCookieManager.cs
	src/Umbraco.Web/Strategies/Migrations/ClearMediaXmlCacheForDeletedItemsAfterUpgrade.cs
	src/Umbraco.Web/Strategies/Migrations/PublishAfterUpgradeToVersionSixth.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/settings/stylesheet/editstylesheet.aspx.cs
 2016-03-16 15:02:53 +01:00
Shannon
2cc709c460 Removes StateHelper!! Adds a few cookie extensions and http extensions to more easily replace. 2016-03-16 14:59:21 +01:00
Shannon Deminick
fc7cfea4ad Merge pull request #1179 from umbraco/temp-U4-8175 
U4-8175 - fix PropertyType.PropertyGroupId inconsistencies
 2016-03-16 14:18:03 +01:00
Stephan
bc5f651c64 U4-8154 - bugfix test 2016-03-16 13:46:51 +01:00
Stephan
ecdca378c6 U4-8175 - fix PropertyType.PropertyGroupId inconsistencies 2016-03-16 13:41:58 +01:00
Stephan
4628c1f858 U4-8154 - bugfix test 2016-03-16 13:16:56 +01:00
Shannon Deminick
5af4d02f44 Merge pull request #1177 from umbraco/temp-U4-7109 
U4-7109 - could not change language in Culture and Hostnames
 2016-03-16 10:48:35 +01:00
Shannon
2f9b526465 Only apply preview auth if Umbraco is fully configured 2016-03-16 10:41:33 +01:00
Stephan
800e02bccf Bugfix model mapper for PropertyTypeDisplay 2016-03-16 10:19:06 +01:00
Shannon Deminick
693b0dba24 Merge pull request #1161 from umbraco/temp-U4-4219 
U4-4219 Can't Preview protected pages
 2016-03-16 10:18:06 +01:00
Stephan
2004f6a51e U4-8154 - bugfix 2016-03-16 10:10:31 +01:00
Claus
f650b6238c Merge branch 'arknu-U4-8026' into dev-v7 2016-03-16 07:57:59 +01:00
Claus
7c179a7868 U4-8026 Fixes up unit tests 2016-03-16 07:56:41 +01:00
Shannon
cbb06dcfe1 umbraco.ui is GONE :) 2016-03-15 19:54:21 +01:00
Stephan
0cf6548f86 U4-7109 - could not change language in Culture and Hostnames 2016-03-15 17:26:05 +01:00
Sebastiaan Janssen
111ee66b60 Update ModelsBuilder dependency for the NuGet package 2016-03-15 17:15:39 +01:00
Shannon
0636ea0b16 fix build 2016-03-15 16:59:01 +01:00
Shannon
b98277f573 remore ui replacements 2016-03-15 16:58:13 +01:00
Shannon
fb5e998e1f remore ui replacements 2016-03-15 16:39:17 +01:00
Stephan
fedcd6f970 Merge pull request #1176 from umbraco/temp-U4-8168 
U4-8168 Cannot re-order/move locked property types - such as the lock…
 2016-03-15 16:29:57 +01:00
Stephan
8e82ff5450 Merge pull request #1173 from umbraco/temp-U4-8012 
U4-8012 Generic properties tab disappears on the edit Member Type win…
 2016-03-15 16:24:21 +01:00
Stephan
81459c3659 Merge pull request #1174 from umbraco/temp-U4-8065 
U4-8065 Inherited from is empty - reverts 10617d1bd52bdac57534a7d7b8…
 2016-03-15 16:08:26 +01:00
Rune Hem Strand
8907c9855b Merge pull request #1172 from umbraco/temp-U4-7185 
Temp u4 7185
 2016-03-15 16:02:47 +01:00
Stephan
e1bf30ec26 Merge pull request #1175 from umbraco/temp-U4-8106 
U4-8106 Content type inheritance can be broken by compositions
 2016-03-15 15:53:37 +01:00
Shannon
6bb9c5b81c U4-8168 Cannot re-order/move locked property types - such as the locked/system member type properties 2016-03-15 15:43:21 +01:00
Shannon
6aafbfb245 U4-8106 Content type inheritance can be broken by compositions 2016-03-15 15:25:05 +01:00
Shannon
d5fe8c11c8 U4-8065 Inherited from is empty - reverts 10617d1bd5, turns out this is why we needed that property value 2016-03-15 15:08:53 +01:00
Shannon
3fdb122e91 U4-8012 Generic properties tab disappears on the edit Member Type window after upgrade to 7.4 2016-03-15 14:44:03 +01:00
Shannon Deminick
710dda164f Merge pull request #1166 from umbraco/temp-U4-7708 
U4-7708 Using a RTE Macro Partial Form (SurfaceController) & Doctype …
 2016-03-15 13:57:27 +01:00
Claus
07d0d82bd1 Merge branch 'U4-8026' of git://github.com/arknu/Umbraco-CMS into arknu-U4-8026 2016-03-15 13:47:10 +01:00
Claus
91eb3ea59e Merge pull request #1152 from AndyButland/u4-7888 
Fixed U4-7888 - Cannot change default template for document type
 2016-03-15 13:43:07 +01:00
Rune Strand
096f1b6ff9 add selected state to umbFolderGrid 2016-03-15 13:18:48 +01:00
Rune Strand
f24c0d3e7a Update umbBreadcrumb to use custom controller 2016-03-15 13:18:48 +01:00
Rune Hem Strand
104338c817 A little bit of foldergrid+ 2016-03-15 13:18:48 +01:00
Mads Rasmussen
568f098445 umbOverlay first draft 2016-03-15 13:18:48 +01:00
Mads Rasmussen
f46d595f00 fix example on umbStickyBar 2016-03-15 13:18:48 +01:00
Mads Rasmussen
46826ad590 add docs for umbPagination 2016-03-15 13:18:48 +01:00
Mads Rasmussen
a8bd34b77e add docs for umbMediaGrid 2016-03-15 13:18:48 +01:00
Mads Rasmussen
40774cfff2 rename umbContentGrid controller 2016-03-15 13:18:48 +01:00
Mads Rasmussen
5dde898205 change controller name on umbGenerateAlias 2016-03-15 13:18:48 +01:00
Mads Rasmussen
249287e101 fix umbKeyboardShortcutsOverview example 2016-03-15 13:18:48 +01:00
Mads Rasmussen
3e458e2ba6 add documentation for umbEmptyState 2016-03-15 13:18:48 +01:00
Mads Rasmussen
4f293a8be1 fix umbTooltip example 2016-03-15 13:18:48 +01:00
Mads Rasmussen
3b9d9ab8c4 change umbChildSelector controller name 2016-03-15 13:18:48 +01:00