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

26665 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
b9b3777e46 Merge branch 'v7/7.15.4' into v7/dev 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2020-03-19 14:18:59 +01:00
Sebastiaan Janssen
d52695d81f Update dependency for 7.15.4 2020-03-12 15:45:21 +01:00
Sebastiaan Janssen
7dc6ddf3a8 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:54:01 +01:00
Steve Megson
d11a1946f5 V7: Don't call ClearPreviewXmlContent from ClearDocumentXmlCache (#6631) 2020-03-10 21:52:53 +01:00
Sebastiaan Janssen
959a6df634 Merge branch 'v7/dev' into v7/7.15 2020-03-10 21:51:00 +01:00
Marc Goodson
7ca6781d09 v7: Fix false matches for AltTemplate convention Urls (#7150) 2020-03-10 21:49:59 +01:00
Sebastiaan Janssen
cfdc4ce807 Merge branch 'v7/dev' into v7/7.15 
# Conflicts:
#	src/Umbraco.Core/Serialization/JsonNetSerializer.cs
#	src/Umbraco.Web/Editors/BackOfficeController.cs
 2020-03-10 21:38:33 +01:00
elitsa
3bfc251430 Html encoding document name when it's rendered in the relation types html. 
(cherry picked from commit 889f0fc085)
 2020-02-04 12:38:09 +00:00
Warren Buckley
bf272318d8 Merge pull request #7558 from umbraco/v7/bugfix/AB4627-html-encode-document-name-in-relation-types 
Html encoding document names when rendered in the Relation Types views
 2020-02-04 12:27:40 +00:00
elitsa
889f0fc085 Html encoding document name when it's rendered in the relation types html. 2020-02-03 11:39:11 +01:00
Warren Buckley
9212d7cdb1 Merge pull request #7310 from ronaldbarendse/v7/bugfix/miniprofiler-startup 
V7: Discard MiniProfiler results when not in debug mode
 2020-01-28 16:16:53 +00:00
Shannon Deminick
160ad18f1d Merge pull request #7465 from umbraco/v7/hotfix/AB4084-backport-contentservice-returns-outdated-results 
V7: Backported/reimplemented fix for contentservice returning outdated results
 2020-01-17 16:12:38 +11:00
Bjarke Berg
d4e6eb2b6b AB4084 - Backported/reimplemented fix for contentservice returning outdated results 2020-01-16 17:04:38 +01:00
Ronald Barendse
262a4cba36 Explicitly set MiniProfiler storage to HttpRuntimeCacheStorage 2019-12-11 09:30:25 +01:00
Ronald Barendse
c845f5d8c5 Discard MiniProfiler results when not in debug mode 2019-12-11 09:26:31 +01:00
Ronald Barendse
6f67105645 Undo removing the MiniProfiler routes if solution is not in debug mode 2019-12-11 09:25:30 +01:00
Shannon
b0e2f2d511 bumps cdf requirements 2019-11-08 11:51:02 +11:00
Steve Megson
38d2419520 Media uploader in RTE doesn't select uploaded image 
(cherry picked from commit d38f275467)
 2019-10-30 13:19:14 +01:00
Steve Megson
d38f275467 Media uploader in RTE doesn't select uploaded image 2019-10-30 13:15:32 +01:00
Kenn Jacobsen
f172760f96 Editors should always be allowed to delete their own content (#6799) 
* Users should always be allowed to delete their own content

* Changed comment to be more precise

(cherry picked from commit 8a02b4f587)
 2019-10-30 11:33:31 +01:00
Kenn Jacobsen
8a02b4f587 Editors should always be allowed to delete their own content (#6799) 
* Users should always be allowed to delete their own content

* Changed comment to be more precise
 2019-10-30 11:24:08 +01:00
Rasmus Olofsson
96a2af2653 Add Swedish translations for prompt 2019-10-24 21:50:06 +02:00
Benjamin Carleski
e0ea4ef36f Add null check in allowed template check 2019-10-14 17:46:37 +02:00
jmayntzhusen
9c28a1ff80 Update styles of API docs to match new identity 2019-10-14 14:47:27 +02:00
Dirk De Grave
b05ef082fd Fixes #6499 by reloading the content in list view after bulk copy/move 
(cherry picked from commit f967f21119)
 2019-10-14 12:14:27 +02:00
Dirk De Grave
f967f21119 Fixes #6499 by reloading the content in list view after bulk copy/move 2019-10-14 12:13:13 +02:00
Benjamin Howarth
a37b1075a1 #2996 resubmitting ContentExtensions and ObjectExtensions fixes (#6473) 
(cherry picked from commit 79bf9b753c)
 2019-09-30 17:56:08 +02:00
Benjamin Howarth
79bf9b753c #2996 resubmitting ContentExtensions and ObjectExtensions fixes (#6473) 2019-09-30 17:54:28 +02:00
Warren Buckley
d7ede1d903 Merge pull request #6331 from umbraco/v7/bugfix/6024-app-event-handler-weight 
Fixes ApplicationEventHandler default weight of -100 not set on Umbraco.Web ApplicationEventHandlers #6024
 2019-09-30 14:03:14 +01:00
Sebastiaan Janssen
905b241426 #2996 added GlobalSettings.DebugMode switch for JSON formatting indentation. 
(cherry picked from commits d3c4aace16 / 16837d018a)
 2019-09-26 13:39:53 +02:00
Benjamin Howarth
16837d018a #2996 changed formatting to none for both data transfer & persistence 2019-09-26 13:33:41 +02:00
Benjamin Howarth
d3c4aace16 #2996 added GlobalSettings.DebugMode switch for JSON formatting indentation. 2019-09-26 13:33:41 +02:00
Shannon
18cd508804 Merge remote-tracking branch 'origin/v7/7.15' into v7/dev 2019-09-25 14:22:56 +02:00
stevemegson
2adb6636bd V7: Error upgrading due to SecurityStamp being null (#6343) 
* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
 2019-09-20 13:09:26 +02:00
stevemegson
98e39ed3ef V7: Error upgrading due to SecurityStamp being null (#6343) 
* Allow login with a null SecurityStamp when upgrading

* Added migration to fill in missing SecurityStamp

* Make sure we initialize UmbracoContext as it is needed in some tests that use UmbracoBackOfficeIdentity.AddUserDataClaims

* Moved check for null SecurityStamp

* Generate new SecurityStamp in C#

* Bump version to 7.15.4
 2019-09-20 11:38:44 +02:00
martin j griffiths
4535885bdb Update rte.controller.js 
Fix issue where an embedded macro prevents editor from returning to pristine/valid after a publish

(cherry picked from commit b4495d0ae5)
 2019-09-19 11:53:38 +02:00
martin j griffiths
b4495d0ae5 Update rte.controller.js 
Fix issue where an embedded macro prevents editor from returning to pristine/valid after a publish
 2019-09-19 11:50:47 +02:00
Shannon Deminick
8c46984a2f U4-9912 Previewing without changing creates new version (#1943) 
(cherry picked from commit 7d0d5b9c93)
 2019-09-19 10:48:08 +02:00
Shannon Deminick
7d0d5b9c93 U4-9912 Previewing without changing creates new version (#1943) 2019-09-19 10:46:02 +02:00
Shannon
8a60c95a36 Fixes default weighting for Umbraco.Web handlers and adds unit test 2019-09-12 17:04:29 +10:00
Sebastiaan Janssen
83ad1fd910 Apply only the wanted change from V7/bug/6283 save member resets password #6284 2019-09-10 17:13:31 +02:00
Elitsa Marinovska
c8c60b7518 Reverting unintended merge 
Revert "V7/bug/6283 save member resets password"
 2019-09-10 13:56:07 +02:00
Elitsa Marinovska
f0fb371b2c Revert "V7/bug/6283 save member resets password" 2019-09-10 13:54:35 +02:00
Elitsa Marinovska
979d25dd07 Merge pull request #6284 from umbraco/v7/bug/6283-save-member-resets-password 
V7/bug/6283 save member resets password
 2019-09-10 13:10:11 +02:00
elitsa
8bc2cc7d4c Merge branch 'v7/dev' into v7/bug/6283-save-member-resets-password 2019-09-10 10:50:18 +02:00
Mark Bowser
39972049bb Apply focus to URL input on embed overlay open. Issue #6276 
(cherry picked from commit a58a2e8aa9)
 2019-09-05 15:08:42 +02:00
Mark Bowser
a58a2e8aa9 Apply focus to URL input on embed overlay open. Issue #6276 2019-09-05 15:07:17 +02:00
Sebastiaan Janssen
d3f3c74e10 Fix #6283 Save Member resets password 2019-09-05 11:47:13 +02:00
Sebastiaan Janssen
90c99eda17 Bump version to 7.15.3 2019-08-29 15:00:32 +02:00
Kenn Jacobsen
c6e32019c6 V7: Add confirmation when deleting content and media (#6004) 
(cherry picked from commit 3f8dffee3f)
 2019-08-29 13:42:10 +02:00