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

29959 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
da525513a3 Merge remote-tracking branch 'origin/v7/dev' into v8/dev 
# Conflicts:
#	build/NuSpecs/tools/Web.config.install.xdt
#	src/Umbraco.Web.UI.Client/src/views/common/infiniteeditors/linkpicker/linkpicker.controller.js
#	src/Umbraco.Web.UI.Client/src/views/member/member.edit.controller.js
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/UmbracoHelper.cs
 2019-07-15 16:18:04 +10:00
Shannon Deminick
2ac5e61e44 Merge pull request #5881 from bjarnef/dev-v7-link-picker-url-anchors 
v7: Fix link picker url and anchors
 2019-07-15 13:02:47 +10:00
Bjarne Fyrstenborg
c47a08b553 Add overload for NiceUrl 2019-07-13 16:40:01 +02:00
Bjarne Fyrstenborg
de9241bcf5 Add UmbracoHelper overload methods to get url by guid 2019-07-13 14:50:25 +02:00
Bjarne Fyrstenborg
7c03fe3c1f Adjust parameter 2019-07-13 14:49:35 +02:00
Bjarne Fyrstenborg
82eb241119 Add overload method for Udi 2019-07-13 14:49:05 +02:00
Bjarne Fyrstenborg
1073e6257c Adjust comments 2019-07-13 14:48:35 +02:00
Warren Buckley
61a18297d9 Make v8/dev now 8.2.0 2019-07-12 13:03:20 +01:00
Bjarke Berg
fd8ca35e63 Merge pull request #5869 from umbraco/v8/bugfix/logviewer-error-count 
V8: Fixes LogViewer Error Count search result click
 2019-07-12 12:56:08 +02:00
Warren Buckley
fdd9aee773 Fixes LogViewer Error Count search result clickthrough to include errors & fatal without exception as well 2019-07-12 11:07:15 +01:00
Shannon
ec93030e21 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into v8/dev 2019-07-12 11:23:51 +10:00
Shannon
1d49c8626e Revert "V8: Don't show multiple open menus (take two) (#5609)" 
This reverts commit 9ce996cbba.
 2019-07-12 11:23:36 +10:00
Warren Buckley
03a4b75176 Ran .\build SetUmbracoVersion 8.1.1 to bump version 2019-07-11 15:11:37 +01:00
Sebastiaan Janssen
943b54dcf7 Update 1_Bug.md 2019-07-11 11:55:01 +02:00
Warren Buckley
39bd18ec1a At some point we have upgraded Serilog.Filters.Expressions package & the signature/method name got changed to ByIncludingOnly() 2019-07-11 10:45:41 +01:00
Shannon
e93ddff46b Merge branch 'nathanwoulfe-temp-5147-grid-reorder' into v8/dev 2019-07-09 11:01:11 +10:00
Nathan Woulfe
3144b51c91 fix behaviour on page load - don't add active class if sticky-bar is in viewport 2019-07-09 10:49:34 +10:00
Nathan Woulfe
e92f68d040 improve variable naming 2019-07-09 10:46:29 +10:00
Nathan Woulfe
469054e9b3 No longer need scrollable-container attribute 2019-07-09 10:46:29 +10:00
Nathan Woulfe
d17022d87d make it look pretty 2019-07-09 10:46:29 +10:00
Nathan Woulfe
6865629090 use position:sticky and IntersectionObserver instead of element cloning and position:fixed - much simpler. 2019-07-09 10:46:29 +10:00
Shannon
a4749f201d Ensures luceneIndexer.WaitForIndexQueueOnShutdown is called even when not in MainDom 2019-07-08 23:03:20 +10:00
Shannon Deminick
ad90264ef1 Merge pull request #5695 from linuselander/issue/5218 
Enable removal of unpublished content from ExternalIndex
 2019-07-08 19:34:25 +10:00
Shannon Deminick
9ba7e7742a Merge pull request #5801 from bielu/v8/dev 
Remove last casting to LuceneIndex
 2019-07-08 18:39:40 +10:00
