yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,363 Commits 4 Branches 7 Tags
48d34af7bb9d3571d571afa05f4b0bbdaedbf296
Commit Graph

3744 Commits

Author SHA1 Message Date
Shannon
48d34af7bb Gets tree picker working better with searching and list views. 2014-10-13 17:27:22 +11:00
Stephan
3c7fb8aeff U4-2581 - public UmbracoContext.UrlProvider 2014-10-10 11:35:40 +02:00
Shannon
f43fa499bf Fixes: U4-5628 Publicize PublishContentRequest.Prepare, U4-5574 UmbracoVirtualNodeRouteHandler doesn't handle culture properly 2014-10-10 14:45:38 +11:00
Shannon
34152867fa Fixes: U4-5627 Publicize PublishedContentRequest constructor 2014-10-10 10:58:06 +11:00
Shannon
e709a759ed Gets the icon for each content/media item indexed so it can be mapped and shown when showing search results. 2014-10-09 16:39:12 +11:00
Shannon
c58a9429e1 Member picker now using standard treePicker and search is working 2014-10-09 11:08:09 +11:00
Shannon
18efe25167 removes unneeded contentpicker dialog and just uses the standard tree picker that has the correct search built in, now search is working for the link picker. 2014-10-09 00:04:25 +11:00
Shannon
8136b3ecb0 Got searching working from a particular node id, got the UI nearly working 2014-10-08 19:03:45 +11:00
Shannon
818c699d60 WIP: working on tree picker with search for list views. updates all pickers to ensure that they unbind any events. 2014-10-08 14:26:18 +11:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
per ploug
bba4db46d2 Breaking change: Renames GetGridHtml() to RenderCanvas() 2014-10-07 11:17:24 +02:00
Shannon
ec30251271 Fixes most tree pickers to show/hide the header correctly, updates the entitycontroller to be able to search from a start node and use the user's assigned start node if one is not passed in. Ensure the search bar is visible for the treepicker at all times. Now to get the remaining bits working... 2014-10-07 17:22:26 +11:00
Shannon
98eeaca5d5 Fixes: U4-5597 ServerVariables cannot include dynamic data like a users start node Ids 2014-10-07 14:59:07 +11:00
Shannon
b28f1d86c9 Merge branch '7.1.8' into 7.2.0 2014-10-07 12:57:47 +11:00
Shannon
8824ab2b27 reverts JS from tree controller and updates the c# method to create the tree child node URLs to ensure the custom start node param is ignored, this is a bit cleaner. 2014-10-07 12:52:02 +11:00
Shannon
58a0de086f fixes unit test 2014-10-03 17:07:27 +10:00
Shannon
c078a1c12f Merge branch 'U4-5512' of https://github.com/arknu/Umbraco-CMS into arknu-U4-5512 
Conflicts:
	src/Umbraco.Web.UI.Client/src/controllers/main.controller.js
 2014-10-03 13:01:00 +10:00
Shannon Deminick
0b41f1e85e Merge pull request #488 from jhauge/7.2.0 
This commit fixes U4-1115
 2014-10-03 12:03:49 +10:00
Shannon
68480ebd56 Fixes: U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:17 +10:00
Shannon
0d74642e56 fixes U4-5492 Distributed calls won't work if IIS sites between servers have the same HttpRuntime.AppDomainAppId 2014-10-03 09:44:03 +10:00
Shannon
e60dcfa144 Merge branch '7.1.7' of https://github.com/umbraco/Umbraco-CMS into 7.1.7 2014-10-03 00:26:25 +10:00
Shannon
737f2fb707 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-03 00:07:40 +10:00
Shannon
414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02:00
Shannon
d2592bd79f Fixes: U4-5456 Cannot access all properties of member via MembershipHelper methods 2014-10-02 21:05:20 +10:00
Shannon
b90f28731c Ensures the return to list button isn't shown on items in the recycle bin since that would navigate back to their original parent. Updates the recycle bin list views to respect the list view configuration of their associated sections. 2014-10-02 19:55:24 +10:00
Sebastiaan Janssen
340328aeba Fixes merge issue 2014-10-02 11:44:41 +02:00
Shannon
c8264cff1e Updates the content type editor to have the list view customization inline instead of in a dialog. 2014-10-02 18:52:38 +10:00
Shannon
0e736a8d32 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-02 12:23:55 +10:00
Shannon
08ea69caae Fixes paging for MySQL (actually makes it a better query anyways), fixes null ref for member indexer, Fixes MNTP after upgrade from v6, fixes typo on migration downgrade. 2014-10-02 12:23:43 +10:00
antoine
c3c755755d Canvas designer, palette config path in EnableCanvasDesigner fixed 2014-10-01 15:01:16 +02:00
Shannon
f875dc15f7 Merge branch '6.2.3' into 7.1.7 
Conflicts:
	build/Build.bat
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/NuSpecs/UmbracoCms.nuspec
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Models/DeepCloneHelper.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Core/Services/MediaService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/PetaPocoExtensionsTest.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/umbraco/dashboard/DesktopMediaUploader.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard/DesktopMediaUploader.ascx
 2014-10-01 16:47:49 +10:00
