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

145 Commits

Author SHA1 Message Date
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Bjarke Berg
6d92f5915a Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-15 13:44:42 +01:00
Bjarke Berg
d2443ea4c0 AB3677 - Removed the Core.Composing.Current.. Moved stuff to Web.Composing.Current and injected more stuff. 2020-01-07 13:08:21 +01:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-01-07 09:46:42 +01:00
Bjarke Berg
439048bc4f Merge pull request #7380 from AndyButland/feature/7371-short-string-helper 
.NET Core transition: Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection (#7371)
 2020-01-07 09:05:28 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Shannon
94d05b1768 Fixes #7404 - Deadlock issue 2020-01-06 21:14:46 +11:00
Andy Butland
d469a2153b Removed (almost) all instances of Current.ShortStringHlper and replaced with constructor injection. 2019-12-20 17:36:44 +01:00
Bjarke Berg
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +01:00
Bjarke Berg
67536a49a7 Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-10 08:37:19 +01:00
Bjarke Berg
becce7800b Moved Models from Umbraco.Core to Umbraco.Infrastructure 2019-12-09 14:12:06 +01:00
Shannon
6bba032325 re-merges 2019-12-04 16:09:39 +11:00
Shannon
8218467e04 Merge branch 'v8/dev' into v8/bugfix/6546-MainDom-Cleanup 
# Conflicts:
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
 2019-12-04 16:09:22 +11:00
Bjarke Berg
bec4205ef5 Introduced a IHostingEnvironment and one implemtation for AspNetHostingEnvironment 2019-11-20 13:38:41 +01:00
Bjarke Berg
603ec0ccfb AB3594 - Moved the composition root out to UmbracoApplicationBase, and injecting the needed parts from there. Also remove usages of ConfigurationManager from Umbraco.Core 2019-11-15 11:41:13 +01:00
Shannon
d84963dac5 Uses ITypeFinder abstraction where required 2019-11-11 16:07:47 +11:00
Bjarke Berg
63bfc4c2c0 Move constants 2019-11-05 14:55:42 +01:00
Bjarke Berg
befcabfced Move constants 2019-11-05 13:28:26 +01:00
Bjarke Berg
ad6343719b Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-10-31 11:48:53 +01:00
Shannon
68db41fe93 Ensures that when there is no cache file, or if a cache file is empty, on startup any call to SetAllFastSorted was not ensuring the local db cache file was updated if the data was loaded from the database. 2019-10-31 18:58:07 +11:00
Shannon
bf37bbf4fe oops fixes the log output 2019-10-31 16:34:30 +11:00
Shannon
40e656de46 notes 2019-10-31 16:27:34 +11:00
Shannon
aff4814e0b Ensures that PublishedSnapshotService cannot close the local cache files after they are created but before they are populated 2019-10-31 16:06:43 +11:00
Shannon
c682bbcaf1 Adds notes and better logging to PublishedSnapshotService, fixes log output from HealthCheckNotifier, changes initial delay time of scheduled task to be longer. 2019-10-31 15:45:57 +11:00
Shannon
b04f9c17ae Makes some updates based on code reviews 2019-10-22 11:55:05 +11:00
JohnBlair
478bc708b9 Defensive programming around disposal of local content and media dbs. 2019-10-22 11:45:03 +11:00
JohnBlair
ee098e0194 Make sure the local dbs are disposed of if the content store was not created. 2019-10-22 11:44:07 +11:00
JohnBlair
7ace5baf9b Allow nucache content and/or media db files to be reused if they already exist. 2019-10-22 11:44:07 +11:00
Shannon
beb16a2f79 Ensures MainDom.Register absolutely does not call install logic if it's not MainDom, adds logging 2019-10-21 15:47:37 +11:00
Shannon
6d38f946a4 ensures nucache table isn't rebuilt when adding a new lang 2019-10-16 15:00:13 +11:00
Shannon
9008641965 ensures the domain cache is totally refreshed when changing langs 2019-10-14 22:02:42 +11:00
Shannon
35a7283952 Fixes #2997 - ContentService returns outdated result 2019-09-27 10:59:29 +02:00
Shannon
1caf7f4587 Fixes regression issue in nucache causing a panic exception 2019-09-25 13:51:19 +02:00
Shannon
de03130256 Don't fully regenerate models on startup, they will be regenerated if they are not there or if the hashes don't match so let MB use it's cached models if it can. 2019-09-10 17:10:46 +10:00
Shannon
fb38d9afe1 Merges - double linked list for children performance + updates 2019-08-19 23:22:27 +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
Shannon
bbd6e1150e Changes loading from DB to use SetAllFastSorted since it's already sorted by level + sort order 2019-08-15 23:59:46 +10:00
Shannon
3d56e45266 Adds notes, cleans up other code 2019-08-15 19:25:28 +10:00
Shannon
e9d4b607bb Adds POC for fast building of in-memory nucache from persisted files 2019-08-15 19:05:43 +10:00
Warren Buckley
bb8356d7db Merge pull request #5924 from umbraco/v/bugfix/5035-slot-swap2 
Fixes race condition in PublishedSnapshotService and more...
 2019-07-23 09:18:44 +01:00
Shannon
02f49a0039 Cherry picks fix for 5894 and makes adjustments 2019-07-19 16:00:42 +10:00
Shannon
3603090421 Fixes race condition in PublishedSnapshotService and more... 2019-07-17 22:51:14 +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
Stephan
b306e41560 NuCache - failover to database when local db fails to load 2019-06-25 13:26:50 +02:00
Stephan
e8d6daf59a NuCache - be more tolerant when cache is weird 2019-06-25 12:54:16 +02:00
Stephan
14a056f4f4 Fix and cleanup 2019-06-07 11:15:58 +02:00
Stephan
bb0331e9cc Move IPublishedContent.Url() to ext method 2019-04-24 14:25:41 +02:00