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

13017 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Sebastiaan Janssen
0bbe1c6cdc U4-6721 Error when submitting Macros, Collection was modified; enumeration operation may not execute. (after project has been updated to MVC5) 
#U4-6721 In Progress
 2015-07-21 19:35:00 +02:00
Shannon
b78f75775d Fixes: U4-6859 get membertype by key 2015-07-21 16:55:27 +02:00
Sebastiaan Janssen
34f44b02a2 U4-6721 Error when submitting Macros, Collection was modified; enumeration operation may not execute. (after project has been updated to MVC5) 
#U4-6721 In Progress
 2015-07-21 15:55:39 +02:00
Shannon
93c1321b99 fixes potential null ref when accessing the TagQuery property of UmbracoHelper 2015-07-20 15:37:40 +02:00
Shannon
73cb9ab3e5 updates core boot manager tests 2015-07-20 15:30:58 +02:00
Shannon
e402768212 simplifies methods to just be GetTaggedEntityByKey, GetTaggedEntityById 2015-07-20 13:49:46 +02:00
Shannon
6095f0233e Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-20 13:45:47 +02:00
Shannon
9b1f4ecff9 Fixes: U4-6855 ITag does not expose the property it belongs to 2015-07-20 13:45:31 +02:00
Sebastiaan Janssen
3c884b583e U4-6762 7.3 beta: Could not load file or assembly 'System.Web.Mvc, Version=4.0.0.0 
#U4-6762 Fixed
 2015-07-20 11:30:41 +02:00
Sebastiaan Janssen
ea653cbd18 U4-6762 7.3 beta: Could not load file or assembly 'System.Web.Mvc, Version=4.0.0.0 
#U4-6762 Fixed
 2015-07-20 11:30:04 +02:00
Stephan
b2679f3f17 Bugfix 2015-07-19 13:08:29 +02:00
Shannon
231a7fa7c4 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-17 15:47:44 +02:00
Stephan
a3936d69cb Revert rogue umbracoSettings.config changes (dbaf7c0) 2015-07-17 14:20:05 +02:00
Shannon
a273584cc8 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-17 11:09:48 +02:00
Shannon
62c4e404b3 enabled db server registrar by default unless the legacy dist calls is enabled. 2015-07-17 11:09:31 +02:00
Stephan
d1b6b5c76f DatabaseServerMessenger - cleanup 2015-07-17 10:48:09 +02:00
Shannon
b5cf3e9f59 Fixes: U4-6844 Potential perf issue with new Domain service 2015-07-16 18:09:56 +02:00
Shannon
d97c772c70 Fixes: U4-6831 Add {machinename} to ExamineIndex.config by default 2015-07-16 17:19:49 +02:00
Shannon
d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 17:04:25 +02:00
Shannon
5ac34a700f fixes get file checks in FileSystemTree when the folder doesn't exist 2015-07-16 16:58:13 +02:00
Shannon
a40762f09d excludes folders from the UI project that we don't need to ship with. 2015-07-16 16:29:36 +02:00
Shannon
0f00eaed78 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-07-16 15:59:22 +02:00
Shannon
01653f60f9 Fixes: U4-6756 Don't ship or generate unnecessary folders 2015-07-16 15:59:08 +02:00
Shannon
d8b6f1fef1 Fixes database server messenger to not bind to events if we're not installed, otherwise we get ysods (not sure if there was a typo there or not, but should defo not boot when not installed) 2015-07-16 15:52:22 +02:00
Sebastiaan Janssen
1ecd0af268 New installer image 2015-07-16 15:49:18 +02:00
Shannon
c2dc896fce working on: U4-6756 Don't ship or generate unnecessary folders 2015-07-16 15:29:46 +02:00
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 Deminick
92e0e5e570 Merge pull request #743 from tomfulton/tests-u4-6843 
Quick stab at testing a method from BackofficeController for U4-6843
 2015-07-16 09:47:11 +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
Shannon Deminick
b4e0ddb7ad Merge pull request #742 from tomfulton/fix/u4-6843 
Fix backoffice breaking when Actions use code in JsSource - U4-6843
 2015-07-16 09:41:20 +02:00
Tom Fulton
a1f40a3e6e 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
 2015-07-15 23:46:31 -06:00
Tom Fulton
28df1af226 Check for ~/ before using IOHelper.ResolveUrl 
An "relative virtual path" exception can be thrown by a path like "umbraco/test.js"
 2015-07-15 23:42:42 -06:00
Tom Fulton
195953d63c 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.

💩
 2015-07-15 16:59:09 -06:00
Stephan
a93684f1f2 Bugfix unit tests 2015-07-15 18:16:45 +02:00
Shannon
18e8f09654 BatchedDatabaseServerMessenger only exists in Web now, no reason for it to be in Core. CoreBootManager by default now uses DatabaseServerMessenger (non-batched), WebBootManager now uses BatchedDatabaseServerMessenger and is always enabled by default unless the Dist Calls setting in umbracoSettings is enabled, in that case it will revert to using the legacy batched web services messenger. 2015-07-15 17:27:01 +02:00
Shannon
85ebcadcdd Fixes more tests and more decoupling of singletons 2015-07-15 16:40:50 +02:00
Shannon
0efeba3744 Fixing unit tests, decouples more singleton accessors 2015-07-15 16:28:50 +02:00
Shannon
2a63519e8c Fixes: U4-6834 Add TagService.GetTagsForEntity(Guid key) method 2015-07-15 15:54:06 +02:00
Shannon
ba1d546579 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	src/Umbraco.Core/MainDom.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI.Client/src/canvasdesigner/index.html
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/UmbracoExamine/UmbracoExamine.csproj
	src/umbraco.MacroEngines/packages.config
	src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
 2015-07-15 14:58:19 +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