yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
e14e5bee95df0beda2067fe3c050b757fb32052a
Umbraco-CMS/src/Umbraco.Core
History
Stephan e14e5bee95 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
2013-10-03 18:49:58 +02:00
..
Auditing
…
Cache
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
CodeAnnotations
…
Configuration
Fixes up the DashboardController to use the new configuration classes, creates DashboardSecurity (which needs some unit testing) and removes all that ugly code.
2013-10-03 19:00:31 +10:00
Dictionary
…
Dynamics
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
Events
…
IO
centralizes the thumbnail/image handling
2013-09-25 21:09:59 +10:00
Logging
…
Macros
Gets the modal content loading in the rte on editor load all in async, fixes an issue with valtogglemsg when used in a modal to ensure we unsubscribe from the events when the modal element is destroyed.
2013-09-25 14:29:59 +10:00
Manifest
Enables the manifest to load custom stylesheets outside the js loading
2013-10-02 10:54:25 +02:00
Media
centralizes the thumbnail/image handling
2013-09-25 21:09:59 +10:00
Models
Merge remote-tracking branch 'origin/6.2.0' into 6.2.0-pubcontent
2013-10-02 11:14:08 +02:00
ObjectResolution
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
2013-10-02 17:42:59 +02:00
Packaging
…
Persistence
Created TagRepository, added foreign key to cmsTags.ParentId
2013-10-02 18:57:44 +10:00
Profiling
Wrap all ViewEngines in a profiler
2013-10-02 17:48:44 +02:00
Properties
Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/
2013-09-04 13:18:23 +10:00
PropertyEditors
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-10-03 18:17:35 +02:00
Publishing
Core.Attempt - refactor Succ() into Succeed()
2013-09-11 09:30:00 +02:00
Security
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Serialization
Completes: U4-2693 Make package.manifest less complex - WARNING: You need to upgrade your package.manifest files to support the new syntax. If you don't have validation specified then you just need to update the "prevalues" key. See the issue for details.
2013-09-10 17:20:13 +10:00
Services
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-10-02 09:22:33 +10:00
Standalone
…
Strings
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Sync
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00
Xml
Macros - support navigable caches
2013-09-16 17:17:39 +02:00
ActionsResolver.cs
…
ActivatorHelper.cs
…
ApplicationContext.cs
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
ApplicationEventHandler.cs
…
AssemblyExtensions.cs
…
Attempt.cs
Core.Attempt - backport and refactor Attempt.Outcome from v7
2013-09-11 10:03:17 +02:00
Attempt{T}.cs
Core.Attempt - refactor Succ() into Succeed()
2013-09-11 09:30:00 +02:00
CacheHelper.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-09-25 19:09:16 +10:00
CacheRefreshersResolver.cs
…
ConcurrentHashSet.cs
…
Constants-Applications.cs
Most of the member tree working, have the member editor rendering data
2013-09-27 15:19:39 +10:00
Constants-Conventions.cs
Fixes merge issues with new member stuff regarding the column controlId -> propertyEditorAlias change. Removed the old sqlce sql scripts (
2013-09-11 13:19:35 +10:00
Constants-Examine.cs
added examine constants to core
2013-09-16 09:16:47 +02:00
Constants-ObjectTypes.cs
…
Constants-PropertyEditors.cs
added lisview guid - does all editors need that?
2013-09-19 11:21:59 +02:00
Constants-System.cs
…
Constants.cs
…
CoreBootManager.cs
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
2013-10-02 17:42:59 +02:00
CustomBooleanTypeConverter.cs
…
DatabaseContext.cs
U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option
2013-09-30 12:39:28 +02:00
DataTableExtensions.cs
…
DataTypesResolver.cs
…
DateTimeExtensions.cs
…
DelegateEqualityComparer.cs
…
DictionaryExtensions.cs
Creted MergeParentContextViewData filter, this is by default applied to SurfaceController's and the PartialViewMacroController. Now if you are rendering a partial view macro or a child action from a SurfaceController and are putting data into ViewData on a POST, you don't have to access the ViewData from the ParentViewContext.
2013-08-30 12:03:16 +10:00
DisposableObject.cs
…
DisposableTimer.cs
…
Enum.cs
…
EnumerableExtensions.cs
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-10-03 18:49:58 +02:00
ExpressionExtensions.cs
…
ExpressionHelper.cs
…
HashCodeCombiner.cs
…
IApplicationEventHandler.cs
…
IBootManager.cs
…
IconPickerBehaviour.cs
…
IDisposeOnRequestEnd.cs
Creates IDisposeOnRequestEnd and ensures UmbracoContext and UmbracoDatabase implement it, then we only dispose of these types of objects at the end of the request if they are part of the httpcontext items (U4-2738). Fixes: U4-2988 UmbracoObjectTypesExtensions is not thread safe
2013-09-30 10:31:45 +02:00
IfExtensions.cs
…
IntExtensions.cs
…
LambdaExpressionCacheKey.cs
…
MacroErrorBehaviour.cs
…
Mandate.cs
…
ModelMapperHelper.cs
…
NameValueCollectionExtensions.cs
…
NetworkHelper.cs
delete fontawesome
2013-09-02 15:40:14 +02:00
ObjectExtensions.cs
merge branch '6.2.0' into '7.0.0'
2013-09-12 13:09:04 +02:00
ObservableDictionary.cs
Gets macro editor working with new db changes and using new MacroService data layer
2013-09-19 17:34:57 +10:00
PackageActionsResolver.cs
…
packages.config
Updates to latest version of JSON.Net
2013-09-27 13:25:28 +10:00
PluginManager.cs
Merge branch '7.0.0' into 7.0.0-pubcontent
2013-09-26 08:57:01 +02:00
ReadLock.cs
…
RenderingEngine.cs
…
StringAliasCaseType.cs
…
StringExtensions.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
2013-10-03 18:48:42 +02:00
SystemUtilities.cs
…
TopologicalSorter.cs
…
TypeExtensions.cs
PublishedContent - the big refactoring
2013-09-16 17:17:45 +02:00
TypeFinder.cs
Fixes a few stupid medium trust issues... even though running in full trust... it never ends! :/
2013-09-04 13:18:23 +10:00
TypeHelper.cs
Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data
2013-10-01 19:37:51 +10:00
Umbraco.Core.csproj
Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent
2013-10-03 18:17:35 +02:00
UmbracoApplicationBase.cs
…
UpgradeableReadLock.cs
…
UriExtensions.cs
Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent
2013-09-23 21:57:22 +02:00
UrlHelperExtensions.cs
…
WriteLock.cs
…
XmlExtensions.cs
…
XmlHelper.cs
Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen.
2013-09-25 19:23:41 +10:00