yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
Files
9a9237e78e03e7d200ccd8b9e632f4a6121ac7a3
Umbraco-CMS/src/Umbraco.Core
History
Shannon 9a9237e78e Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMembershipUserService.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestElements.cs
	src/Umbraco.Web.UI/config/trees.config
	src/Umbraco.Web.UI/config/umbracoSettings.config
	src/Umbraco.Web.UI/umbraco/controls/ContentTypeControlNew.ascx
	src/Umbraco.Web.UI/umbraco/developer/DataTypes/editDatatype.aspx
	src/Umbraco.Web.UI/umbraco/plugins/uGoLive/Dashboard.ascx
	src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
	src/Umbraco.Web/Search/ExamineEvents.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/cache/LegacyClasses.cs
2014-03-06 20:22:32 +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
Creates Install MVC Area, creates new installer api controllers, moves old installer files to the new Area folder so that the /install path can route properly.
2014-02-26 04:15:14 +11:00
Dictionary
…
Dynamics
…
Events
Adding Event Args for import and export
2014-01-19 15:23:01 +01:00
IO
Merge remote-tracking branch 'origin/6.2.0' into 7.0.2
2014-01-10 00:09:38 +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
merge
2013-11-07 17:16:22 +01:00
Media
Fixes: U4-3844 U7 - System.OutOfMemoryException: Out of memory - uploading 11Mb image
2013-12-13 16:50:11 +11:00
Models
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +11:00
ObjectResolution
Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent
2013-10-11 10:24:24 +02:00
Packaging
merge
2013-11-07 17:16:22 +01:00
Persistence
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +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-4195 7.0.X PropertyValueEditor.GetDatabaseType FormatException on different regional settings
2014-02-24 12:08:33 +01:00
Publishing
backported IContentService updates
2013-12-16 15:57:59 +11:00
Security
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-02-21 16:32:53 +11:00
Serialization
…
Services
Merge remote-tracking branch 'origin/6.2.0' into 7.1.0
2014-03-06 20:22:32 +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
…
Xml
merge
2013-11-07 17:16:22 +01:00
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-02-25 02:24:45 +11:00
Constants-Examine.cs
merge
2013-11-07 17:16:22 +01:00
Constants-ObjectTypes.cs
…
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-02-13 16:22:51 +11:00
CustomBooleanTypeConverter.cs
Reduce Exceptions thrown during type conversions.
2013-10-17 19:12:08 -05:00
DatabaseContext.cs
Updates more installer logic, getting into the nitty gritty details with upgrades, etc...
2014-03-04 19:20:36 +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
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
Got the user timeout counter all working nicely with minimal server queries, now to show the login dialog when timeout is close or finished.
2013-10-16 11:31:35 +11:00
HashCodeCombiner.cs
…
IApplicationEventHandler.cs
…
IBootManager.cs
…
IconPickerBehaviour.cs
Completes: U4-2666 Change the drop down for selecting an icon/thumbnail for doc/media types to display the new list of icons to choose from
2013-11-01 17:18:57 +11:00
IDisposeOnRequestEnd.cs
merge
2013-11-07 17:16:22 +01:00
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
merge
2013-11-07 17:16:22 +01:00
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-02-17 15:59:43 +11:00
ReadLock.cs
…
RenderingEngine.cs
…
StringAliasCaseType.cs
…
StringExtensions.cs
U4-4056 - fixing
2014-01-17 10:27:09 +01:00
SystemUtilities.cs
Cache AspNet hosting permission level
2013-11-01 16:57:31 +01:00
TopologicalSorter.cs
…
TypeExtensions.cs
Core.TypeExtensions - add methods
2013-10-25 13:19:20 +02:00
TypeFinder.cs
updates typefinder assembly ignore list - ensures that we scan the providers dll and ignores some other new ones (should slightly speed up startup)
2013-11-21 12:15:59 +11:00
TypeHelper.cs
Completes: U4-2963 Updated EntityService / IUmbracoEntity to have a dictionary to fill additional data - fixes merge issues and explicitly implements interface for entities that are not UmbracoEntity and hides other implementations from intellisense.
2013-10-09 13:32:58 +11:00
Umbraco.Core.csproj
Gets lots of the new installer logic working
2014-02-26 16:01:31 +01:00
UmbracoApplicationBase.cs
…
UpgradeableReadLock.cs
…
UriExtensions.cs
fixes merge
2014-02-20 13:56:18 +11:00
UrlHelperExtensions.cs
…
WriteLock.cs
…
XmlExtensions.cs
Fixing: U4-3687 Umbraco 7 Packaging Issues - have fixed the data type package issues, cleaned up some code and fixed a different underlying pre-val issue for empty legacy aliases
2013-11-28 16:57:05 +11:00
XmlHelper.cs
…