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

7077 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Stephan
7f4a98883b Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-24 16:24:20 +02:00
Stephan
8ff0307a95 Fix bugs & tests after merge 2013-09-24 16:23:03 +02:00
perploug
3dd583b1d3 Fixes broken table drag n drop 2013-09-24 16:03:09 +02:00
perploug
5c8d027383 Media delete dialog, missing D attr validation 2013-09-24 16:02:58 +02:00
Stephan
917c514fab PublishedContent - use generic published content in MacroController 2013-09-24 15:05:53 +02:00
perploug
e9f69e39ab Adds folder icons to the photo folder directive 2013-09-24 14:47:06 +02:00
perploug
9a1457fb6d Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-24 12:15:52 +02:00
perploug
828965b902 umb photo folder directive 2013-09-24 12:15:15 +02:00
Stephan
c7ac4eea2f Merge branch '7.0.0' into 7.0.0-pubcontent 2013-09-24 10:53:26 +02:00
Stephan
000e278e48 Fix bugs & tests after merge 2013-09-24 10:49:30 +02: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
perploug
020f4f9fc5 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-24 09:40:06 +02:00
perploug
468238e4d2 more work on the sorting, almost works on tables now too 2013-09-24 09:39:55 +02: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
Stephan
bcfb562dde Fix build after merge 2013-09-24 09:12:58 +02:00
Shannon
dbf9f70369 Fixed more styling and validation bits for insert macro dialog. 2013-09-24 16:01:00 +10:00
Shannon
1ce9554e66 Fixes width styles for prop editors 2013-09-24 15:32:32 +10:00
Shannon
f6db9d9189 Updates textbox/textarea property editors to show field level validation for the regex/required server validation. 2013-09-24 15:00:43 +10:00
Shannon
42e8e9442e Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-24 13:34:36 +10: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
perploug
13ea14e3a9 WIP on sorting directive, but index switching works now 2013-09-24 00:31:24 +02:00
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
perploug
60dab31656 Canvas directive for preview 2013-09-23 21:55:04 +02:00
perploug
0383ec5ed1 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-23 21:26:39 +02:00
perploug
ad0ec30e62 styling cleanup 2013-09-23 21:26:23 +02:00
Niels Hartvig
32f4eaf900 WIP on image uploading 
UX work - broken atm.
 2013-09-23 21:24:34 +02:00
Per Ploug Krogslund
46ccb616f3 typo in helveticons.less 2013-09-23 21:20:41 +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