swcs/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
15,225 Commits 73 Branches 219 Tags
ffce67e4fdaba2fefe0dd6b6e8fce050b8f8fa34
Commit Graph

15225 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon ffce67e4fd nuget update 2016-01-22 13:34:16 +01:00
Shannon 4f85985a09 updates mb nuget 2016-01-22 12:45:57 +01:00
Shannon Deminick 5efbec1a2e Merge pull request #1046 from umbraco/temp-U4-7739 
U4-7739 - added more options to ViewHelper.GetDefaultFileContent
 2016-01-22 12:38:03 +01:00
Shannon 4bb6b2e230 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-22 12:26:04 +01:00
Shannon c365b1569b updates to latest myget MB package 2016-01-22 12:25:39 +01:00
Mads Rasmussen b38edd1921 Merge pull request #1040 from umbraco/temp-U4-7707 
U4-7707 Can't unassign assigned composition from content type until i…
 2016-01-22 12:13:04 +01:00
Shannon dfa45e70f4 Fixes ms value: U4-7810 DatabaseServerRegistrar should not execute as soon as a request is made, this slows down app start 2016-01-22 12:11:32 +01:00
Shannon 1f29d85f83 U4-7813 Enable MiniProfiler to profiler during startup 2016-01-22 11:46:10 +01:00
Stephan 2a6b559b6e U4-7739 - added more options to ViewHelper.GetDefaultFileContent 2016-01-22 10:41:54 +01:00
Shannon c7805f0af1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-21 19:33:55 +01:00
Shannon 07d50464cc U4-7811 Content type repositories should use FullDataSetRepositoryCachePolicyFactory for performance 2016-01-21 19:33:47 +01:00
Mads Rasmussen 8373955bf0 Auto focus folder name when creating folders in document types 2016-01-21 19:11:43 +01:00
Mads Rasmussen ca5f317a90 Fixes: U4-7797 Remove context-menu divider when there only is one action 2016-01-21 19:10:29 +01:00
Shannon d86db6b2cd U4-7810 DatabaseServerRegistrar should not execute as soon as a request is made, this slows down app start 2016-01-21 18:36:04 +01:00
Shannon b15f0a9c54 U4-7807 Domain, language, public access cache (GetAll) caches not working when there are no items 2016-01-21 17:46:47 +01:00
Sebastiaan Janssen e456761bb9 Merge pull request #1039 from ig-ealbert/japanesev7-2 
Added translations and removed unused entries
 2016-01-21 13:06:46 +01:00
Mads Rasmussen be1b770df8 Fixes: U4-7665 When adding tab without save and remove it again "Add another tab" should be shown again 2016-01-21 12:00:29 +01:00
Shannon 177e61834c U4-7707 Can't unassign assigned composition from content type until it has been saved 2016-01-20 18:52:05 +01:00
Shannon 2d0f198f58 U4-7546 Cannot delete document type - fanoe starter kit Text Page 2016-01-20 18:26:30 +01:00
Shannon 6ad568c81a changes config template with new MB config option 2016-01-20 18:18:33 +01:00
ig-ealbert 25dd891938 Added translations and removed unused entries 2016-01-20 12:10:02 -05:00
Shannon Deminick 2ef673bc84 Merge pull request #1038 from umbraco/temp-U4-7768 
U4-7768 - Fixes validation issue with new CTs and invalid server side…
 2016-01-20 18:08:58 +01:00
Shannon adc3c1e927 updates to latest MB 2016-01-20 18:08:34 +01:00
Shannon e2eaf7d58e Updates how the editor validators work 2016-01-20 17:42:09 +01:00
Shannon 38a6f8c4a9 creates new EditorValidationResolver for external validators to work (internal for now), bumps version 2016-01-20 16:57:31 +01:00
Shannon 8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Sebastiaan Janssen 277b67ac84 Merge pull request #1029 from umbraco/temp-U4-7557 
U4-7557 Support folders for import/export, packaging
 2016-01-20 15:45:21 +01:00
Shannon fda3111e43 fixes nuget dll ref 2016-01-20 15:24:57 +01:00
Shannon 5c2bd5748d Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
 2016-01-20 15:02:12 +01:00
Sebastiaan Janssen 348bee885e Finish last bit for U4-7683 2016-01-20 15:01:25 +01:00
Shannon dd5523de42 updates package dependency for MB 2016-01-20 14:55:56 +01:00
Shannon 4bb9dfb4c9 Ensure that the raw ct alias is passed in with additionaldata 2016-01-20 14:47:32 +01:00
Sebastiaan Janssen 5440353fb3 Merge pull request #1031 from umbraco/temp-U4-7683 
Fixes: U4-7683 Search on Property Editors/Data Types in new Content Type Editor should display two results - resuse / available
 2016-01-20 14:37:15 +01:00
Sebastiaan Janssen df3e96e86a Merge remote-tracking branch 'origin/7.3.6' into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2016-01-20 14:09:40 +01:00
Sebastiaan Janssen 74d73cfe94 U4-7796 Get UrlRewritingNet from the official NuGet location 
#U4-7796 Fixed
 2016-01-20 13:57:35 +01:00
Shannon 1fd76731cd fixes merge issue, updates MB 2016-01-20 13:54:16 +01:00
Shannon 4e1e240f54 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7747 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
 2016-01-20 13:38:17 +01:00
Shannon 85207b3d5c removes MB dependencies from Umbraco.Web proj, we don't want circular references and this is not required since MB can take care of injecting the server vars. 2016-01-20 13:37:47 +01:00
Shannon 8b80a22018 Merge branch 'temp-U4-7748' into temp-U4-7747 2016-01-20 13:32:40 +01:00
Shannon 9c58e82169 publicized required method for externally setting template markup, removes logic from core for this 2016-01-20 12:47:09 +01:00
Shannon 42fbcb6f41 Bumps version so that the MB core can reference updated code 2016-01-20 11:45:33 +01:00
Shannon 2571e5c683 Moves MB nuget reference to UmbracoCms nuget package - otherwise we have a circular nuget reference! 2016-01-20 11:40:53 +01:00
Mads Rasmussen c16aa5bbf0 Fixes: U4-7745 7.4 Property Editor & Keyboard Shortcuts 2016-01-20 11:35:46 +01:00
Sebastiaan Janssen dad0cf20eb Merge pull request #1035 from ig-ealbert/japanesev7 
Added translations for v7 only entries
 2016-01-20 11:23:01 +01:00
Shannon fe563b0828 adds AdditionalData to the event args so we can use that to check for specific keys/values when consuming events and maintain compatibility. 2016-01-20 11:19:04 +01:00
Sebastiaan Janssen 9e8821594a Merge remote-tracking branch 'origin/7.3.6' into dev-v7 2016-01-20 10:55:24 +01:00
Sebastiaan Janssen 7fb9d430a9 changes default upload limit to 50 mb 2016-01-20 10:54:43 +01:00
Shannon 76dd7f8909 changes default upload limit to 50 mb 2016-01-20 10:48:10 +01:00
Sebastiaan Janssen 7cd8ba13c0 U4-7781 Setting a user's start node causes YSOD 
#U4-7781 Fixed
 2016-01-20 10:45:40 +01:00
Shannon 9a0e85af10 Creates new CreateTemplateForContentType for use with the content type editor, I need to somehow add some additional information to the event raised there so that we can listen to that event in MB in order to create the default template markup. 2016-01-19 21:38:11 +01:00