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

9854 Commits

Author SHA1 Message Date
Warren Buckley
9bbc66d10d Some rename of variables for readability 2019-09-11 11:06:38 +01:00
Warren Buckley
104d414887 Fix some trailing typo stuff 2019-09-11 11:00:23 +01:00
Warren Buckley
a47811f210 Update src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-11 10:55:12 +01:00
Warren Buckley
9f4697c5b3 Update src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-09-11 10:54:47 +01:00
Warren Buckley
e8ccfd52af Merge remote-tracking branch 'origin/v8/dev' into v8/feature/2349AB-RTE-Image-Upload 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2019-09-10 10:58:24 +01:00
Warren Buckley
6669b54a70 Move the logic for finding temp images for persisting into a shared class so Grid & RTE can both use it 2019-09-10 10:50:36 +01:00
Warren Buckley
5e394cb62b Refactor we do not instantly persist the uploaded file to a media item in Umbraco - what if the user undo's or removes it from content we will bloat the media section 
* Adds a data-tmpimg attribute to the <img> in the markup, which we scan for when persisting to the DB in the RTE PropertyValueEditor to then perist media items
* TODO: Find a way to get TinyMCE to NOT send a base64 down the wire as the saved content/HTML
 2019-09-09 16:04:52 +01:00
Niels Lyngsø
02534c4ac5 Merge pull request #5706 from kjac/v8-feature-copy-property 
V8: Copy on property level
 2019-09-09 15:13:10 +02:00
Bjarke Berg
d05e79ca15 Merge branch 'v8/dev' into v8/bugfix/5925-nucache-startup 2019-09-09 13:54:27 +02:00
Rasmus John Pedersen
8f32fce781 Update Headless assembly names 2019-09-09 11:53:12 +02:00
Kenn Jacobsen
2cbed6c6b0 Merged with v8/dev 2019-09-09 11:22:39 +02:00
Kenn Jacobsen
604bb6b526 Don't allow selecting non-element types when composing element types 2019-09-05 17:57:40 +02:00
Poornima Nayar
088abae314 Maxlength attribute on macro name 2019-09-05 16:19:46 +02:00
leekelleher
83588b2dc8 ContentTypeService GetAllElementTypes method 
Added an extension method to get all the Element Types from
the ContentTypeService.

Refactored NestedContent's controller accordingly.
 2019-09-05 15:36:14 +02:00
