27e6e9b91c
removes duplicate declaration
2013-10-09 13:52:44 +11:00
09b7186713
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
c6389852ea
Adds public ctors for ApplicationContext, ServiceContext, DatabaseContext, RepositoryFactory, makes IDatabaseFactory public, makes an interfaces for IEntityService, adds EnsureContext methods for ApplicationContext - to set the singleton.
2013-10-09 13:17:19 +11:00
49f10ccd32
Fixes merge issue , fixes the ServiceContext lazy fields to be the underlying interfaces, adds public ctor
2013-10-09 12:18:42 +11:00
a8b037f2e0
Fixes member type repository when member types don't have properties declared and adds tests. Adds IMemberTypeService.
...
Conflicts:
src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
src/Umbraco.Core/Services/ServiceContext.cs
2013-10-09 12:09:28 +11:00
16bce4248d
Fixes merge issues with 6.2 and copying across TempData properly.
2013-10-08 10:46:02 +11:00
a2e9ec0412
Merge remote-tracking branch 'origin/6.1.6' into 6.2.0
...
Conflicts:
src/Umbraco.Web/Mvc/UmbracoPageResult.cs
2013-10-08 10:37:46 +11:00
12b7a9d874
Argh, didn't save csproj file before committing.
2013-10-07 13:20:34 +02:00
a90f32035d
U4-2733 call to umbraco.library:Request broken?
2013-10-07 08:18:44 +02:00
33b09c80aa
Forgot to commit csproj file
2013-10-06 18:55:52 +02:00
b2980cedc6
Also apply to media types - U4-541 Wrong dictionary key when using in backend template names
2013-10-06 18:54:46 +02:00
34b7f86b8b
U4-541 Wrong dictionary key when using in backend template names
2013-10-06 18:24:46 +02:00
130f6d3a42
Additions for U4-2776 Default Content For A Razor Layout Section
2013-10-06 17:52:46 +02:00
3ff9d6adbc
U4-2509 Umbraco backend search not working correctly with spaces - Also updated search.aspx dialog
2013-10-06 16:55:54 +02:00
fd5de171c9
Merge branch '6.2.0' of github.com:umbraco/Umbraco-CMS into 6.2.0
2013-10-06 16:45:31 +02:00
45ad51b8df
U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views
2013-10-06 16:45:21 +02:00
b02657f32c
Cleaning up commit for issue U4-3007
...
Changed documentation on UmbracoMvcHandler
2013-10-05 23:31:02 +02:00
9f3784aaed
U4-1242 Template editor sometimes stops editing.
2013-10-05 19:26:01 +02:00
2ab2a5a9f3
Fix bug where Right ALT+S would save in Firefox instead of inserting the correct character
2013-10-05 19:23:57 +02:00
2d83ba06a5
Fix small styling issues in installer
2013-10-05 19:18:11 +02:00
06d5c60803
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-10-05 19:09:49 +02:00
fe18722e1f
Merge pull request #147 from AndyButland/u4-2958
...
Fix for issue U4-2958 Member can edit & Show on profile do not persist on Member Type editor
2013-10-05 19:08:03 +02:00
20ab14beb4
Made two minor corrections to the texts.
...
"Content>alias" changed to "Alternativ link" from "Alias", so it makes more sense.
"defaultdialogs>treepicker" changed to "Vælg" from "Vælg punkt", so it fits in the button.
2013-10-03 20:43:42 +02:00
08660704cc
Core.StringExtensions - adjust to new default IShortStringHelper (see f64b8d6)
2013-10-03 18:10:51 +02:00
4c13dbf8b7
Core.StringExtensions - fix methods that should be extension methods
2013-10-03 18:10:50 +02:00
9a10863760
Core.EnumerableExtensions - bugfix f9663a9
2013-10-03 18:10:48 +02:00
86430f1b01
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-10-03 12:46:01 +10:00
55247fe31d
Finally got around to changing all calls to umbraco.IO to Umbraco.Core.IO - that'll clear up several hundreds of warnings :)
2013-10-03 12:45:40 +10:00
a806f40093
Merge pull request #146 from mortenbock/6.2.0
...
Custom ProfilingViewEngine
2013-10-02 15:53:58 -07:00
24020cfea3
Make sure the profilingengine doesn't wrap itself
2013-10-02 18:30:59 +02:00
9ec30860b0
Wrap all ViewEngines in a profiler
...
Wrap all ViewEngines in a custom profiler view engine, using the
ProfilerResolver to track performance
2013-10-02 17:48:44 +02:00
f64b8d680d
Core.StringExtensions - switch over to the new DefaultShortStringHelper
2013-10-02 16:54:56 +02:00
f9663a9e80
Core.EnumerableExtensions - refactor InGroupsOf to enumerate source only once
2013-10-02 16:54:47 +02:00
e6bb999d83
Core.Resolution - umbraco.cms.Action should NOT reset resolution
2013-10-02 11:42:17 +02:00
cdd1a0a4cb
Core.Resolution - fix concurrency issues
...
Conflicts:
src/Umbraco.Core/ObjectResolution/Resolution.cs
2013-10-02 11:41:48 +02:00
5e0fbe5634
Macros - bugfix parameters
2013-10-02 11:16:39 +02:00
9ddee615cc
U4-3007 RouteDefinition should not store instance of controller
2013-10-01 14:09:38 +02:00
74f6a34651
Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0
2013-10-01 10:20:29 +02:00
7dee2802fe
Fixing Member and MemberType, so the ids are properly assigned through the repositories.
...
Adding test to assert that no Properties, PropertyTypes or PropertyGroups exists without an id when loaded from the db.
NOTE Changes signature of Member class as Email, Username and Password is required.
2013-10-01 10:20:16 +02:00
5238293c09
Merge branch '6.1.6' into 6.2.0
...
Conflicts:
build/Build.bat
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
2013-09-30 16:09:25 +02:00
cdda69c4cd
U4-2788 Error installing Umbraco 6.1.5 with SQL CE 4 option
2013-09-30 12:39:28 +02:00
5aa01e78ab
Updating conn.string in test
2013-09-30 12:13:49 +02:00
a21bee6683
Fixing MemberType- and MemberRepository so properties, property types and property groups are properly initialized.
2013-09-30 12:12:58 +02:00
0cff484113
fixes unit test
2013-09-30 12:12:17 +02:00
830fde372e
Fixes EditUser.aspx
2013-09-30 11:49:31 +02:00
35f65a2c64
re-enables LoadMinimalDocument and adds this to the optimized check, even in optimized model the OnRenderNode can still execute with a minimal doc.
2013-09-30 10:55:38 +02:00
e5320f0abd
Obsoletes the LoadMinimalDocument flag since it no longer serves a purpose.
2013-09-30 10:55:26 +02:00
965a7fc500
Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions
2013-09-30 10:55:13 +02:00
328ada2f38
Bump version number
2013-09-30 10:46:08 +02:00
767252cdf1
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
Shannon