yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
7,050 Commits 4 Branches 7 Tags
3ca8b356eeec2672fbc0e5fae4db1aa86ebe98e3
Commit Graph

7050 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
3ca8b356ee Merge branch '6.2.0-pubcontent' into 7.0.0-pubcontent 
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
	src/Umbraco.Core/Configuration/UmbracoSettings.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Dynamics/PropertyResult.cs
	src/Umbraco.Core/Models/IPublishedContentProperty.cs
	src/Umbraco.Core/Models/PublishedItemType.cs
	src/Umbraco.Core/PropertyEditors/IPropertyEditorValueConverter.cs
	src/Umbraco.Core/PropertyEditors/PropertyEditorValueConvertersResolver.cs
	src/Umbraco.Core/PropertyEditors/PropertyValueConvertersResolver.cs
	src/Umbraco.Core/PublishedContentExtensions.cs
	src/Umbraco.Core/PublishedContentHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/CodeFirst/StronglyTypedMapperTest.cs
	src/Umbraco.Tests/LibraryTests.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueConverterTests.cs
	src/Umbraco.Tests/PublishedCache/PublishedContentCacheTests.cs
	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
	src/Umbraco.Web/ExamineExtensions.cs
	src/Umbraco.Web/Models/DynamicPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContent.cs
	src/Umbraco.Web/Models/XmlPublishedContentProperty.cs
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/PublishedMediaCache.cs
	src/Umbraco.Web/PublishedContentExtensions.cs
	src/Umbraco.Web/Templates/TemplateUtilities.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
	src/Umbraco.Web/umbraco.presentation/macro.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PropertyResult.cs
	src/umbraco.MacroEngines/RazorDynamicNode/PublishedContentExtensions.cs
 2013-09-23 21:57:22 +02:00
Stephan
6c32cf9529 Fix broken build 2013-09-23 17:30:09 +02:00
Stephan
d925f856ae Take care of FIXMEs 2013-09-23 16:55:59 +02:00
Stephan
3de2196e01 PublishedContent - reorg. existing IPropertyValueConverter impl. 2013-09-23 16:42:35 +02:00
Stephan
ac2d010df3 PublishedContent - refactor PublishedContentType cache 2013-09-23 16:18:39 +02:00
Anders Stentebjerg
3104e234c9 Styling 
Replaced Open Sans fonts locally with googleapis
Styling sections menu
 2013-09-23 14:12:07 +02:00
perploug
d0c500824e Added umb-editor width classes to all property editors 2013-09-23 14:10:39 +02:00
perploug
640286c283 minor tweaks 2013-09-23 13:32:26 +02:00
perploug
b9d066b262 Fixes rte property validation null refs 2013-09-23 13:32:18 +02:00
perploug
6ab4d177e4 fixes xslt dialog ysod 2013-09-23 13:31:12 +02:00
perploug
0adf0d1fb6 Css for panel footer 2013-09-23 13:30:50 +02:00
perploug
7f8045dc55 Filters out media items that returns null 2013-09-23 13:30:39 +02:00
perploug
9bad5d0233 Updateds media picker styles 2013-09-23 13:29:44 +02:00
Stephan
eb4317a9c1 Take care of FIXMEs 2013-09-23 13:08:45 +02:00
perploug
bd4ecafc74 Richtext null ref exception fixed 2013-09-23 10:45:12 +02:00
Shannon
4c77e0de0e Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-23 13:51:14 +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
61654a370a Got TinyMCE insert macro button/dialog inserting into the rich text editor - now need to ensure it is written out correctly and then parsed on the server properly so that it works! 2013-09-23 12:15:15 +10:00
Shannon
334b09f351 Moves insert macro dialog to common, creates a tinymce service to put our plugin logic inside instead of having the logic in the controller. 2013-09-23 10:36:21 +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
6340afce69 Fixes change doc type to use the prop alias instead of the guid 2013-09-21 12:40:04 +10:00
Shannon
f30bac2919 Fixes: U4-2800 ContentPostValidate apparently doesn't work - need to look into it 2013-09-21 12:29:53 +10:00
Shannon
a065874421 Fixes some issues with the GUID change and psot validate attributes 2013-09-20 17:27:26 +10:00
Shannon
7037f0626a completes U4-2706 Change form watching in the validators over to use functions , test using other manifest property editors as parameter editors, fixes up validation in the dialog. 2013-09-20 17:00:34 +10:00
Sebastiaan Janssen
d12b0b857e Update web.Template.config 2013-09-20 08:30:10 +02:00
Shannon
7396b01466 Got macro parameter editors inserting macros into the template editor for both webforms and mvc, created unit tests for macro syntax in macroservice. Removed the hard coded span8 for input elements for property editors - need to figure out a different way to set their width. 2013-09-20 14:24:39 +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
Tim Geyssens
9c19f161dc List view editor: adds delete confirmation 2013-09-19 16:22:37 +02:00
Tim Geyssens
42e3a3cf2b List view editor: disable bulk actions if action is in progress 2013-09-19 16:10:31 +02:00
Tim Geyssens
da0c98e158 List view editor: small copy update 2013-09-19 16:07:18 +02:00
Tim Geyssens
f79be4ecf7 List view editor: updates progress message on bulk actions 2013-09-19 16:05:58 +02:00
Tim Geyssens
3d28db6897 List view editor: hooks in notification service 2013-09-19 16:03:42 +02:00
Tim Geyssens
d7c0e897cf List view editor: make sure delete docs get removed from the selection 2013-09-19 15:23:19 +02:00
Tim Geyssens
35f62ffa67 List view editor: makes bulk publish work 2013-09-19 15:17:21 +02:00
Tim Geyssens
03ddc14ba5 List view editor: adds stubs for bulk publish/unpublish 2013-09-19 15:11:47 +02:00
Tim Geyssens
c3c89cb577 List view editor, adds some feedback on bulk delete progress 2013-09-19 15:06:10 +02:00
Tim Geyssens
cc8c477b16 List view editor, make bulk delete work 2013-09-19 14:58:32 +02:00
Tim Geyssens
36133a3ee4 List view editor, make select all function and show bulk actions when at least 1 thing is selected 2013-09-19 14:47:08 +02:00
Tim Geyssens
2d569b40d2 List view editor, disable icon from item view since that wasn't working anyway and did strange stuff with the checkbox 2013-09-19 14:19:03 +02:00
Tim Geyssens
39fb77cf93 List view editor, removing some unnecessary labels from the row view 2013-09-19 14:04:48 +02:00
Tim Geyssens
0746a73860 List view editor, makes paging work 2013-09-19 13:48:21 +02:00
Tim Geyssens
0a11d8beda List view editor, makes error on filtering go away (content controller still need to implement filtering) 2013-09-19 13:44:56 +02:00
Tim Geyssens
d9dae1e71a List view editor, makes sorting work 2013-09-19 13:42:11 +02:00
Tim Geyssens
18c00e21ce List view editor, fixes "Duplicates in a repeater are not allowed.” error 2013-09-19 13:25:22 +02:00
Tim Geyssens
8d9fc7fad9 List view editor, make sure edit goes to correct place 2013-09-19 13:20:41 +02:00
Stephan
c3caf7ff04 PublishedContent - align with v7, refactor IPublishedProperty & names 2013-09-19 13:12:18 +02:00
Tim Geyssens
9162dac22a List view editor, small update to controller to make sure fetching children doesn't fail 2013-09-19 13:11:57 +02:00
Tim Geyssens
1a38e3ccb9 Oops didn't want to commit this file in preview commit 2013-09-19 13:00:56 +02:00