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

622 Commits

Author SHA1 Message Date
Stephan
185e5d9b7f Create missing ITemplate TemplateMapper 2014-09-08 08:52:09 +02:00
Shannon
202f582661 Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it. 2014-09-01 18:06:24 +10:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
65a2b79189 Moves PartialView save/delete to the FileService 2014-08-18 17:47:55 +02:00
Stephan
0a321e37fc Merge branch '7.1.5' into 7.1-4931 2014-08-05 18:15:51 +02:00
Stephan
4814fb3e96 U4-5276 - get package installer to respect binding redirects 2014-08-05 18:07:50 +02:00
Stephan
53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
Stephan
5165d70fbb Merge branch '7.1.5' into 7.1-4931 2014-07-25 11:05:31 +02:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07:00
Shannon
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07:00
Shannon
b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-22 16:15:02 -07:00
Shannon
a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon
217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Stephan
cc6099c953 U4-4931 - fixing & refactoring 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/CacheHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/HttpRequestCacheProviderTests.cs
 2014-07-10 10:39:28 +02:00
Stephan
fcd7e9517d U4-4931 - fixing & refactoring 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/DictionaryCacheWrapper.cs
	src/Umbraco.Core/Cache/DictionaryItemWrapper.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2014-07-10 10:37:15 +02:00
Shannon
080bf7293d replaces the tuple collection for bulk permission assignment to use a new model: EntityPermissionSet 2014-07-10 12:11:47 +10:00
Shannon
8645e0b193 Fixes: U4-5140 Tags are not respected with bulk publish operations - just need to ensure all tests are passing and run some local tests 2014-07-01 12:53:07 +10:00
Shannon
1e1d49f305 fixes U4-5140 Package installation for content does not respect tags, however need to check with Morten if it's required because if we never actually publish content on package install then this wouldn't really matter. But surely we must publish on package install for some thing because starter kits are published... hrm. 2014-06-30 16:43:51 +10:00
Morten Christensen
48143bc0c3 Minor updates to the Package installation and extraction as part of PR #417 2014-06-27 12:37:56 +02:00
Morten Christensen
75c26e4d92 Merge pull request #417 from netmester/package_installer_service 
Package installer service
 2014-06-27 10:58:10 +02:00
Shannon
2ccec3be33 Merge remote-tracking branch 'origin/6.2.1' into 7.1.5 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/LegacyScheduledTasks.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/publishingService.cs
 2014-06-23 15:08:04 +10:00
Shannon
e8f7f77bb6 Fixes: U4-581 Automatic publishing not working in load balanced setup - added some more convention and configuration to distributed calls so that servers are aware of the master and how to call into themselves for scheduled tasks, ping and scheduled publishing. Will need to update the docs on LB regarding this too. Cleaned up the code that does the scheduling and separates it into proper segments. Obsoletes the old presentation classes that were doing it. 2014-06-20 14:34:21 +10:00
jakobdyrby
7b48a59ca2 added events 2014-06-17 07:06:07 +02:00
jakobdyrby
3c6bf1ce92 Removed some complex objects that didn't need to be complex 2014-06-16 12:13:01 +02:00
jakobdyrby
dfb08b9ec7 Removed IStyleSheet 2014-06-16 12:13:00 +02:00
jakobdyrby
bb71efd4fa Move moving classes around 2014-06-16 12:12:57 +02:00
jakobdyrby
32ed0de4f6 Moved and renamed classes to fit standard 2014-06-16 12:12:55 +02:00
jakobdyrby
95ff1a03fb some renaming 2014-06-16 12:12:53 +02:00
jakobdyrby
c0b22c4349 renamed a class 2014-06-16 12:12:53 +02:00
jakobdyrby
cb5fa8ac13 Removed "double" file 2014-06-16 12:12:49 +02:00
jakobdyrby
889736f63b now loosely testet. 2014-06-16 12:12:47 +02:00
jakobdyrby
acc6d46b4b splittet into more single resposebility classes 2014-06-16 12:12:45 +02:00
jakobdyrby
d57c572116 moved strings to constants 2014-06-16 12:12:44 +02:00
jakobdyrby
45076491cb Added new PackagingService 2014-06-16 12:12:43 +02:00
Stephan
d9374c34d1 Add IPropertyValueConverterMeta interface 
Conflicts:
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2014-06-09 15:31:35 +02:00
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Shannon
34dcde645c Half completes: U4-2462 Does the app_plugins manager monitor file changes? 2014-06-08 19:05:48 +02:00
Shannon
d0cb27d1c1 Completes: U4-2633 Bundle all cache refresher transmissions into a single call per request for much better performance 2014-06-08 12:49:20 +02:00
Shannon
e8990eb6b2 Merge commit 'beb1979b4655a529b703ceec094a50f6a3dd8602' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/config/umbracoSettings.config
 2014-06-08 12:24:29 +02:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Stephan
32b7871eaf Rename PublishedContentModelFactoryImpl 2014-05-19 13:01:49 +02:00
Stephan
28da44f0de Refactor PublishedContentModelFactory 2014-05-18 21:31:53 +02:00
Shannon
1c7d83f589 Undoes the comma encoding for tags and istead adds support to store the tags as json or csv (U4-4741) 2014-05-15 12:49:03 +10:00
Shannon
d1e9fb6d9f re-fixes Core proj since it would not build 2014-05-14 09:42:34 +10:00
Stephan
c9961b5192 Fix Umbraco.Core project (missing files, would not build) 2014-05-13 15:24:36 +02:00
Shannon
36c7fd53cb Fixes merge issues with left over IPublishedContentProperty 2014-05-05 13:21:18 +10:00
Shannon
3df2d03fc8 Merge remote-tracking branch 'origin/6.2.0' into 7.1.2 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedContent/IPublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentExtended.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedContentWrapped.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyBase.cs
	src/Umbraco.Core/Models/PublishedContent/PublishedPropertyType.cs
	src/Umbraco.Core/Models/Template.cs
	src/Umbraco.Core/Persistence/Migrations/MigrationRunner.cs
	src/Umbraco.Core/Persistence/Repositories/MemberGroupRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/RecycleBinRepository.cs
	src/Umbraco.Core/Services/PackagingService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentMoreTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedFragment.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlPublishedContent.cs
	src/Umbraco.Web/PublishedContentPropertyExtension.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/CompatibilityHelper.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.cms/businesslogic/template/Template.cs
 2014-05-05 12:49:06 +10:00
Stephan
cd5581bef6 Back to IPublishedContentProperty (for 6 only) 2014-04-30 16:53:14 +02:00