yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
8,782 Commits 4 Branches 7 Tags
71a07060a9eadbd97bcbe2361b689e83d87967f5
Commit Graph

6634 Commits

Author SHA1 Message Date
perploug
71a07060a9 removes debugging output from treesource preval editor 2013-12-27 21:55:59 +01:00
perploug
28c2aa1195 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-19 11:32:17 +01:00
perploug
391c778b80 Minor refactor of treesource internal model 2013-12-19 11:32:09 +01:00
perploug
f2c2b7590b Get Entity by Query WIP 2013-12-19 11:31:55 +01:00
perploug
22d6981ab0 Fixes small issue with language loading 2013-12-19 11:06:10 +01:00
Marc
dc727ba0de Fix for U4-3908 YSOD on frontend after being logged out 2013-12-19 10:41:44 +01:00
Shannon
d7207f7c2a Fixes some merge issues 2013-12-19 16:09:33 +11:00
Shannon
a5828a2c3e Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/controls/GenericProperties/GenericProperty.ascx
 2013-12-19 15:59:50 +11:00
Shandem
c589c741e8 Merge pull request #220 from leekelleher/U4-2006 
Fixes: U4-2006 Domain.GetDomain(string DomainName) is case-sensitive
 2013-12-18 20:56:03 -08:00
Shandem
c8923cbc27 Merge pull request #221 from AnthonyCogworks/U4-2272 
Replaced HttpContext.Current.Cache with HttpRuntime.Cache
 2013-12-18 20:54:57 -08:00
Shandem
063f405a06 Merge pull request #230 from Yawka/U4-2772 
U4 2772
 2013-12-18 20:51:17 -08:00
Shannon
68a25bb5b1 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 15:50:03 +11:00
Shandem
addfbcf2a7 Merge pull request #232 from Yawka/U4-2034 
U4 2034
 2013-12-18 20:48:52 -08:00
Shandem
8ee133bb75 Merge pull request #239 from OptimisticCoder/U4-451 
U4-451 Inconsistent line endings in template files created by Umbraco
 2013-12-18 20:46:46 -08:00
Shandem
fa1185cbd8 Merge pull request #241 from OptimisticCoder/U4-3039 
U4-3039 Import Document Type leaves files in App_Data
 2013-12-18 20:43:15 -08:00
Shandem
68e0a414a0 Merge pull request #245 from esn303/patch-1 
Fixed minor typos
 2013-12-18 20:39:43 -08:00
Shannon
6ddef7df27 Merge branch 'esn303-patch-2' into 7.0.2 2013-12-19 15:36:59 +11:00
Shannon
66f572b642 Merge branch 'patch-2' of https://github.com/esn303/Umbraco-CMS into esn303-patch-2 2013-12-19 15:36:44 +11:00
Shannon
a7a1730898 Merge branch 'kalletoxic-7.0.0' into 7.0.2 2013-12-19 15:31:26 +11:00
Shannon
155e7338cf Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/autolink/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/plugins/table/editor_plugin_src.js
	src/Umbraco.Web.UI/umbraco_client/tinymce3/tiny_mce_popup.js
 2013-12-19 15:30:17 +11:00
Shandem
89860bd786 Merge pull request #261 from esunxray/patch-1 
Update zh.xml
 2013-12-18 20:26:48 -08:00
Shandem
b5cfefa052 Merge pull request #265 from Jeavon/U4-3247 
Fixes U4-3247 - TinyMce v3 doesn't work with IE11
 2013-12-18 20:22:19 -08:00
Shannon
b2c0f3c35a some file formatting 2013-12-19 15:21:02 +11:00
Shannon
d5e0c6ff68 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	.gitignore
	src/Umbraco.Tests/PublishedContent/PublishedContentExtensionTests.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.designer.cs
	src/Umbraco.Web.UI/umbraco/editContent.aspx
	src/Umbraco.Web.UI/umbraco/login.aspx
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoDialog.Master
	src/Umbraco.Web.UI/umbraco/masterpages/umbracoPage.Master
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
 2013-12-19 15:08:19 +11:00
