Commit Graph

1714 Commits

Author SHA1 Message Date
Shannon
bbdce28951 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0-member-editor-wip
Conflicts:
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadContent.cs
2013-09-30 13:52:01 +10:00
Shannon
cf6ecf5bc9 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-member-editor-wip
Conflicts:
	src/Umbraco.Web.UI/config/trees.config
2013-09-30 13:51:18 +10:00
Shannon
a8f6b9eeb9 Fixes: U4-2925 Tree performance is very poor in 6.1.x when having event subscriptions 2013-09-30 13:31:48 +10:00
Shannon
957760d29a 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 12:02:35 +10:00
Sebastiaan Janssen
f74b9f9071 Renaming columns in SQL CE is a bit more elaborate.. 2013-09-27 13:35:52 +02:00
perploug
dcb08250ab Minor search visual tweaks 2013-09-27 11:23:38 +02:00
Shannon
a3d674f574 Updated the saving model and validator inheritance chain to better support members, have the members editor display data and posting/validating data - now need to get the correct fields being displayed and the correct tab/layout but coming along very nicely! 2013-09-27 16:59:38 +10:00
Shannon
82c784d560 Most of the member tree working, have the member editor rendering data 2013-09-27 15:19:39 +10:00
Shannon
30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon
c5c1a7ddfc Upgrades to latest AutoMapper lib 2013-09-27 13:16:25 +10:00
Shannon
ed7851c962 Fixes more issues with the legacy API backwards compatibility issues with new property editor that don't have legacy predecessors. - can now create a member. 2013-09-27 12:51:52 +10:00
Shannon
e0fb09c6bc Added better backwards compatibility for when people are using the legacy business logic APIs but they are using new property editors when there is no legacy property editor predecessor (IDataType implementation). 2013-09-27 11:02:59 +10:00
Shannon
394915fa05 centralizes the thumbnail/image handling 2013-09-25 21:09:59 +10:00
Shannon
1e9a17babe 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
Shannon
f356b94c39 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Cache/CacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRuntimeCacheProvider.cs
	src/Umbraco.Core/Cache/NullCacheProvider.cs
	src/Umbraco.Core/Cache/StaticCacheProvider.cs
