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

8921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
0955b0c474 fixes proj ref 2013-12-28 14:37:53 +11:00
Shannon
57d1ff20fd Improves test suite performance - this should shed a few minutes off of the test runs. 2013-12-28 14:35:43 +11:00
Shannon
fbdb1d5d6c Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception 
Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2013-12-28 14:01:08 +11:00
Shannon
b924b06062 Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-28 13:57:53 +11:00
Shannon
fb029861cf Fixes: U4-3942 Cannot configure the request if there is not content assigned - exception 2013-12-28 13:57:20 +11:00
perploug
4eb19bd26c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-27 22:03:30 +01:00
perploug
71a07060a9 removes debugging output from treesource preval editor 2013-12-27 21:55:59 +01:00
Shannon
edaa5ebd43 Lots more unit tests for the membership providers and some other fixups - have a new failing test as i need to sort out salting issue with encrypted passwords. 2013-12-24 14:03:18 +11:00
Shandem
c12b270511 Merge pull request #268 from james-melville/6.2.0 
Fixes: U4-3814 - 6.1.6 XSS vulnerability in backoffice
 2013-12-23 16:14:52 -08:00
Shannon
c8fa2b3880 Merge branch 'abjerner-patch-1' into 6.2.0 
Conflicts:
	src/Umbraco.Web/PublishedContentExtensions.cs
 2013-12-24 11:08:48 +11:00
Shannon
d474481cba publicizes MemberService so that devs can use the events on nightly builds for now. 2013-12-24 11:03:20 +11:00
Shannon
62e3ab27fe Adds comments to EntityController code to use UmbracoHelper 2013-12-24 10:58:11 +11:00
Shannon
86c008fc8c Merge branch '7.0.2' of https://github.com/umbraco/Umbraco-CMS into 7.0.2 2013-12-24 10:49:01 +11:00
Shannon
154ee39755 Fixes: U4-3907 Token cookie issues in 7.0.1 2013-12-24 10:48:32 +11:00
Shannon
63ca9f210b updates version # 2013-12-24 10:48:14 +11:00
Shannon
1c139b685a updates legacy membership provider to use efficient paging. 2013-12-20 18:12:54 +11:00
Shannon
7a8b3dc9bc Updated the member service/repo to have paged queries and results which use db paging for maximum efficiency (of course only works for things like email, username but those are 2 specific things that are needed by the membership provider) 2013-12-20 18:11:12 +11:00
Shannon
a4dde1948f Implements the member count methods on the member service and adds unit tests. 2013-12-20 16:20:32 +11:00
Shannon
0f68818a19 Updated member service with the newer property value queries and added unit tests for all of them 2013-12-20 15:44:53 +11:00
Shannon
414b65b269 More WIP on the membership providers - both new and old. They are now both working with the same up-to-date logic and base classes. Updated the interface definitions on the member services to support the membership provider queries - now to implement the logic. 2013-12-20 14:01:10 +11: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
Stephan
4dbe317c03 Merge pull request #274 from esn303/U4-3908 
Fix for U4-3908 YSOD on frontend after being logged out
 2013-12-19 01:54:24 -08:00
Marc
dc727ba0de Fix for U4-3908 YSOD on frontend after being logged out 2013-12-19 10:41:44 +01:00
Shannon
2dd04799b2 WIP membership provider updates 2013-12-19 18:33:25 +11:00
esunxray
1c901e00cc Update zh.xml 
add line <key alias="resetPassword">重设密码</key>
 2013-12-19 14:53:50 +08: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