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

13100 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
9be2f99e7b Scheduler - does not run tasks if not MainDom 2015-07-13 14:53:07 +02:00
Stephan
2d5bfc0fe2 Use MainDom status to protect umbraco.config 
Conflicts:
	src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
	src/Umbraco.Web/umbraco.presentation/content.cs
 2015-07-13 14:52:55 +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
a8be796d68 Bugfix content for LB 2015-07-13 14:17:00 +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
Stephan
34a9eef8b8 BackgroundTaskRunner - add Hosted option, refactor some tasks 
Conflicts:
	src/Umbraco.Web/Scheduling/BackgroundTaskRunner.cs
 2015-07-13 14:13:47 +02:00
Stephan
0f56fa4baa Bugfix content xml doctype issue 2015-07-13 14:08:50 +02:00
Shannon
82a8404b2e Updates TemplateRenderer to not use singletons and to ensure that the http context values are copied back if anything fails 2015-07-09 18:30:52 +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
da9c810d78 Updates examine initialization of its IIndexCriteria to be lazy, this will save a few db calls on startup and ensure they are excuted at the very last possible time. 2015-07-09 14:32:50 +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
ccda1bdd73 Refactor scheduled tasks & publishing cancellation 2015-07-08 17:23:15 +02:00
Shannon
76a6f2d2d0 Updates scheduled tasks to be async with cancellation token 2015-07-08 17:23:00 +02:00
Shannon
69428b2281 Scheduled publishing is executing request async with cancellation token 2015-07-08 17:22:44 +02:00
Shannon
7cd39918a0 another log entry 2015-07-08 16:54:38 +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
Stephan
6833c195c1 BackgroundTaskRunner - refactor recurring tasks, improve shutdown 2015-07-08 13:18:46 +02:00
Shannon
053346d79b fixes merge 2015-07-08 11:54:10 +02:00
Shannon
044c9c95f8 Merge branch 'dev-v7-U4-6677' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-U4-6677 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/panel.less

Conflicts:
	src/Umbraco.Web.UI.Client/src/less/panel.less
 2015-07-08 11:49:09 +02:00
Shannon
b23ea69b3e Fixes: U4-6636 Left navbar (section-bar) is unnecessary wide on mobile devices 
Conflicts:
	src/Umbraco.Web.UI.Client/src/less/grid.less
 2015-07-08 11:48:17 +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
3bc4b50d74 updates version 2015-07-08 11:36:50 +02:00
Shannon
1a2849dfb0 fixes merge issues 2015-07-08 11:35:55 +02:00
Shannon
bcb5883230 Fixes: U4-3514 Add dropdown list of tabs, if more then 6 tabs 
Conflicts:
	src/Umbraco.Web.UI.Client/bower.json
	src/Umbraco.Web.UI.Client/gruntFile.js
 2015-07-08 11:16:46 +02:00
Shannon
18080c1cfb Fixes: U4-6796 BackOfficeIdentity gets assigned inadvertently for front-end requests if using ui.Text to localize 2015-07-08 11:13:49 +02:00
Shannon
2600a3887e Fixes issue with upgrading - potential file lock issues and also file check for access.config 
Conflicts:
	src/Umbraco.Core/Persistence/Migrations/Upgrades/TargetVersionSevenThreeZero/MovePublicAccessXmlDataToDb.cs
 2015-07-08 11:13:24 +02:00
Shannon
45bec2a67d Fixes date picker: U4-6715 i can't seem to remove a "publish-at" date? - date picker is more robust now and does proper validity checking/feedback 2015-07-08 11:12:19 +02:00
Shannon
da7456fd2a Fixes up unit test for testing back office request to ensure that the GlobalSettings.Path is consistent with a vdir 2015-07-08 11:11:17 +02:00
Shannon
275ba00e24 Fix IsBackOfficeRequest returning false for virtual directory paths - U4-6346 2015-07-08 11:10:30 +02:00
Shannon
d00bf4649d Fix for JsSource on legacy trees not supporting virtual paths (~/) - U4-6346 
Conflicts:
	src/umbraco.cms/Actions/Action.cs
 2015-07-08 11:10:18 +02:00