Shannon
a43f4b7b7f Completes: U4-1521 Updated back office to use ClientDependency bundles for common files 2013-12-19 15:05:05 +11:00
Shandem
7ce3949852 Merge pull request #209 from ProNotion/U4-1521 
U4 1521
 2013-12-18 18:37:02 -08:00
Shandem
4862419744 Merge pull request #198 from craigacronin/U4-1891 
Fixed as per issue comments, but also implemented for another 3 overload...
 2013-12-18 18:33:57 -08:00
Shannon
6b810c89f6 un-ignores PublishedContentExtensionTests 2013-12-19 13:28:17 +11:00
Shandem
89b0a2fd89 Merge pull request #170 from lars-erik/6.2.0_fix_publishedcontentextensiontests_sidebysidefriendly 
Should make the PublishedContentExtensionTests green when ran together w...
 2013-12-18 18:25:38 -08:00
Shannon
73c479c843 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 13:23:22 +11:00
Shannon
8aceae9880 re-formats some code, simplifies calls using InvariantEquals extension method 2013-12-19 13:22:33 +11:00
Shandem
384d4d60f1 Merge pull request #168 from stevetemple/6.1.6-multiple-action-route-issue 
Fix error when multiple routes have the same controller
 2013-12-18 18:18:44 -08:00
Shannon
67caf81a74 adds a couple of null checks. 2013-12-19 13:14:38 +11:00
Shannon
763ab26446 Updates packaging service to not export empty properties. 2013-12-19 13:13:13 +11:00
Shannon
67a8fa5f07 Merge branch 'wtct-U4-3091' into 6.2.0 2013-12-19 13:05:27 +11:00
Shannon
f7b61d09e2 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Profiling/ProfilingViewEngine.cs
 2013-12-19 12:53:32 +11:00
Shannon
5c59317bf8 changes casing of col names 2013-12-19 12:52:37 +11:00
Shannon
a2ec53dd4f Merge branch 'wtct-U4-3071' into 6.2.0 2013-12-19 12:50:42 +11:00
Shannon
db78c78df2 fixes some merge issues with view engine wrapping PR. 2013-12-19 12:45:46 +11:00
Shannon
4558549d5a Fixes appendformat issue 2013-12-19 12:40:41 +11:00
Shannon
d98801d5d1 Merge branch '6.2.0' of https://github.com/mortenbock/Umbraco-CMS into mortenbock-6.2.0 
Conflicts:
	src/Umbraco.Web/WebBootManager.cs
 2013-12-19 12:35:33 +11:00
Shandem
de9ecf6afc Merge pull request #143 from IDisposable/patch-1 
Added contextualKeyBuilder optional argument to allow the key used for cachin...
 2013-12-18 17:32:26 -08:00
Shandem
702790bf77 Merge pull request #144 from IDisposable/patch-2 
Make CacheHelperExtensions public so we can call CachedPartialView and C...
 2013-12-18 17:30:01 -08:00
Shannon
3a1dbc778b Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-19 12:29:02 +11:00
Shannon
c912e80134 modified media service tests to not have to create data in teh base tests 2013-12-19 12:27:21 +11:00
Shannon
098c856138 Merge branch '6.2.0' of https://github.com/sniffdk/Umbraco-CMS into sniffdk-6.2.0 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-19 12:11:33 +11:00
Shannon
b45306e1ff Merge branch '6.2.0' of https://github.com/dprothero/Umbraco-CMS into dprothero-6.2.0 
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
 2013-12-19 11:59:22 +11:00
Shannon
3499f39970 Merge branch 'kipusoep-patch-1' into 6.2.0 2013-12-19 11:49:30 +11:00
Shannon
4fb61be092 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 2013-12-19 11:46:59 +11:00
Shannon
9115aa1a6d merge issue with proj file 2013-12-19 11:46:31 +11:00