yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
1d4b6178e5e16f02e5c2760dd08d601b41e8c1a5
Umbraco-CMS/src/Umbraco.Core
History
Shannon 1d4b6178e5 Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/prevalueeditors/multivalues.html
2014-03-25 13:31:21 +11:00
..
Auditing
…
Cache
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-13 16:22:51 +11:00
CodeAnnotations
…
Configuration
fixes the config issue with unit tests
2014-03-19 17:56:30 +11:00
Dictionary
…
Dynamics
…
Events
Adding Event Args for import and export
2014-01-19 15:23:01 +01:00
IO
Fixes: U4-4428 Upload field on members fails on resizing
2014-03-17 18:39:53 +11:00
Logging
…
Macros
Fixes: U4-4084 Macro's with non alphanumeric chars in their aliases cannot render in the rich text editor
2014-01-20 13:59:25 +11:00
Manifest
…
Media
Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image
2013-12-13 16:50:11 +11:00
Models
Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951
2014-03-25 13:31:21 +11:00
ObjectResolution
fixes: U4-4285 Expose/Publicize (3rd party) PropertyEditors
2014-03-13 16:34:54 +11:00
Packaging
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-15 19:02:59 +11:00
Persistence
Merge branch 'fix-u4-3839' of https://github.com/lars-erik/Umbraco-CMS into lars-erik-fix-u4-3839
2014-03-25 12:47:26 +11:00
Profiling
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2013-12-19 12:53:32 +11:00
Properties
Fixes up the unit tests
2014-01-08 17:08:13 +11:00
PropertyEditors
fixes: U4-4285 Expose/Publicize (3rd party) PropertyEditors
2014-03-13 16:34:54 +11:00
Publishing
backported IContentService updates
2013-12-16 15:57:59 +11:00
Security
Fixes merge issues
2014-03-18 19:05:07 +11:00
Serialization
…
Services
Merge branch 'wip-u4-3951' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-3951
2014-03-25 13:31:21 +11:00
Standalone
Backporting the cachehelper and associated cache classes.
2013-12-16 13:19:10 +11:00
Strings
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
Sync
Publicizes a few things, including the fix for U4-3981 Make Umbraco.Web.WebApi.Filters.UmbracoApplicationAuthorizeAttribute public
2014-03-24 15:41:46 +11:00
Xml
…
ActionsResolver.cs
…
ActivatorHelper.cs
…
ApplicationContext.cs
Updates more installer logic, getting into the nitty gritty details with upgrades, etc...
2014-03-04 19:20:36 +11:00
ApplicationEventHandler.cs
…
AssemblyExtensions.cs
…
Attempt.cs
…
Attempt{T}.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-20 13:40:17 +11:00
CacheHelper.cs
Backporting the cachehelper and associated cache classes.
2013-12-16 13:19:10 +11:00
CacheRefreshersResolver.cs
Refactor CacheRefreshersResolver.CacheResolvers into .CacheRefreshers
2014-03-05 15:46:35 +01:00
ConcurrentHashSet.cs
…
Constants-Applications.cs
…
Constants-Conventions.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-18 18:53:04 +11:00
Constants-Examine.cs
…
Constants-ObjectTypes.cs
…
Constants-Packaging.cs
Initial implementation of a new package installation approach based on PR-297. Everything is left internal as we don't know when something like this can be introduced.
2014-03-14 12:11:38 +01:00
Constants-PropertyEditors.cs
ImageCropper Added as a real property editor + polish
2014-02-07 09:15:44 +01:00
Constants-System.cs
fixes merge issue
2014-01-16 20:51:23 +11:00
Constants-Web.cs
Fixes: U4-3855 Preview cookie should be a session cookie not persisted
2014-01-16 20:47:13 +11:00
Constants.cs
…
ControlExtensions.cs
Moves all FindCOntrolRecursive calls to an extension method
2014-02-19 23:49:08 +11:00
CoreBootManager.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-13 11:11:51 +11:00
CustomBooleanTypeConverter.cs
…
DatabaseContext.cs
Added another property to a migration to specify a minimum current version - needed for specifically targeting a migration 'from' a version. Finally got mysql upgrading from 6.1 to 7.1 without issue, had to re-order a few things and ensure some migrations don't execute based on the 'from' version.
2014-03-15 20:15:01 +11:00
DataTableExtensions.cs
…
DataTypesResolver.cs
…
DateTimeExtensions.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
DelegateEqualityComparer.cs
…
DictionaryExtensions.cs
implements the file permissions report correctly and tests it.
2014-03-05 17:44:13 +11:00
DisposableObject.cs
…
DisposableTimer.cs
…
Enum.cs
…
EnumerableExtensions.cs
Supercharges integration tests - now running at a great speed.
2014-03-17 22:22:44 +11:00
ExpressionExtensions.cs
…
ExpressionHelper.cs
…
HashCodeCombiner.cs
…
HideFromTypeFinderAttribute.cs
Fixes: U4-4182 Exception during plugins loading
2014-03-11 17:00:35 +11:00
IApplicationEventHandler.cs
…
IBootManager.cs
…
IconPickerBehaviour.cs
…
IDisposeOnRequestEnd.cs
…
IfExtensions.cs
…
IntExtensions.cs
…
LambdaExpressionCacheKey.cs
…
MacroErrorBehaviour.cs
…
Mandate.cs
…
ModelMapperHelper.cs
…
NameValueCollectionExtensions.cs
Added many more unit tests for the membership provider base class and fixed some logic inconsistencies.
2013-12-28 18:55:43 +11:00
NetworkHelper.cs
…
ObjectExtensions.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
ObservableDictionary.cs
…
PackageActionsResolver.cs
…
packages.config
Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0
2014-02-18 18:03:29 +11:00
PluginManager.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-13 11:11:51 +11:00
ReadLock.cs
…
RenderingEngine.cs
…
StringAliasCaseType.cs
…
StringExtensions.cs
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-17 13:39:49 +11:00
SystemUtilities.cs
…
TopologicalSorter.cs
…
TypeExtensions.cs
Working on
2014-03-11 14:23:51 +11:00
TypeFinder.cs
Optimizes integration test performance and fixes failing unit tests.
2014-03-18 11:40:20 +11:00
TypeHelper.cs
Fixes: U4-4182 Exception during plugins loading
2014-03-11 17:00:35 +11:00
Umbraco.Core.csproj
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-18 18:47:49 +11:00
UmbracoApplicationBase.cs
ensures applicationeventsresolver is disposed of in the correct place.
2014-03-12 18:11:05 +11:00
UpgradeableReadLock.cs
…
UriExtensions.cs
fixes merge
2014-02-20 13:56:18 +11:00
UrlHelperExtensions.cs
…
WriteLock.cs
…
XmlExtensions.cs
…
XmlHelper.cs
…