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

921 Commits

Author SHA1 Message Date
Shannon
da48e1b392 Fixes: U4-6962 Public access in multiple levels is broken in 7.3 
Ensured the backoffice UI will look at protection for the specific node only (no inheritance) when specifying public access.
Added non-recursive method to Access class.
Fixed bug causing the tree (child nodes) not to update correctly after changing public access on nodes.
 2015-10-21 18:43:30 +02:00
Shannon
c514ce8da3 Fixes: U4-7248 Can't update roles on public access, obsolete AddOrUpdateRule 2015-10-15 17:06:00 +02:00
Stephan
7848ea5ec0 U4-7038 - IPublishedContentWithKey for contents, members 2015-09-01 15:00:27 +02:00
Shannon
05aa2aeb75 refactors new IDomainService to return attempt+status and raise events using event messages. 2015-08-27 18:43:54 +02:00
Shannon
4a59c27793 Refactors new IPublicAccessService to return Attempt+Result so we know what happened, also ensures events are firing with msgs (events were not firing at all before). 2015-08-27 18:33:38 +02:00
Shannon
4c20441c4e Fixes: U4-6915 Txt Starter Kit install fails on 7.3.0 beta3 2015-08-05 17:17:49 +02:00
Shannon
7869f77704 Fixes up deleting templates, fixes up legacy template code to ensure things are saved when they are updated 2015-08-05 15:00:28 +02:00
Shannon
05d84c6673 updates the operation status to return the event messages used when raising events 2015-08-04 14:52:34 +02:00
Sebastiaan Janssen
d87b268a40 Update to MVC5 2015-07-30 17:08:39 +02:00
Sebastiaan Janssen
51eae92a5a Update json.net everywhere 2015-07-27 16:11:18 +02:00
Shannon
16c9ca9e4b Refactors IDomain model, simplifies it so that it doesn't contain references, simplifies the domain repository to no longer require lookups of content and languages, updates all other code referencing IDomain and now if a language lookup is required it is made when appropriate. 2015-07-27 12:53:09 +02:00
Sebastiaan Janssen
86ad3f6b05 Makes sure that R# doesn't suggest C#6 features 2015-07-24 17:25:52 +02:00
Tom Fulton
195953d63c Fix backoffice breaking when Actions use code in their JsSource - U4-6843 
This reverts/refactors this pull request: https://github.com/umbraco/Umbraco-CMS/pull/722/files

Since JsSource can be used for a file path or actual javascript, we can't use IOHelper.ResolveUrl here.  Instead we're moving it to the GetLegacyActionJs() method, which already handles deciding if it's a code or a URL.

💩
 2015-07-15 16:59:09 -06:00
Stephan
db0cfad6b9 Merge 7.2.7 into dev-v7 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
 2015-07-14 19:57:56 +02:00
Sebastiaan Janssen
a7871abbd9 Update Examine and ClientDependency to latest version 2015-07-14 16:50:45 +02:00
Shannon
d00bf4649d Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346 
Conflicts:
	src/umbraco.cms/Actions/Action.cs
 2015-07-08 11:10:18 +02:00