arkadiuszbiel
6473f600c7 Remove last casting to LucenIndex 2019-07-08 08:48:49 +01:00
Claus
78735ff349 Merge pull request #5798 from kjac/v8-fix-save-member 
V8: Can't save members without resetting their password
 2019-07-08 09:29:37 +02:00
Claus
4b605b2580 Merge pull request #5799 from kjac/v7-fix-save-member 
V7: Can't save members without resetting their password
 2019-07-08 09:28:46 +02:00
Kenn Jacobsen
80d7f1b2c9 Make it possible to save a member without resetting the password 2019-07-07 11:36:26 +02:00
Kenn Jacobsen
1af43498d9 Make it possible to save a member without resetting the password 2019-07-07 11:16:02 +02:00
Sebastiaan Janssen
5ada85df29 Provide the correct assembly redirects 2019-07-05 12:11:03 +02:00
Shannon
015ad64e30 Updates the exception thrown during upgrade to provide some meaningful feedback to the user. 2019-07-05 14:36:33 +10:00
Bjarke Berg
6dbb988903 Refactor to limit to only v7.14.0 - V7.15.* 2019-07-04 11:44:05 +02:00
Bjarke Berg
926acb910e Forces the initial migration state of V7 sites that are allowed to be migrated into v7.14 state. 2019-07-04 11:44:05 +02:00
Sebastiaan Janssen
57e3187e3a For some reason this file was not part of the project any more :-( 2019-07-03 22:10:01 +02:00
Bjarke Berg
988d51c4c8 Merge pull request #5767 from umbraco/v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode 
V8: Bugfix for Modelsbuilder models with different versions error
 2019-07-03 13:43:00 +02:00
Bjarke Berg
4733256ca1 Merge pull request #5772 from umbraco/v8/bugfix/fix-n1-issue 
Fixes N+1 Issues caused by the new bypass start nodes changes
 2019-07-03 13:15:55 +02:00
Bjarke Berg
4133a1fe76 Refactored the ModelBindingExceptionFilter to also handle InvalidCastException, and also ensure the models are the same type. 
Otherwise a infinite loop was introduced, when requesting a wrong model in the view.
Also refactored the why we do the retry from Html to Http headers
 2019-07-03 13:14:35 +02:00
Shannon
37bf6fe938 Automatically refresh the page if we encounter a ModelBindingException 2019-07-03 19:15:54 +10:00
Shannon Deminick
31716e574c Update src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs 
good catch!

Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2019-07-03 18:34:11 +10:00
Shannon
126c4cbd46 ensures media is rebuild and adds more notes 2019-07-03 18:25:19 +10:00
Shannon
7cc91f71c2 Fixes pure live mode when changing doc types 2019-07-03 18:11:00 +10:00
Shannon
7c52b9602c Reduce some allocations and in advertent SQL calls along with inadvertent enumeration of the entire cache, adds some notes 2019-07-03 17:43:30 +10:00
Bjarke Berg
c5f1cc15fd Refactored dataTypeId when a guid into dataTypeKey 2019-07-03 08:33:30 +02:00
Shannon
d089518681 Fixes SQL generation to populate the nodedto object of the datatypedto 2019-07-03 15:40:18 +10:00
Shannon
cd6ef35bf9 comments out the fix during investigation - adds some notes 2019-07-03 15:17:51 +10:00
Shannon
47cdc79fcb Merge branch 'v8/dev' into v8/bugfix/5671-fix-for-different-version-number-in-modelbuilder-models-in-live-mode 2019-07-03 13:50:38 +10:00
Shannon
f7382255c2 Fixes N+1 Issues caused by the new bypass start nodes changes 2019-07-03 13:16:40 +10:00
Shannon Deminick
2167eada0c Merge pull request #5764 from umbraco/v8/bugfix/fixes-for-bypass-securtiy-after-merge 
V8: Bugfixes regarding the Bypass Security feature after merge from v7
 2019-07-03 11:27:55 +10:00
Shannon
df11935598 Revert and adjusts "Fixes issue when creating DateTypes of type Umbraco.MultiNodeTreePicker with type member, because -1 can't be casted to Udi" 2019-07-03 11:23:25 +10:00
Shannon
d3b4b9fe64 fix merge 2019-07-03 11:10:34 +10:00