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

7063 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tim Geyssens
32ba52f340 rte: adds iframe as allowed element 2013-09-25 12:07:25 +02:00
Tim Geyssens
04275eba63 Embed rte plugin: prettify 2013-09-25 11:51:47 +02:00
Shannon
f01e3ee9f2 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-09-25 19:27:12 +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
Tim Geyssens
ab2b916103 Embed rte plugin: adds cancel button to dialog 2013-09-25 11:21:10 +02:00
Tim Geyssens
b3914c4eaa Embed rte plugin: changes icon 2013-09-25 11:17:32 +02: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
5fd25e26f5 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 2013-09-25 19:04:12 +10:00
Shannon
e02dddc747 obsoleting legacy prop eds 2013-09-25 19:03:05 +10:00
Shannon
cf462bd28e Fixes starter kit installer with no skins 2013-09-25 18:49:19 +10:00
Shannon
b2e2a2b004 removes the old skinning.config and updates the installer to not show that option. 2013-09-25 18:18:36 +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
55e9a4fbb0 fixes rte property editor to ensure that data is saved since tinymce events are a bit strange. fixes up selection changes and ensures that macro markup in the editor can never be modified. 2013-09-25 16:30:13 +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
f127d31928 Gets the rte macro contents rendering with macro parameter values. 2013-09-25 12:05:07 +10: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
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
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
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
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
Shannon
099c1ff2ea Fixes: U4-2914 Examine doesn't index newly created items 2013-09-24 10:39:47 +10:00
perploug
13ea14e3a9 WIP on sorting directive, but index switching works now 2013-09-24 00:31:24 +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
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
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