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

12463 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
2f714d0b3e Update MySql.Data dependency 2015-07-16 13:59:19 +02:00
Shannon
0bbcaca067 Add unique id for TextSearch / LuceneSearch 
Add unique id for TextSearch / LuceneSearch for each searcher.
 2015-07-16 13:52:52 +02:00
Sebastiaan Janssen
55d3d8437a Update number of tattoos 2015-07-16 12:44:10 +02:00
Shannon
9e2ab8507f Fixes c# macro tag parser - it needs to parse all macros contained in the entire string, the regex options were wrong meaning if you tried to add multiple macros without parameters it would fail, have added a unit test for that. 2015-07-16 12:31:07 +02:00
Shannon
6ee6c77d6e bumps version 2015-07-16 11:10:36 +02:00
Shannon
9b5d4e5b08 Moves some logic into StringExtensions, updates tests, adds other tests 2015-07-16 10:40:43 +02:00
Shannon
49f8b530b7 FIX U4-6687: Adding tests for RTE Macro parsing when macroAlias is the first attribute and a new test for multiple Macros of various format. 2015-07-16 09:51:04 +02:00
Shannon
56176d0e36 Fix U4-6687: Can't add multiple instances of a macro in RTE in 7.2.6 without ruining RTE formatting 
We found that the MacroTagParser.cs was being greedy and matching all UMBRACO_MACRO tags instead of getting them individually.

macro.service.js was updated for posterity purposes to match the regex in the .cs side, but testing showed that it was functioning as expected without this change.
 2015-07-16 09:50:49 +02:00
Shannon
ab41c900da Quick stab at testing a method from BackofficeController for U4-6843 
* Move GetLegacyActionJs logic into an internal static method so we can test
* Change LegacyJsActionType to internal for testing
* Add tests to verify method can determine between js paths and js blocks, so as not to pass js code into IOHelper.ResolveUrl

Conflicts:
	src/Umbraco.Tests/Umbraco.Tests.csproj
 2015-07-16 09:48:04 +02:00
Shannon
90645e5e85 Check for ~/ before using IOHelper.ResolveUrl 
An "relative virtual path" exception can be thrown by a path like "umbraco/test.js"
 2015-07-16 09:45:18 +02:00
Shannon
872c345ac9 Fix backoffice breaking when Actions use code in their JsSource - U4-6843 
This reverts/refactors this pull request: https://github.com/umbraco/Umbraco-CMS/pull/722/files

Since JsSource can be used for a file path or actual javascript, we can't use IOHelper.ResolveUrl here.  Instead we're moving it to the GetLegacyActionJs() method, which already handles deciding if it's a code or a URL.

💩

Conflicts:
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 09:44:25 +02:00
Sebastiaan Janssen
8baaae4da6 Merge branch '7.2.7' into master-v7 2015-07-15 12:58:48 +02:00
Sebastiaan Janssen
ed05a3223f Update Examine NuGet dependency 2015-07-15 12:52:24 +02:00
Shannon
25e3134e35 Fixes unit tests 2015-07-15 12:33:47 +02:00
Shannon
f1b9b98f5d Updates to latest examine 2015-07-15 12:32:11 +02:00
Sebastiaan Janssen
d2f7eda074 Fixes unit test that failed because HostingEnvironment.ApplicationID is null in unit tests 2015-07-15 10:58:38 +02:00
Stephan
3062eedb4f content - ensure backward compatibility 2015-07-14 19:28:15 +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
bf3a08cf85 DisposableObject - cleanup & use 2015-07-14 15:56:23 +02:00
Sebastiaan Janssen
7bc208e490 U4-6825 Can't blank out values using the built-in EditProfile snippet 
#U4-6825 Fixed
 2015-07-14 15:32:08 +02:00
Shannon
6aa633c8c5 changes app timeout to 1.5 mins 2015-07-13 17:10:35 +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
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
Shannon
ca738979ce Adds some more detailed logging. 2015-07-08 16:27:06 +02:00
Shannon
8cfb56adf4 adds machine name logging to startup 2015-07-08 13:28:15 +02:00
Shannon
053346d79b fixes merge 2015-07-08 11:54:10 +02:00