Sebastiaan Janssen
47f365e415 Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-09-05 13:03:23 +02:00
Sebastiaan Janssen
5bbe1fadda Fixes #6021 - Error on save and publish for existing node after content creation in eventhandler 2019-09-05 10:31:08 +02:00
Mads Krohn
0e8b4b8342 Correctly html encode text (#6235) 
(cherry picked from commit 1bf85ab1db)
 2019-09-02 08:48:48 +02:00
Mads Krohn
1bf85ab1db Correctly html encode text (#6235) 2019-09-02 08:46:33 +02:00
christophnz
1d94c4b9bb Fixed returntype of IPublishedContent.Siblings<T> to be IEnumerable<T> rather than IEnumerable<IPublishedContent> 2019-08-30 14:27:13 +02:00
Warren Buckley
1ec88a6647 Add new API controller for uploading images dragged/pasted into a TinyMCE editor 2019-08-29 14:06:29 +01:00
Andy Butland
d77559d52b Added metadata indicating if document published for content picker display 2019-08-29 14:28:45 +02:00
Andy Butland
8fdc14f360 Added metadata indicating if document published for content picker display 2019-08-29 14:27:31 +02:00
Kenn Jacobsen
27c8c7abf1 Don't use a hardcoded "image" type in media picker value conversion 
(cherry picked from commit 3457018fb4)
 2019-08-29 14:21:07 +02:00
Kenn Jacobsen
3457018fb4 Don't use a hardcoded "image" type in media picker value conversion 2019-08-29 14:20:03 +02:00
stevemegson
742105594e V8: Indexing of grid values containing JSON (#6201) 
(cherry picked from commit b254b4fcda)
 2019-08-29 14:07:48 +02:00
stevemegson
b254b4fcda V8: Indexing of grid values containing JSON (#6201) 2019-08-29 14:06:59 +02:00
Kenn Jacobsen
18c0298720 Ensure correct icon for file types in search results 
(cherry picked from commit 531dee1e75)
 2019-08-29 13:34:55 +02:00
Kenn Jacobsen
531dee1e75 Ensure correct icon for file types in search results 2019-08-29 13:34:01 +02:00
Warren Buckley
50ad337755 Merge pull request #6130 from stevemegson/v8/temp-6060 
V8: Handle missing grid values in migration from 7.15
(cherry picked from commit b205f19f40)
 2019-08-27 15:39:02 +01:00
Warren Buckley
b205f19f40 Merge pull request #6130 from stevemegson/v8/temp-6060 
V8: Handle missing grid values in migration from 7.15
 2019-08-27 14:31:52 +00:00
Claus
66ba6f51da Merge pull request #6147 from umbraco/v8/feature/2196-improve-tiny-load 
Improve JS Asset load of TinyMCE Editor
 2019-08-26 13:25:34 +02:00
Steve Megson
11f2855442 Move CreateRoutes from WebFinalComponent to WebInitialComponent 2019-08-23 09:11:41 +02:00
stevemegson
703092c12c V8: Fix caching of macro results in RTE (#6010) 
(cherry picked from commit 9b212121e3)
 2019-08-22 23:37:06 +02:00
stevemegson
9b212121e3 V8: Fix caching of macro results in RTE (#6010) 2019-08-22 23:34:33 +02:00
Sebastiaan Janssen
ccc2a0e811 Fix #5335 - Multiple Media Picker not available as macro parameter 
(cherry picked from commit 1f2c4e38ac)
 2019-08-21 13:02:36 +01:00
Warren Buckley
bec54a0467 Remove unecessary change 2019-08-20 11:28:29 +01:00
Warren Buckley
a95360036d Pre-loading this lang JS file does not seem to help Tiny as it does not check its already loaded & it reloads itself anyway (But the plugins work all fine & are checked by Tiny to see if they have been loaded) 2019-08-20 11:12:20 +01:00
Warren Buckley
0daa80efa4 Undo some of the changes as we will load it via assetService in the angular main controller & fixes the double load issue 2019-08-20 11:01:45 +01:00
Sebastiaan Janssen
1f2c4e38ac Fix #5335 - Multiple Media Picker not available as macro parameter 2019-08-19 16:01:03 +02:00
Warren Buckley
b9b4721295 * Adds TinyMCE JS assets into init page load via script in default.cshtml view for Umbraco backoffice ng-app 
* Add TinyMCE JS assets array via NG app.value & uses assetsService to load (if not loaded in time by main init script above)
 2019-08-19 14:36:56 +01:00
Shannon
fb38d9afe1 Merges - double linked list for children performance + updates 2019-08-19 23:22:27 +10:00
Shannon
72b20c2849 Merge branch 'v8/8.1' into v8/bugfix/5925-nucache-startup 2019-08-19 22:15:38 +10:00
Shannon
e18f73e74c removes todo 2019-08-19 22:07:46 +10:00
Shannon
f2a22e9843 Ensure we throw an exception when a fatal Exception is caught instead of swallowing 2019-08-19 22:07:22 +10:00
Shannon
890309bc11 Fixes SetAllFastSorted and sort orders 2019-08-19 17:18:45 +10:00
Kenn Jacobsen
0e565ddbf8 Make sure treepicker URLs are displayed for the current editor culture 
(cherry picked from commit 438133ae1f)
 2019-08-16 08:44:54 +02:00
Kenn Jacobsen
438133ae1f Make sure treepicker URLs are displayed for the current editor culture 2019-08-16 08:43:31 +02:00
Shannon
e9717ee86a changes to PanicException 2019-08-16 16:18:58 +10:00
Kenn Jacobsen
16ac2c5589 Don't change parent protection when editing child protection 
(cherry picked from commit 4743fc0e1d)
 2019-08-15 21:07:19 +02:00
Kenn Jacobsen
4743fc0e1d Don't change parent protection when editing child protection 2019-08-15 21:06:21 +02:00