Shannon
2ec8d124fd renames new ssl attribute and updates proj 2014-10-01 16:06:19 +10:00
Shannon
8a65ea7e97 Fixes: U4-5566 Quite a few hard coded queries with incorrect escape syntax for mysql 2014-10-01 15:40:48 +10:00
Shannon
c5677233e3 Fixes install upgrade step to run during new install and upgrade - that is used when a db is found at the specified location but the version is empty, the upgrader still needs to run. Updates new upgrade steps to check if the changes are required so no errors occur when re-upgrading. 2014-10-01 14:58:30 +10:00
Shannon Deminick
ac309f5a65 Merge pull request #493 from Bitmapped/7.2.0 
Force HTTPS Redirect on UmbracoUseSSL (U4-4737)
 2014-10-01 11:06:42 +10:00
Brian Powell
8aa9326e10 Add UmbracoUseSSL filter to redirect to HTTPS if umbracoUseSSL is set. Fixes U4-4737 2014-09-30 20:58:12 -04:00
Shannon
fc47cdf9b0 proj file update 2014-10-01 10:25:06 +10:00
Shannon
bad341613f Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-01 10:19:04 +10:00
Shannon
863e8b5024 Changes PetaPoco UOW to use a Queue instead of trying to order by a date which even in ticks is sometimes the same. Changes some content ext to accept the service it needs instead of relying on the app ctx singleton and obsoletes others. Fixes ContentBase.ContentTypeId to check if the Id has been set on it's true ContentTypeBase which is required with the new foreign key to insert entities (this was actually a bug without the foreign key). Updates media/content services with paging to use parameters correctly. Fixes tests. 2014-10-01 10:18:51 +10:00
Shannon Deminick
f2d4e6541d Merge pull request #492 from Bitmapped/7.2.0 
Fix for U4-5564
 2014-10-01 08:57:25 +10:00
antoine
1e1b8b7ae6 Delete canvas designer style fixed 2014-09-30 21:41:13 +02:00
Brian Powell
be55c11554 Fix for U4-5564 2014-09-30 12:44:52 -04:00
Shannon
ad1075a1ce Fixes: U4-2120 cmsDataTypePreValues 'value' column should be nvarchar(MAX) or ntext instead of nvarchar(2500) 2014-09-30 15:34:49 +10:00
Shannon
c49560f39d Updates the member indexer to re-index all members WAY faster than before. Updates the search controller to limit search results to 200 otherwise a ton of CPU can be used if there's thousands of results. 2014-09-30 12:08:21 +10:00
Shannon
78141630b7 After a lot of benchmarking i found the bottleneck for building the prop collection. Even though this new bottleneck is leaps and bounds faster than it was before... with this new fix it is epically fast 2014-09-30 11:37:26 +10:00
Shannon
b975a02bfa Updates version to 7.1.7 2014-09-29 16:46:53 +02:00
Shannon
6f7ec84f18 Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 16:46:37 +02:00
Shannon
438e985d9e Ensures the custom list view data type's PKs don't interfere with ones that might already exist. 2014-09-29 13:50:28 +10:00
Shannon
cfb2d3c974 Merge branch '7.2.0-sqlexpressions' into 7.2.0 2014-09-26 15:32:36 +10:00
Shannon
23b214e4f9 Fixes remaining tests 2014-09-25 13:52:16 +10:00