yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,076 Commits 4 Branches 7 Tags
6d8ffb903fbb6b4626415a50bfc2ed7883a9999b
Commit Graph

3625 Commits

Author SHA1 Message Date
Shannon
1e147f97e1 Updates examine, updates loghelper references. 2015-07-15 10:29:28 +02:00
Stephan
db0cfad6b9 Merge 7.2.7 into dev-v7 
Conflicts:
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	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/umbraco.MacroEngines/packages.config
	src/umbraco.cms/packages.config
	src/umbraco.cms/umbraco.cms.csproj
	src/umbraco.controls/umbraco.controls.csproj
	src/umbraco.editorControls/umbraco.editorControls.csproj
 2015-07-14 19:57:56 +02:00
Stephan
1e3dd4c5cd Cleanup new umbracoApplicationUrl config 2015-07-14 19:28:14 +02:00
Sebastiaan Janssen
a7871abbd9 Update Examine and ClientDependency to latest version 2015-07-14 16:50:45 +02:00
Stephan
effa632fab DatabaseServerMessenger - ensure instructions 2015-07-14 16:21:05 +02:00
Stephan
161f2eda86 DisposableObject - cleanup & use 2015-07-14 15:57:01 +02:00
Stephan
bf3a08cf85 DisposableObject - cleanup & use 2015-07-14 15:56:23 +02:00
Shannon
a4dbc33b9a updates LogHelper references 2015-07-14 10:52:04 +02:00
Shannon
6b2e042e76 updates LogHelper references 2015-07-14 10:49:43 +02:00
Stephan
7bf28a20e7 DatabaseServerMessenger - sync only if MainDom 2015-07-13 22:57:39 +02:00
Stephan
d386c069ee Post-merge 2015-07-13 22:57:38 +02:00
Stephan
d83fdb48c9 Merge branch 7.2.7 into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/AsyncLock.cs
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
	src/Umbraco.Core/CoreBootManager.cs
	src/Umbraco.Core/Logging/LogHelper.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Core/TypeFinder.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
	src/Umbraco.Tests/ServerEnvironmentHelperTests.cs
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/less/grid.less
	src/Umbraco.Web.UI.Client/src/less/panel.less
	src/Umbraco.Web.UI.Client/src/less/property-editors.less
	src/Umbraco.Web.UI.Client/src/loader.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/datepicker/datepicker.controller.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/LatchedBackgroundTaskBase.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/RecurringTaskBase.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Scheduling/ScheduledTasks.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/UI/JavaScript/JsInitialize.js
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/content.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-13 22:45:37 +02:00
Shannon
6aa633c8c5 changes app timeout to 1.5 mins 2015-07-13 17:10:35 +02:00
Shannon
eddd643249 ensures that when setting the PropertyType's property on a PropertyGroup that the PropertyGroupId is set and updates an auth method to ensure that the correct identity type is returned. 2015-07-13 15:52:21 +02:00
Stephan
c01f864e37 ApplicationContext - manage MainDom 
Conflicts:
	src/Umbraco.Core/ApplicationContext.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-07-13 14:41:07 +02:00
Stephan
4acbdbe896 Move WaitOneAsync from AsyncLock to WaitHandleExtensions 
Conflicts:
	src/Umbraco.Core/AsyncLock.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-07-13 14:16:43 +02:00
Shannon
bce8affe16 removes unused method 2015-07-09 15:19:47 +02:00
Shannon
4bbd8097a2 Merge branch '7.2.7' of https://github.com/umbraco/Umbraco-CMS into 7.2.7 2015-07-09 15:08:41 +02:00
Shannon
431d066300 Changes the ApplicationEventHandler to check if the db is configured instead of being connected to which can cause issues if SQLCE file is locked by another app domain on startup. Then we verify in the CoreBootManager that the db can be connected to with a retry policy. Changes the db context CanConnect method to not store a static value since it might later be able to be connected to. 2015-07-09 14:31:59 +02:00
Shannon
6d50bd891a moves the ApplicationContext.IsConfigured to a lazy initializer 2015-07-09 14:30:32 +02:00
Stephan
1d00e3c5d8 UmbracoApplication - log unhandled exceptions 
Conflicts:
	src/Umbraco.Core/UmbracoApplicationBase.cs
 2015-07-08 21:33:22 +02:00