Shannon
d63f83f7c7 Fixes: U4-6786 Update to CDF 1.8.4 2015-07-03 11:40:41 +02:00
Shannon
f68cdf43e1 Fixes: U4-6099 cmsLanguageText.languageId needs to be a foreign key to the umbracoLanguage table 2015-07-02 17:19:42 +02:00
Shannon
f0742c9d7c Fixes: U4-6733 Adding dictionary item (7.3): No parent dictionary item was found with id 41c7638d-f529-4bff-853e-59a0c2fb1bde 2015-07-02 14:52:01 +02:00
Tom Fulton
cb6b8434f0 Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346 2015-06-22 16:12:13 -04:00
Shannon
20e265491f Updates to latest AutoMapper and HtmlAgility 2015-06-16 10:19:34 +02:00
Damiaan
4f02a13a46 U4-5559 Fix Typo "Build-In" (Code) 2015-06-15 16:07:45 +02:00
Shannon
3fbf90e56d Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-06-03 15:08:47 +02:00
Shannon
ff277cd99c Fixes: U4-6654 NullReferenceException downloading translation xml 2015-06-02 21:13:29 +02:00
Stephan
910c349f7c Bugfix StyleSheet concatenation causing LOH GC issues 2015-05-20 17:00:32 +02:00
Shannon
25f9fecc16 Completes: U4-1979 Some legacy business logic APIs do not wrap the new Service APIs - gets permissions wrapped too 2015-05-18 19:34:01 +10:00
Shannon
76a10fc776 Works on: U4-1979 Some legacy business logic APIs do not wrap the new Service APIs. Deprecates the ctor passing in a parent id for the data type (since it's always -1). Wraps legacy DataTypeDefinition to use the new services layer. 2015-05-18 16:06:22 +10:00
Shannon
64cbeb4c9d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/EntityService.cs
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
	src/Umbraco.Web/Cache/TemplateCacheRefresher.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2015-05-13 12:20:43 +10:00
Shannon
3a36513307 Fixes: U4-6609 SQL Exception when trying to delete a template that isn't assigned to any doc type 2015-05-12 17:59:06 +10:00
Shannon
d2deaf0375 Fixes MVC references and updates to 4.0.0.1 2015-05-11 12:43:45 +10:00
Shannon
95ff94c532 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/packages.config
 2015-05-11 12:26:53 +10:00
Shannon
a4a49b1466 Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC. 2015-05-11 11:45:13 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Shannon
1cac4ed075 Fixes MVC 4.0.0.1 problem once and for all. 2015-05-07 08:10:45 +10:00
Shannon
2f9753cc12 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.macroRenderings/app.config
 2015-05-05 12:27:01 +10:00
Sebastiaan Janssen
be065b2fa3 Generate symbols nupkg (apparently you can create it from an existing NuSpec file, very cool) 
Making sure that all pdbs ARE actually generated in Release mode (the AllBinaries file was missing loads of files)
Generate all and include all xml doc files too
Corrects WebPI zip, also shouldn't include dotLess.Core.dll
 2015-05-01 14:27:26 +02:00
Shannon
ff602da0fa Updates owin packages and updates the web.config tempate for owin redirects 2015-04-01 13:41:45 +11:00
Shannon
a2a8c8fbd7 updated to latest owin 2015-04-01 13:41:36 +11:00
Shannon
f15301a7a0 Merge remote-tracking branch 'origin/dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-03-20 08:26:16 +11:00
Sebastiaan Janssen
311d503d8b Updates CDF dependency to latest version 2015-03-19 12:54:00 +01:00
Shannon
d3eff734aa Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
	src/Umbraco.Core/Services/LocalizedTextService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Plugins/TypeFinderTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Models/ContentExtensions.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-03-19 17:37:00 +11:00
Shannon
fe40b8fe99 ok, fixes the null check for real this time. 2015-03-09 17:53:58 +11:00
Shannon
b3f6f48834 fixes ugly null check on ContentTypeSort comparison 2015-03-09 16:42:30 +11:00
Stephan
a7075422dc Fix build 2015-03-05 12:29:04 +01:00
Shannon
0ae1453fb1 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/umbraco.cms/businesslogic/Dictionary.cs
 2015-02-23 13:18:01 +01:00
Shannon Deminick
8c13b89c79 Merge pull request #637 from xumix/6.2.5 
Fix dictionary key access
 2015-02-20 09:36:20 +01:00
Shannon
5342d819d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-02-18 17:40:29 +01:00
Shannon
b2399e97cc updates cdf refs 2015-02-18 17:39:33 +01:00
Vilen Tambovtsev
03969fd687 Fix dictionary key access 
Looks like someone does not know how to use a dictionary
 2015-02-13 12:21:16 +03:00
Stephan
0c5acb7f32 Implement IContent.HasPublishedVersion 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
 2015-02-10 15:39:12 +01:00