cd3191012f
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
src/Umbraco.Web/PublishedCache/XmlPublishedCache/XmlCacheFilePersister.cs
src/Umbraco.Web/Scheduling/LogScrubber.cs
src/Umbraco.Web/Umbraco.Web.csproj
src/Umbraco.Web/umbraco.presentation/content.cs
2015-03-27 15:15:49 +11:00
ec742d1f66
removes the usages of ILogger and ProfilerLogger since this is not for 7.3.0, will need to re-fix for 7.3 branch.
2015-03-27 14:56:12 +11:00
4bdac1475f
fixes log scrub interval with ms with updated background tasks
2015-03-27 14:52:38 +11:00
58ce04e26b
cleanup
2015-03-27 14:49:31 +11:00
4c3de920c6
Removes the 'else' so that 'wait' is always checked.
2015-03-27 14:49:31 +11:00
be37026587
refactor latched background tasks, now use a task for xml
...
Conflicts:
src/Umbraco.Web.UI/config/ClientDependency.config
2015-03-27 14:49:25 +11:00
a73b7a5849
refactor Scheduler to use new BackgroundTaskRunner capabilities
...
Conflicts:
src/Umbraco.Web/Scheduling/Scheduler.cs
2015-03-27 14:48:47 +11:00
b7436dc55f
refactor BackgroundTaskRunner
2015-03-27 14:47:42 +11:00
bc068b201d
Updates BackgroundTaskRunner to ensure canceled or skipped tasks are disposed, updated tests to reflect
2015-03-27 14:47:42 +11:00
912b01c9aa
Updates BackgroundTaskRunner to support more complex options including the ability to only execute the last/final task in the queue. Added tests to support, updated the 'content' object to use this option so that only the last task in the queue will execute so that file persisting doesn't get queued but the correctly queued data will be written.
2015-03-27 14:47:42 +11:00
a82035061c
Updates BackgroundTaskRunner to support async operations. Updates the content xml cache file persisting to use a IBackgroundTask instead of the strange queuing for persistence - which was super strange because in many cases another request thread will actually be the thread that is persisting the xml file than the request thread that requested it created. This implementation is far better, the xml file will be persisted on a non request thread and will handle multiple documents being published at the same time guaranteeing that the latest published version is the one persisted. The file persistence is also web aware (due to how BackgroundTaskRunner works) so during app shutdown the file will still be written if it's currently being processed.
2015-03-27 14:47:41 +11:00
e775471013
Set disableFindContentByIdPath=false for local debugging of Umb source (the release config was already correct)
2015-03-25 17:08:53 +01:00
cc109d1ed0
Merge pull request #660 from perosb/U4-6444
...
Fix for U4-6444
2015-03-25 09:16:49 +11:00
9dfccd86fd
U4-2499 Remove the possibility for accessing pages with nodeid's or give a redirect option
...
#U4-2499 Fixed Due in version 7.2.5
2015-03-24 20:09:48 +01:00
ffaf1f96b9
Fix for U4-6444
2015-03-24 09:28:53 +01:00
4e195543ea
fixes null ref with component renderer in UmbracoHelper
2015-03-24 15:12:58 +11:00
2c918a2015
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-24 15:10:45 +11:00
aa3c1d645b
Merge pull request #659 from robertjf/dev-v7
...
Issue#U4-6448 typo fix in pageIndex Mandate checks
2015-03-24 12:45:35 +11:00
c6b393f2e8
typo fix in pageIndex Mandate checks
2015-03-24 12:30:28 +11:00
344d909e6b
Merge pull request #657 from webprofijt/packageinstaller-spelling
...
Fix some spelling mistakes in package installer
2015-03-23 09:45:56 +11:00
e3925f18ef
Fix some spelling mistakes in package installer
2015-03-22 16:29:53 +01:00
53a4d063e0
U4-464 The embedded passwordStrength.js file is GPL-licensed
...
#U4-464 Fixed Due in version 7.2.5
2015-03-22 13:13:51 +01:00
907e5e7ca4
Bump version
2015-03-20 11:25:59 +01:00
94e281e951
Merge branch '7.2.4' into dev-v7
2015-03-20 11:23:30 +01:00
03b60d4923
"It's simple until you make it complicated"
...
- So now this logic has been un-complicated: look for the web.config file, if it exists and has a umbracoConfigurationStatus appSetting then don't overwrite the web.config, the user is upgrading umbraco and config transforms can do their thing. Otherwise, copy in a fresh web.config with all the required Umbraco bits.
2015-03-20 10:35:41 +01:00
27e96d6d5b
Fixes: U4-6436 Localization in the back office doesn't work immediately after app restart
2015-03-20 10:35:34 +01:00
d2b4345773
Fixes: U4-6433 Usercontrol loaded after package installation not executing
2015-03-20 10:35:23 +01:00
c5bbf97921
Bump version
2015-03-20 10:35:14 +01:00
8c4eba7837
"It's simple until you make it complicated"
...
- So now this logic has been un-complicated: look for the web.config file, if it exists and has a umbracoConfigurationStatus appSetting then don't overwrite the web.config, the user is upgrading umbraco and config transforms can do their thing. Otherwise, copy in a fresh web.config with all the required Umbraco bits.
2015-03-20 10:16:53 +01:00
08a2ec6883
Fixes: U4-6436 Localization in the back office doesn't work immediately after app restart
2015-03-20 18:15:31 +11:00
b02e0c0232
Fixes: U4-6433 Usercontrol loaded after package installation not executing
2015-03-20 17:47:33 +11:00
182d671e31
Merge branch 'dev-v7' into 7.3.0
2015-03-20 16:42:34 +11:00
fff0151b62
Updates build process to: Ensure the AssemblyFileVersion is set to the real umbraco version, AssemblyInformationalVersion is set to the real umbraco version including the pre-release name if there is one, AssemblyCopyright has the correct year.
2015-03-20 09:31:14 +11:00
f15301a7a0
Merge remote-tracking branch 'origin/dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
2015-03-20 08:26:16 +11:00
90fdbb007e
Bump version
2015-03-19 14:45:00 +01:00
19e4fe5059
Grid labels header colors for delete and move actions
2015-03-19 14:33:12 +01:00
311d503d8b
Updates CDF dependency to latest version
2015-03-19 12:54:00 +01:00
f0fc3313e4
Tweaked borders a tiny bit
2015-03-19 12:46:29 +01:00
dc7cb08824
Styling for grid editors + row labels
2015-03-19 12:29:05 +01:00
3b2ae6bc4a
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
src/Umbraco.Web/Models/ContentExtensions.cs
2015-03-19 09:39:31 +01:00
5ddcf42bc3
U4-3753 - keep some things internal
2015-03-19 09:37:39 +01:00
b714cbbd72
U4-6320 - fix log scrubbing intervals (from dev-v7)
2015-03-19 09:30:16 +01:00
09afb93ec3
fixes test
2015-03-19 18:04:26 +11:00
ab4cb08c7d
removed notes after checking
2015-03-19 17:48:40 +11:00
2e877aa446
fixes build errors
2015-03-19 17:42:57 +11:00
d3eff734aa
Merge branch 'dev-v7' into 7.3.0
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
src/Umbraco.Core/CoreBootManager.cs
src/Umbraco.Core/Models/Template.cs
src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
src/Umbraco.Core/PropertyEditors/ParameterEditorResolver.cs
src/Umbraco.Core/PropertyEditors/PropertyEditorResolver.cs
src/Umbraco.Core/Services/LocalizedTextService.cs
src/Umbraco.Core/Umbraco.Core.csproj
src/Umbraco.Tests/Plugins/TypeFinderTests.cs
src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
src/Umbraco.Web/Editors/BackOfficeController.cs
src/Umbraco.Web/Models/ContentExtensions.cs
src/Umbraco.Web/PublishedContentExtensions.cs
src/Umbraco.Web/Routing/PublishedContentRequestEngine.cs
src/Umbraco.Web/Scheduling/Scheduler.cs
src/Umbraco.Web/Umbraco.Web.csproj
2015-03-19 17:37:00 +11:00
af112f6b20
Adds nicer grid editor labels on hover
2015-03-19 17:08:14 +11:00
cbef51eaf0
Fixes: U4-6294 Feature Request 7.2.1 Grid - UX - labeling the grid editors - but will see if we can do a better job of the labeling
2015-03-19 16:10:46 +11:00
85ba41dd06
Fixes: U4-5435 Dropdown list multiple, publish keys - single item
2015-03-19 15:50:58 +11:00
e5cf7b089c
oops, added timeouts where they cannot exist for request cache, fixes build
2015-03-19 14:47:08 +11:00
Shannon