Stephan
97533e7c3d UmbracoApplication - log unhandled exceptions 2015-07-08 21:29:17 +02:00
Shannon
e69422c8d8 Fixes tests (backports cache fix by name) 2015-07-08 18:14:31 +02:00
Shannon
a277ac2fe4 udpates some logging stuff which will also make logging faster. 2015-07-08 17:55:08 +02:00
Shannon
1067b1e245 BackgroundTaskRunner - refactor recurring tasks, improve shutdown 
Conflicts:
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/Scheduling/LogScrubber.cs
	src/Umbraco.Web/Scheduling/Scheduler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2015-07-08 17:41:20 +02:00
Shannon
7987f13a11 U4-6788 - refactor OriginalRequestUrl into UmbracoApplicationUrl 
and fixes merge issues.
 2015-07-08 17:32:36 +02:00
Shannon
9a626c9da6 Merge branch '7.2.7' of https://github.com/umbraco/Umbraco-CMS into 7.2.7 2015-07-08 16:45:42 +02:00
Shannon
0520797c09 more logging 2015-07-08 16:45:34 +02:00
Stephan
9b85ba5b90 Resolution - better logging when freezing 2015-07-08 16:32:43 +02:00
Stephan
993a5bbc92 Resolution - better logging when freezing 2015-07-08 16:28:53 +02:00
Shannon
ca738979ce Adds some more detailed logging. 2015-07-08 16:27:06 +02:00
Stephan
c9489bb912 DatabaseServerMessenger - default instructions retention is 2 days 2015-07-08 14:42:47 +02:00
Stephan
fce688f47f DatabaseServerMessenger - local identity is unique appdomain 2015-07-08 14:42:38 +02:00
Shannon
8cfb56adf4 adds machine name logging to startup 2015-07-08 13:28:15 +02:00
Shannon
46f9c5ff05 Fixes: U4-5052 (U7) Previewing a published page changes icon in content tree to the little green plus indicating changes need to be published even though no changes have been made. 2015-07-08 11:46:03 +02:00
Shannon
275ba00e24 Fix IsBackOfficeRequest returning false for virtual directory paths - U4-6346 2015-07-08 11:10:30 +02:00
Shannon
04976f8063 U4-6202 - cache clearing by object type 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2015-07-08 11:08:19 +02:00
Shannon
3e7c9fc81e Fixes: U4-6202 Cache not clearing by object type properly 
Conflicts:
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2015-07-08 11:07:53 +02:00
Shannon
a1f4d7b16f Fixes: U4-5798 The database configuration failed with the following message: The incoming request has too many parameters. The server supports a maximum of 2100 parameters. 2015-07-08 11:05:30 +02:00
Shannon
811ef4a444 Fixes: U4-5673 SQL Azure cannot drop clustered index on upgrade 2015-07-08 11:03:42 +02:00
Shannon
69ac621f5a Fixes: U4-5670 Umbraco.DropDown List pre value with alias ** already exists for this data type 2015-07-08 11:03:10 +02:00
Shannon
5d60440a6f Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-07 18:27:38 +02:00
Shannon
0fe96e80c9 Fixes: U4-6782 ContentTypeService should support getByKey(Guid) and refactors a little bit of the RepositoryBase stuff with the addition of IReadRepository, adds some tests to support. 2015-07-07 18:26:53 +02:00
Shannon
a712726065 Updates the logger and how to output process id and app domain id with the default log4net patterns. 2015-07-07 16:18:57 +02:00
Shannon
253b9dab27 Ensures log4net is shutdown on app shutdown 2015-07-07 16:12:05 +02:00
Sebastiaan Janssen
b0ccb040a1 Makes sure we can have nightlies for non-pre-releases as well 2015-07-07 15:11:57 +02:00
Shannon
7c451411cb Fixes issue with upgrading - potential file lock issues and also file check for access.config 2015-07-07 11:24:28 +02:00
Shannon
bf19d61d14 bumps txt version 2015-07-06 18:02:25 +02:00
Shannon
2cd5551913 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-06 17:57:07 +02:00
Shannon
3a3917c1fc Fixes: U4-4231 remove umbracoUserLogins table 2015-07-06 17:52:07 +02:00