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

11349 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
38621c61ba WIP - quick test to move the tree node style above search bar 2014-10-09 16:03:10 +11:00
Shannon
6b36b01491 fixes media move to use the correct check enabled tree 2014-10-09 14:36:35 +11:00
Shannon
49164ce6ef Updates move/copy to use the correct usage of checked nodes 2014-10-09 14:31:53 +11:00
Shannon
9cbea5764d fixes umbtreeitem with ng-show instead of ng-if which wasn't working for the copy dialog for some reason 2014-10-09 13:39:10 +11:00
Shannon
f8503b4c68 Fixes (and massively simplifies) the member group picker to use the correct way of using checks in tree nodes 2014-10-09 12:51:07 +11:00
Shannon
0ff1c9915d Updates tree to natively support check boxes as an option, same with search icons, fixes tree directive to pass the current tree scope correctly, removes the requirement for the cache key on the umbtreeitem directive. Fixes the link picker to use the correct way to show check boxes instead of hacking with jquery. 2014-10-09 12:36:52 +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
5c5a0e6140 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-10-08 23:24:40 +11:00
Shannon
05d5e981af Search working pretty nicely with tree picker and list views, now to get it working like this consistently for all of them. 2014-10-08 23:24:27 +11:00
Sebastiaan Janssen
ea7d52a353 Update version 2014-10-08 13:56:26 +02: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
13ea17c225 Merge branch '7.1.8' into 7.2.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-10-08 18:04:47 +11:00
Shannon
b8ea50d644 Merge remote-tracking branch 'origin/6.2.4' into 7.1.8 
Conflicts:
	build/NuSpecs/build/UmbracoCms.targets
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Factories/UmbracoEntityFactory.cs
	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
	src/Umbraco.Tests/Services/EntityServiceTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-10-08 17:30:45 +11:00
Shannon
1eab26c0f6 reverts IQuery 2014-10-08 17:26:55 +11:00
Shannon
0543c620eb bumps version 2014-10-08 17:25:06 +11:00
Shannon
646e5f173d Fixes descendant queries to ensure that the comma is suffixed to the path, otherwise strange things could happen when there are longer ids! 2014-10-08 17:23:14 +11:00
Shannon
b5594517bd Fixes: U4-5583 Can no longer link to Media Items from RTE in 6.2.3 - Due to a cherry pick/merge issue since the newer 7.x EntityRepository deals with NVarchar and NText values whereas the 6.x one did not. Have backported the mapping poco classes to now also support NVarchar and NText for the EntityRepository. Have also fixed the basic query to ensure that there are no left joins before inner joins which can also cause problems. Fixed up the duplicate where clause. Adds more tests to entity service. 2014-10-08 17:13:28 +11:00
Shannon
c61c130ddf WIP: working on tree picker with search for list views 2014-10-08 14:35:57 +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
Shannon Deminick
f5ec2139f0 Renaming to correct file naming conventions 2014-10-08 09:34:24 +11:00
Shannon Deminick
983d7610e4 Renaming to correct file naming conventions 2014-10-08 09:33:57 +11:00
Shannon Deminick
504c477037 Renaming to correct file naming conventions 2014-10-08 09:33:37 +11:00
Shannon Deminick
7b8932a5d6 Renaming to correct file naming conventions 2014-10-08 09:33:14 +11:00
Shannon Deminick
504f53439a Renaming to correct file naming conventions 2014-10-08 09:32:42 +11:00
Shannon Deminick
e58c7f46c7 Renaming to correct file naming conventions 2014-10-08 09:32:16 +11:00
Shannon Deminick
1953e23560 Rename src/Umbraco.Web.UI/Views/Partials/grid/bootstrap2.cshtml to src/Umbraco.Web.UI/Views/Partials/Grid/Bootstrap2.cshtml 2014-10-08 09:31:40 +11:00
Shannon
c266f9f58e updates sort dialog prog bar 2014-10-08 09:30:12 +11:00
Shannon
7296643f2d Fixes remaining link picker issue: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-08 09:29:52 +11:00
per ploug
0057421f98 Update grid partials to grid/ instead of canvas/ 2014-10-07 14:40:45 +02:00
Sebastiaan Janssen
bb5d373923 Merge pull request #506 from sitereactor/7.2.0-compositions-fix 
Fixes U4-5077 doc types with compositions
 2014-10-07 14:11:09 +02:00
per ploug
be8e4b9fe5 grid partials 2014-10-07 14:01:48 +02:00
Morten Christensen
e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree 
Return 0 if parent is the root
 2014-10-07 13:59:22 +02:00
per ploug
b6fd0489e2 Renames canvas editor into grid again 2014-10-07 13:39:18 +02:00
Sebastiaan Janssen
5501c9531b Bump version 2014-10-07 11:22:51 +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 Deminick
173d298d21 Merge pull request #503 from arknu/angular-test-fixes 
U4-5589: Fix broken Angular app test setup
 2014-10-07 16:38:50 +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
6ab03d4c98 puts website proj back in sln 2014-10-07 14:09:46 +11:00
Shannon
7a172c4253 Fixes: U4-4974 Umbraco v7.1.3 - Users cannot insert images in RTE 2014-10-07 14:08:22 +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
b60e292d5f Fixes: U4-5578 MNTP with root node, recursive output 2014-10-07 11:51:11 +11:00
Shannon
e1dcf6b061 reverts IQuery 2014-10-07 11:50:35 +11:00
Shannon Deminick
9058358004 Merge pull request #501 from Alain-es/U4-5400-Bugfix 
U4-5400 BugFix
 2014-10-07 10:14:57 +11:00
per ploug
6d4deb8da5 Fixes U4-5531 7.2.0 Nightly: Preview of desktop, height is 150px 2014-10-06 13:54:30 +02:00
per ploug
4da98c1697 temp forms copy 2014-10-06 13:31:43 +02:00
per ploug
7ae9a2bda6 Canvas add delay to overlay 2014-10-06 11:55:34 +02:00
arknu
95c4fb740a Fix broken Angular app test setup 2014-10-04 23:37:46 +02:00