Shannon Deminick
8d2e466e34
Changes MediaCacheRefresher to be ICacheRefresher<T> and updates MacroCacheRefresher to use correct
...
macro object.
2013-03-12 03:11:35 +04:00
Shannon Deminick
ec46d65bb4
Streamlines how macro cache is handled
2013-03-12 03:00:42 +04:00
Shannon Deminick
164f22aa50
Makes ApplicationContext disposable so that 3rd party devs are able to reset their applications (or unit tests), updated
...
resolution and created a ResolverCollection to track all resolvers created so it's super easy to reset all of them at once
(which is what happens on ApplicationContext.Dispose. ApplicationContext.Dispose is also implicitly implemented as to not
show in intellisense that the Dispose method exists... must be cast to IDisposable to work.
2013-03-12 01:50:56 +04:00
Shannon Deminick
cc50003e3e
Fixup merge issues
2013-03-12 00:40:37 +04:00
Shannon Deminick
8698deb469
Merge with 6.0.3
2013-03-12 00:21:10 +04:00
Shannon Deminick
738e4f5c46
Merge
2013-03-12 00:20:12 +04:00
Shannon Deminick
2fdcb9164a
Fix merge issues
2013-03-12 00:19:06 +04:00
Shannon Deminick
7404a1f93d
Merge with 4.11.6
2013-03-12 00:14:50 +04:00
Shannon Deminick
c8b8b28e9b
applies patch for #U4-1890
2013-03-12 00:10:59 +04:00
Shannon Deminick
5bd2571395
Merge
2013-03-12 00:01:14 +04:00
Shannon Deminick
c0cd157e60
applies patch for #U4-1890
2013-03-12 00:00:55 +04:00
Sebastiaan Janssen
ac2f9b172c
.transformed files are auto-generated and shouldn't be under source control
2013-03-11 17:15:30 -01:00
Sebastiaan Janssen
c854ea8a35
.transformed files are auto-generated and shouldn't be under source control
2013-03-11 17:11:59 -01:00
Shannon Deminick
9bd865d259
Fixes: #U4-1890 - allows access to the UmbracoContext during application startup.
2013-03-11 23:46:47 +06:00
Sebastiaan Janssen
b8e4a73c3b
Revert Casey's mistakenly added files
2013-03-11 15:55:35 -01:00
Shannon Deminick
2d55dda662
Merge with 6.0.3
2013-03-11 22:04:29 +06:00
Shannon Deminick
63192f3a65
Merge
2013-03-11 22:04:06 +06:00
Shannon Deminick
29b2458ef3
Merge
2013-03-11 22:01:54 +06:00
Shannon Deminick
1e6de161e6
Merge with 6.0.3
2013-03-11 22:01:40 +06:00
Shannon Deminick
508886b1ad
transormed file changed....
2013-03-11 22:00:59 +06:00
Stephan
3ab0879a99
Core.Strings - refactor ToSafeFileName
2013-03-11 14:58:07 -01:00
Shannon Deminick
4baecfe833
Merge with 6.0.3
2013-03-11 21:56:47 +06:00
Shannon Deminick
727f62d418
Merge with 4.11.6
2013-03-11 21:49:27 +06:00
Shannon Deminick
68c4255a51
updates proper error handling for razor script macros
2013-03-11 21:49:04 +06:00
Shannon Deminick
187af3e361
Fixed merge issue
2013-03-11 21:23:35 +06:00
Shannon Deminick
c6f29a50d6
Merge with 4.11.6
2013-03-11 21:17:57 +06:00
Shannon Deminick
d07212c89b
Fixed changes with new MacroErrors config and how macros are rendered so it supports all macro types and also fixes up a bit of code
...
in the umbraco.macro class.
2013-03-11 21:06:02 +06:00
Shannon Deminick
28c55320a1
Updates the pull request for handling macro errors.
...
Backports fixes for partial view macros from 6.x - U4-1488, U4-1844, U4-1730, U4-1843
2013-03-11 20:11:11 +06:00
Morten Christensen
cb0dd70434
Minor change to the SqlSyntaxProvidersResolver in the CoreBootManager as per Shannons review.
2013-03-11 12:44:12 -01:00
Shannon Deminick
fd58017e97
imported patches for pull request spudstuff/u4497
2013-03-11 18:49:45 +06:00
Morten Christensen
928d92fce4
Making the Sql Syntax Providers public and changing a few names and bits for consistency.
...
Adding resolver for the syntax providers and wiring it up in the boot manager.
2013-03-09 10:43:34 -01:00
Casey Neehouse
09408b898e
Merge
2013-03-08 19:38:33 +05:00
Morten Christensen
d1b05332c5
Manually adds fix for U4-1869 from 6.0.3 branch
2013-03-07 20:28:13 -01:00
Morten Christensen
3612f18f3f
Merge with 6.0.3
2013-03-07 20:22:37 -01:00
Morten Christensen
836b0f39c2
Additional correction of the implementation for U4-1869
2013-03-07 20:19:39 -01:00
Morten Christensen
1b01386673
Changing the initial fix of U4-1869 to use UrlReplacingCharacters
2013-03-07 19:56:59 -01:00
Morten Christensen
2a09f02afb
Fixing incorrect sql syntax when the query contains two expressions.
2013-03-07 19:56:10 -01:00
Morten Christensen
ee95434cea
Implements U4-1869 by adding the 3 characters to the list of reserved characters.
2013-03-07 19:04:25 -01:00
Shannon Deminick
86852f9815
updated server registrar
2013-03-07 23:23:20 +06:00
Shannon Deminick
9aa44c40ce
re-instated the upgrade script and put the server rego back on the service context.
2013-03-07 22:57:42 +06:00
Shannon Deminick
da331b7408
Changed how model mappers work for persistence objects so we don't have to statically associate the mapper.
2013-03-07 22:27:47 +06:00
Casey Neehouse
caad0afed8
Corrects u4-1870 - Refactor Load Content SQL to check if ID is in published list
...
versus using a join that can cause duplicate entries.
2013-03-07 21:00:31 +05:00
Shannon Deminick
0230bedeb6
Reinstated server registration repositories and db table
2013-03-07 21:40:00 +06:00
Shannon Deminick
bd6aa51397
Merge with 6.0.3
2013-03-07 21:27:54 +06:00
Shannon Deminick
9b85bc0e64
Added installer step to choose rendering engine but have left it disabled, might make a dashboard instead for that.
2013-03-07 21:25:11 +06:00
Morten Christensen
fe08e7fc2f
Fixes U4-1865 by excluding trashed items from GetByLevel method for both Content and Media
2013-03-07 13:42:14 -01:00
Morten Christensen
4ad96b49e7
Fixes U4-1862
2013-03-07 13:35:17 -01:00
Morten Christensen
9a1bb4a2dd
Adding unit test to assert issue with issue with creation of property types outside a property type group.
...
Fixes U4-1861.
2013-03-07 13:33:22 -01:00
Shannon Deminick
2044d1b5db
manually merged in installer changes from 6.0.3
2013-03-07 04:06:30 +06:00
Shannon Deminick
2c05eda899
Merge with 6.0.3
2013-03-07 04:01:04 +06:00