2013-09-25 19:09:16 +10:00
Shannon
a939c14de9 Completes: U4-2917 Remove canvas/live editing support, U4-2916 Remove skinning support 2013-09-25 17:57:44 +10:00
Shannon
a1f87c7232 Fixes: U4-2918 After I set admin password, the error shows.(7.0.0-build.85, new install) 2013-09-25 16:52:26 +10:00
Shannon
06400f8db5 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
Shannon
6c9fe2ebd0 Adds dynamic filtering to EntityService (post filtering for GetAll) - updated the insert macro dialog to ensure that it only shows macros flagged for the rte when in rte mode, otherwise shows all of them. adds unit tests for dynamic queryable stuff. 2013-09-25 13:54:25 +10:00
Shannon
c739146f24 Completes: U4-2917 Remove canvas/live editing support, U4-2919 Remove defaultToLiveEditing column, U4-2825 Remove default permissions column 2013-09-24 19:27:13 +10:00
Shannon
5fc8e7b0fb Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 18:47:17 +10:00
Shannon
d3a9087093 Got the macro dialog working with previously selected macros in the rte and pre-fills the data that was previously there. 2013-09-24 18:46:53 +10:00
Niels Hartvig
26ab581af5 Updates to folderbrowser view - still WIP.
Needs code review as there's some non-clean NG work needed to provide
the clean view. Upload haven't been styled yet. Working on it.
2013-09-24 09:36:39 +02:00
Shannon
972d33ccec Got macro content loading in editor async updated more of the macro plugin to ensure the macro contents cannot be edited. 2013-09-24 13:34:29 +10:00
Shannon
dc258400f1 Have the RTE insert macro stuff working, needs a few tweaks and needs to load content but its working. YOU NEED A FULL BRAND NEW DB RE-INSTALL FOR THIS. 2013-09-23 13:49:24 +10:00
Shannon
c6a86d15a2 Fixes up more compatibility issues with the GUID -> alias change, completes U4-2909 Remove unused/obsoleted interfaces in interfaces.dll 2013-09-23 09:00:12 +10:00
Shannon
a065874421 Fixes some issues with the GUID change and psot validate attributes 2013-09-20 17:27:26 +10:00
Shannon
661bc3149f Fixes macro parameter id assignment at the repo level. 2013-09-20 13:40:32 +10:00
Shannon
6a343ef2b6 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2013-09-20 09:58:24 +10:00
Shannon
3d3ea12aba Gets the parameter editor resolver to resolve parameter editors from: c# parameter editors, c# property editors that have been flagged as a param editor, manifest parameter editors and manifest property editors flagged as param editor. Fixes more of the macro editor. 2013-09-20 09:47:01 +10:00
Shannon
90fe92da82 Getting parameter editor architecture done: we can share with prop eds or create standalone in both c# and in manifest. 2013-09-19 20:17:12 +10:00
perploug
aa2f020aa4 added lisview guid - does all editors need that? 2013-09-19 11:21:59 +02:00
perploug
ab35718e95 Listview datatype 2013-09-19 10:37:57 +02:00
Shannon
f62546a308 Adds some other macro parameters fixes up more of the macro editor, all seems to be working there now and have added validation (which never existed before :( 2013-09-19 18:36:36 +10:00
Shannon
c0a303b328 Gets macro editor working with new db changes and using new MacroService data layer 2013-09-19 17:34:57 +10:00
Shannon
ec3761baa0 Creates parameter editor manfests and resolver, updates the legacy macro editor to resolve items from here. 2013-09-19 15:33:47 +10:00
Shannon
bbd5747177 Differentiates between a property and parameter editor, though they are similar they are still different. Renames ValueEditor to PropertyValueEditor, creates new parameter editor base classes. 2013-09-19 14:55:00 +10:00
Shannon
33cad8ed78 Removes the table cmsMacroPropertyType, tests install upgrade and new installs. 2013-09-19 13:05:36 +10:00
Shannon
a4717c5cb9 Creates all of the macro parameter db upgrade scripts, fixes folder browser alias 2013-09-19 12:53:12 +10:00
Stephan
c2db7b2b9b Core.Cache - bugfix + add new method to remove items from cache 2013-09-18 12:52:57 +02:00
Morten Christensen
ebf60071ab Merge branch '6.2.0' of https://github.com/umbraco/Umbraco-CMS into 6.2.0 2013-09-18 11:51:13 +02:00
Morten Christensen
5cf07ba6be Refactoring how DeleteVersion and DeleteVersions is used in the Content- and MediaRepository, so we ensure that the latest version is never deleted. Worse case would have been an incomplete content node, which we want to avoid. So better to have a fail safe way of deleting versions, and use the regular Delete method for deleting the latest version. 2013-09-18 11:49:36 +02:00
Stephan
cb4eef54a4 Core.Cache - fix issue introduced in 761354d 2013-09-18 11:47:37 +02:00
Stephan
d2647ea607 Core.Cache - fix issue introduced in 761354d 2013-09-18 11:33:42 +02:00
Shannon
491b56ee27 Completes: U4-2874 Add a unique index to column cmsMacroProperty.macro + cmsMacroProperty.macroPropertyAlias, U4-2875 Add unique index to column cmsMacro.macroAlias with tests 2013-09-18 19:20:36 +10:00
Shannon
f0a141567e Fixes db fluent index builder 2013-09-18 19:18:28 +10:00
Stephan
d1f36346de Core.Cache - fix bug in StaticCacheProvider 2013-09-18 10:55:20 +02:00
Stephan
761354dbf5 Core.Cache - add new method to remove items from cache 2013-09-18 10:55:10 +02:00
Morten Christensen
dc1a67bfa2 Fixes U4-2822 Datepicker throws "Specified cast is not valid" when saving through API 2013-09-18 10:06:08 +02:00
Shannon
95df28bf64 Fixes issue with runtime cache provider when retrieving all items of a certain type, we were sending back an array of nulls if the cache was expired. 2013-09-18 17:44:25 +10:00