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

6593 Commits

Author SHA1 Message Date
Shannon
d7f2041ee9 Makes the TourFilterResolver a real resolver 2018-01-11 18:00:42 +11:00
Claus
ce11a377e6 refactor 2018-01-10 11:37:37 +01:00
Claus
c6443c477f no need to log when throwing - that gets logged. 2018-01-10 11:13:28 +01:00
Claus
eb94572361 updating pr to fit with base. 2018-01-10 10:55:46 +01:00
Claus
fd8317493e Merge branch 'dev-v7.8' into temp-U4-10707 
# Conflicts:
#	src/Umbraco.Web/Editors/TourController.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
 2018-01-10 10:10:19 +01:00
Shannon
c3be9004f6 U4-10811 Store custom tours as json and load from App_Plugins/{MyPlugin}/backoffice/tours 2018-01-10 16:01:46 +11:00
Shannon
11fa015b64 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2018-01-10 15:08:10 +11:00
Claus
a5ec5f46ac filtering out tours. 2018-01-09 15:49:19 +01:00
Claus
f52a84937b Merge pull request #2332 from ruant/U4-10596 
fix: add CultureInfo.InvariantCulture to int.Parse
 2018-01-08 14:07:10 +01:00
Shannon
5181988a41 forgot to set the flag 2018-01-08 18:10:27 +11:00
Shannon
5169310258 Makes sure we check for index locking on both a normal boot with empty indexes and a cold boot when that is being forced 2018-01-08 17:57:15 +11:00
Shannon Deminick
c36aec624b Merge pull request #2367 from umbraco/temp-U4-10756-performance-fix 
Doesn't fix the issue but improves performance by ~30%
 2018-01-04 23:43:25 +11:00
Shannon
e5a21625ea U4-9268 Hidden preview button reappears after 'save' or 'save and publish'. 2018-01-04 21:53:55 +11:00
Niels Hartvig
6d46c2204d Doesn't fix the issue but improves performance by ~30% 2018-01-03 12:54:25 +01:00
Shannon
773ef1d168 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2018-01-02 15:28:30 +11:00
Shannon
e4561851a4 modifies some code changes to null check and not to use extension methods that require singleton access. 2017-12-21 17:30:37 +11:00
Shannon Deminick
c6daf2e111 Merge pull request #2353 from mitutee/temp-U4-10770 
U4-10770
 2017-12-21 17:20:19 +11:00
Shannon Deminick
fcaf78ef29 Merge pull request #2355 from umbraco/temp-u4-10774 
U4-10774 - leak in CacheRefresherEventHandler
 2017-12-20 16:06:41 +11:00
Stephan
b664fc5e94 U4-10774 - leak in CacheRefresherEventHandler 2017-12-19 10:04:33 +01:00
m.kilianovskyi
5f82fc6e20 Merge branch 'dev-v7' into HEAD 2017-12-18 17:51:27 +02:00
m.kilianovskyi
b1a0ca98ea U4-10770 Get all permissions for entity instead of explicit only 2017-12-18 17:50:53 +02:00
Shannon
6f55b84c65 removes this. convention 2017-12-18 15:34:15 +11:00
Shannon Deminick
43f369f96f Merge pull request #2306 from Sam7/dev-v7 
U4-10453 - Ability to Sync after each external login (using OWIN)
 2017-12-18 14:42:25 +11:00
Shannon
c1b3da869d U4-10686 TypedMediaAtRoot().Descendants() calls SQL 2017-12-15 16:01:20 +11:00
Shannon
aed476de0a Merge branch 'dev-v7' into dev-v7.8 2017-12-14 19:26:45 +11:00
Shannon
ddd9c8ef7d Do a lock check on the index on startup and unlock it if it is, this is a safety check since we are now using the simplefs dir 2017-12-14 19:25:01 +11:00
Shannon
9e2c7d16a6 Merge branch 'dev-v7' into dev-v7.8 2017-12-14 18:35:34 +11:00
Shannon
44db4e7a48 updates nuspec and references to use latest Examine 2017-12-14 18:34:48 +11:00
Shannon
8053cea92d Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/UdiEntityType.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/umbraco.cms/umbraco.cms.csproj
 2017-12-14 16:24:25 +11:00
Shannon
f44b158c15 When we disable examine indexing on startup with MainDom, also suspend all indexing 2017-12-14 16:19:54 +11:00
Robert
1ff66d0c3a Merge pull request #2345 from umbraco/temp-U4-10735 
U4-10735 Examine update to better manage appdomain shutdowns
 2017-12-13 10:52:56 +01:00
Shannon
2e097b7e46 U4-10588 Indexed member data is missing fields 2017-12-12 11:25:53 +01:00
Shannon
37f6dbfa6b more logging 2017-12-06 15:46:35 +01:00
Shannon
131fea3ba4 updates some proj refs 2017-12-06 15:38:00 +01:00
Shannon
b0661218a0 U4-10735 Examine update to better manage appdomain shutdowns 2017-12-06 15:21:38 +01:00
Claus
91e658c41c U4-10610 Cannot restore content templates 2017-12-05 10:37:23 +01:00
Stephan
9694831638 U4-10715 - scheduled publishing and LB issue 2017-11-30 08:54:16 +01:00
Rune Antonsen
fe67a09ccb fix: add CultureInfo.InvariantCulture to int.Parse 
Fix issue where different Culture some times makes int.Parse thrown an `System.FormatException: 'Input string was not in a correct format.' `

Closes: U4-10596
 2017-11-23 15:12:01 +01:00
Mads Rasmussen
4bfb2d219b Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2017-11-16 12:01:26 +01:00
Sebastiaan Janssen
1f41aa7d81 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
 2017-11-14 07:19:08 +01:00
Stephan
928c0dc535 Merge pull request #2314 from umbraco/temp-U4-10646 
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
 2017-11-13 17:33:27 +01:00
Sebastiaan Janssen
065e764957 Update to latest Examine 2017-11-13 15:39:28 +01:00
Sebastiaan Janssen
000ba73887 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Tests/packages.config
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web.UI/packages.config
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/packages.config
#	src/UmbracoExamine/UmbracoExamine.csproj
#	src/UmbracoExamine/packages.config
#	src/umbraco.MacroEngines/packages.config
#	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2017-11-13 15:38:59 +01:00
Sebastiaan Janssen
4937f87c0d Update to latest Examine 2017-11-13 15:27:15 +01:00
Mads Rasmussen
6b6a7fe231 Merge branch 'dev-v7' into dev-v7.8 2017-11-13 14:47:52 +01:00
Shannon
2dc11f6fa1 Fixes new installation user login 2017-11-09 23:05:56 +11:00
Shannon
b9b1fc3a70 Adds a global config switch to enable/disable tours entirely 2017-11-09 00:57:05 +11:00
Shannon
1d52f59657 Puts tours on the file system and loads them from an api controller 2017-11-09 00:41:59 +11:00
Shannon
78f6b8d8bc Fixes up more the the session id validation, makes sure that the GetUserSecondsMiddleWare also validates the session since this is what keeps the user logged in if that option is being used. 2017-11-08 23:57:17 +11:00
Claus
c7d9683fc4 Merge pull request #2277 from umbraco/temp-U4-10589 
U4-10589 Login should be sanitized and/or cause validation errors if trying to save with
 2017-11-08 12:07:34 +01:00