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

30303 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Kenn Jacobsen
3457018fb4 Don't use a hardcoded "image" type in media picker value conversion 2019-08-29 14:20:03 +02:00
Kenn Jacobsen
bfc87922cb Make sure the empty search result is visible for list views 2019-08-29 14:13:43 +02:00
Steve Megson
09def9f352 Migration of MarkdownEditor prevalues 2019-08-29 14:12:32 +02:00
Steve Megson
934e2066a0 #6158 - missing media folders after migration 2019-08-29 14:09:19 +02:00
stevemegson
b254b4fcda V8: Indexing of grid values containing JSON (#6201) 2019-08-29 14:06:59 +02:00
jmayntzhusen
4dad427a64 Improve error messages (#6154) 2019-08-29 14:01:30 +02:00
Steve Megson
9e1424fb24 RefactorMacroColumns 2019-08-29 13:58:43 +02:00
Kenn Jacobsen
ad978c60df V8: Use a standard confirm dialog when removing content type compositions (#6213) 2019-08-29 13:51:55 +02:00
Kenn Jacobsen
dfe96dccde Use a pointer cursor for selectable items in mini listviews 2019-08-29 13:50:37 +02:00
Poornima Nayar
981519eac0 Added contribution guidelines file 
which was otherwise leading to a 404 from the Contributing.md file (#6197)
 2019-08-29 13:49:26 +02:00
Kenn Jacobsen
16ab7b70cf V8: Add confirmation when deleting content and media (#6005) 2019-08-29 13:44:38 +02:00
Sebastiaan Janssen
b2093e6dfa Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/itempicker/itempicker.html
#	src/Umbraco.Web.UI.Client/src/views/content/content.delete.controller.js
#	src/Umbraco.Web.UI.Client/src/views/content/delete.html
#	src/Umbraco.Web.UI.Client/src/views/media/delete.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
#	src/Umbraco.Web.UI/umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2019-08-29 13:44:09 +02:00
Kenn Jacobsen
3f8dffee3f V7: Add confirmation when deleting content and media (#6004) 2019-08-29 13:41:34 +02:00
Kenn Jacobsen
204a9c9d53 Make sure Nested Content blueprints are listed in defined sort order 2019-08-29 13:37:45 +02:00
Kenn Jacobsen
531dee1e75 Ensure correct icon for file types in search results 2019-08-29 13:34:01 +02:00
Sebastiaan Janssen
297e054381 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
#	src/Umbraco.Web/Search/UmbracoTreeSearcher.cs
 2019-08-29 13:33:42 +02:00
Kenn Jacobsen
e9eecb2031 Ensure correct icon for file types in search results 2019-08-29 13:31:18 +02:00
Sebastiaan Janssen
4f289a222f Merge remote-tracking branch 'origin/v7/7.15' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.controller.js
 2019-08-29 13:30:14 +02:00
Matt Brailsford
e92631c623 Fixed #5907 by reloading content on bulk publish / unpublish 
Fixes #5907

(cherry picked from commit 93bb75511b)
 2019-08-29 13:26:41 +02:00
Matt Brailsford
93bb75511b Fixed #5907 by reloading content on bulk publish / unpublish 
Fixes #5907
 2019-08-29 13:25:56 +02:00
Sebastiaan Janssen
5d9e1087f4 Cherry pick 851a2a3de8 2019-08-29 13:03:48 +02:00
Sebastiaan Janssen
0308c8096e Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
 2019-08-29 12:59:56 +02:00
Sebastiaan Janssen
02469f110f Merge branch 'v7/7.15' into v7/dev 2019-08-29 12:58:36 +02:00
Warren Buckley
851a2a3de8 Simplify svg check and make it a proper a href again. 2019-08-29 12:56:53 +02:00
Sebastiaan Janssen
74ccc34124 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Persistence/Factories/MediaFactory.cs
 2019-08-29 12:38:35 +02:00
Cody Boucher
f5a445101d use SystemDirectories.Media instead of hardcoded string media 
(cherry picked from commit 2cdeb38521)
 2019-08-29 12:34:21 +02:00
Cody Boucher
2cdeb38521 use SystemDirectories.Media instead of hardcoded string media 2019-08-29 12:33:31 +02:00
Sebastiaan Janssen
b3834c296b Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/multiurlpicker/multiurlpicker.controller.js
 2019-08-29 11:57:50 +02:00
Sebastiaan Janssen
198b74f4de Merge branch 'v7/7.15' into v7/dev 2019-08-29 11:57:00 +02:00
Sebastiaan Janssen
3c7580ff7b Default for ignoreUserStartNodes should be false 2019-08-29 11:55:43 +02:00
Sebastiaan Janssen
c0ad292ebb Merge branch 'v7/7.15' into v7/dev 2019-08-29 11:48:52 +02:00
Steve Megson
4ef55aa7d0 Multi Url Picker fix 
(cherry picked from commit 3dc0bbeff3)
 2019-08-29 11:48:04 +02:00
Steve Megson
3dc0bbeff3 Multi Url Picker fix 2019-08-29 09:34:35 +02: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
Warren Buckley
727c32843c Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-08-27 11:53:52 +01:00
Warren Buckley
78a63b20c7 Merge pull request #6120 from umbraco/v8/bugfix/6099-member-password-reset 
Fixes: Member password reset checkbox doesn't hide "new" and "confirm" password fields. #6099
 2019-08-27 10:48:27 +00:00
Claus
c3e99205de fixed typo. 2019-08-26 13:29:54 +02: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
elitsa
8625c8da43 Add special checks and preview for svg files media files for v8 
(cherry picked from commit ac4128d89e)
 2019-08-23 12:08:03 +01:00
Warren Buckley
d86db3fc11 Merge pull request #6182 from umbraco/v8/bugfix/2180-secure-svg-preview 
Secure svg media files preview - v8
 2019-08-23 11:06:20 +00:00
elitsa
ac4128d89e Add special checks and preview for svg files media files for v8 2019-08-23 10:42:00 +02:00
Steve Megson
11f2855442 Move CreateRoutes from WebFinalComponent to WebInitialComponent 2019-08-23 09:11:41 +02:00
Kenn Jacobsen
d09be604d9 Allow plugin "Lang" folders to reside in nested directories 2019-08-23 08:56:42 +02:00
Sebastiaan Janssen
d8355c368f Too many weird versions 2019-08-22 23:40:24 +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
88145d70fc Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
(cherry picked from commit d2649e9354)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
(cherry picked from commit ac6e399847)
 2019-08-22 22:46:11 +02:00
Sebastiaan Janssen
320cc48132 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
 2019-08-22 22:44:05 +02:00
Sebastiaan Janssen
ac6e399847 Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
(cherry picked from commit d2649e9354)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.editor.html
 2019-08-22 22:43:17 +02:00
Sebastiaan Janssen
d2649e9354 Update nestedcontent.editor.html 
forgot the "property-" prefix.

(cherry picked from commit 0aaf284f7f)
 2019-08-22 22:31:36 +02:00