yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
12,409 Commits 4 Branches 7 Tags
040486c32bbd5cdcb2c3df478f068bc40e392c97
Commit Graph

12409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
040486c32b Merge branch 'dev-v7' into 7.3.0 2015-03-31 17:04:52 +11:00
Shannon
cf1c38dcaa fixes build 2015-03-31 17:04:32 +11:00
Shannon
3b6d557dd4 Merge branch 'dev-v7' into 7.3.0 2015-03-31 14:28:20 +11:00
Shannon
73d7cd4856 updates sln file to remove the PDF proj and removes the sln folder containing umbraco examine libs 2015-03-31 14:27:18 +11:00
Shannon
74f4b60a21 Merge branch 'dev-v7' into 7.3.0 2015-03-31 14:04:49 +11:00
Shannon
1b87fd074c Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-03-31 13:49:39 +11:00
Shannon
33f21e0528 Updates build and solution to exclude UmbracoExamine.PDF, removes files for UmbracoExamine.PDF, updates links to license in nuspec files 2015-03-31 13:49:28 +11:00
Sebastiaan Janssen
0b5a2452c2 U4-6476 Examine Issue: The CancellationTokenSource has been disposed. 
#U4-6476 Fixed Due in version 7.2.5
 2015-03-30 14:38:59 +02:00
Shannon
cc8962f090 Removes the old umbracoexamine.azure libs 2015-03-30 20:07:26 +11:00
Shannon
f6b9fdba72 Removes old docs folder 2015-03-30 20:06:51 +11:00
Shannon
e0effec3b4 fixes pdf build to only have it's required files in the zip 2015-03-30 19:13:13 +11:00
Shannon
76a2f433d9 simplifies build since we don't have the examine azure stuff 2015-03-30 18:42:47 +11:00
Shannon
a2bfca4d3a Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-03-30 17:40:46 +11:00
Shannon
fb24becd0d completes: U4-6468 Move all 'Strategies' in the Web project that performs Core data operations to the Core project 2015-03-30 17:40:36 +11:00
Shannon
58857c5d83 Moves publishing strategies into CacheRefresherEventHandler where the event handlers are supposed to exist. 2015-03-30 17:36:54 +11:00
Shannon
7a31d6cae3 better exception logging for examine 2015-03-30 17:23:28 +11:00
Shannon Deminick
021bb6d367 Merge pull request #661 from kgiszewski/dev-v7 
Fix for U4-6462
 2015-03-30 16:27:19 +11:00
Shannon Deminick
0742108ec1 Merge pull request #662 from AndyButland/u4-6412 
U4-6412 - Ensures footer breadcrumb in content and media returned in correct order
 2015-03-30 10:44:08 +11:00
Shannon
5464107a9a replaces all LogHelper calls with to use ILogger in XmlCacheFilePersister 2015-03-27 15:21:12 +11:00
Shannon
84345a7e37 Merge branch 'dev-v7' into 7.3.0 2015-03-27 15:19:45 +11:00
Shannon
fda72b2acc changes the MaxWaitMilliseconds tp 30000 to be consistent with the 7.3 branch 2015-03-27 15:19:31 +11:00
Shannon
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
Shannon
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
Shannon
4bdac1475f fixes log scrub interval with ms with updated background tasks 2015-03-27 14:52:38 +11:00
Stephan
58ce04e26b cleanup 2015-03-27 14:49:31 +11:00
Shannon
4c3de920c6 Removes the 'else' so that 'wait' is always checked. 2015-03-27 14:49:31 +11:00
Stephan
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
Stephan
a73b7a5849 refactor Scheduler to use new BackgroundTaskRunner capabilities 
Conflicts:
	src/Umbraco.Web/Scheduling/Scheduler.cs
 2015-03-27 14:48:47 +11:00
Stephan
b7436dc55f refactor BackgroundTaskRunner 2015-03-27 14:47:42 +11:00
Shannon
bc068b201d Updates BackgroundTaskRunner to ensure canceled or skipped tasks are disposed, updated tests to reflect 2015-03-27 14:47:42 +11:00
Shannon
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
Shannon
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
AndyButland
0c107fd869 Ensures footer breadcrumb in content and media returned in correct order 2015-03-25 21:52:39 +01:00
kgiszewski
6419f301f7 Fix for U4-6462 2015-03-25 16:30:47 -04:00
Sebastiaan Janssen
e775471013 Set disableFindContentByIdPath=false for local debugging of Umb source (the release config was already correct) 2015-03-25 17:08:53 +01:00
Shannon Deminick
cc109d1ed0 Merge pull request #660 from perosb/U4-6444 
Fix for U4-6444
 2015-03-25 09:16:49 +11:00
Sebastiaan Janssen
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
Per Osbeck
ffaf1f96b9 Fix for U4-6444 2015-03-24 09:28:53 +01:00
Shannon
4e195543ea fixes null ref with component renderer in UmbracoHelper 2015-03-24 15:12:58 +11:00
Shannon
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
Shannon Deminick
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
Robert Foster
c6b393f2e8 typo fix in pageIndex Mandate checks 2015-03-24 12:30:28 +11:00
Shannon Deminick
344d909e6b Merge pull request #657 from webprofijt/packageinstaller-spelling 
Fix some spelling mistakes in package installer
 2015-03-23 09:45:56 +11:00
Arnoud de Vries
e3925f18ef Fix some spelling mistakes in package installer 2015-03-22 16:29:53 +01:00
Sebastiaan Janssen
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
Sebastiaan Janssen
907e5e7ca4 Bump version 2015-03-20 11:25:59 +01:00
Sebastiaan Janssen
94e281e951 Merge branch '7.2.4' into dev-v7 2015-03-20 11:23:30 +01:00
Sebastiaan Janssen
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
Shannon
27e96d6d5b Fixes: U4-6436 Localization in the back office doesn't work immediately after app restart 2015-03-20 10:35:34 +01:00
Shannon
d2b4345773 Fixes: U4-6433 Usercontrol loaded after package installation not executing 2015-03-20 10:35:23 +01:00