Commit Graph

196 Commits

Author SHA1 Message Date
Per Ploug
8d57e0cd1d Less hacky way to lookup current user culture 2015-09-24 15:52:44 +02:00
Per Ploug
c13ae20885 U4-4761: adds overload to treeattribute 2015-09-24 15:49:17 +02:00
Per Ploug
6dc4e2d2ae U4-4761 Member translation
Makes all trees translateable, does not break the current titles set on
atttributes, but for trees that does not have a title set, the tree wil
try to look up a treeheader.
2015-09-24 15:30:08 +02:00
Stephan
c3076d6b8d Merge branch 'dev-v7-contenttypeeditor' of https://github.com/umbraco/Umbraco-CMS into dev-v7-contenttypeeditor 2015-09-18 13:43:16 +02:00
Per Ploug Krogslund
10d8fdba75 Updates template tree controller for angular view 2015-09-17 14:08:56 +02:00
Stephan
9c9ba477aa Merge dev-v7 into dev-v7-contenttypeeditor
Conflicts:
	src/Umbraco.Core/Constants-ObjectTypes.cs
	src/Umbraco.Web.UI.Client/gruntFile.js
	src/Umbraco.Web.UI.Client/src/loader.dev.js
	src/Umbraco.Web.UI.Client/src/views/content/recyclebin.html
	src/Umbraco.Web.UI.Client/src/views/datatype/edit.html
	src/Umbraco.Web.UI.Client/src/views/media/recyclebin.html
	src/Umbraco.Web/Umbraco.Web.csproj
2015-09-16 13:25:32 +02:00
Stephan
59ec709c69 U4-7048 - more filesystems cleanup 2015-09-09 16:32:45 +02:00
Stephan
6b5057b870 U4-7048 - more filesystems cleanup 2015-09-08 17:48:26 +02:00
Per Ploug
23a5ac439b Removes the old type trees and sets the right order on the new 2015-08-26 12:18:42 +02:00
Per Ploug Krogslund
a7065d083e ContentType + MediaType trees 2015-08-19 22:37:41 +02:00
bjarnef
5bc0c499d8 Localize text in help dialog
Add localization for text in help dialog, create and delete dialogs and
some minor parts of the member area.
2015-08-19 02:03:54 +02:00
Shannon
4e4382ff90 folders are more or less working. 2015-06-08 18:22:43 +02:00
Shannon
97c6067b70 Gets initial doc type folders working 2015-06-08 17:59:56 +02:00
Shannon
08762e5a00 Fixes getScaffold issue, starts adding Create dialog for doc types 2015-06-08 13:10:52 +02:00
Per Ploug
55daa2ee45 WIP membertype editor 2015-06-05 12:15:20 +02:00
Per Ploug
f0343788b7 Tree actions for CT 2015-05-29 09:21:37 +02:00
Per Ploug
ef069e0aa1 Content Type Editor work merged in 2015-05-13 17:12:28 +02:00
Shannon
428df7ae4a Merge branch 'dev-v7' into 7.3.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
2015-02-17 15:11:10 +01:00
Shannon
1b161c8dbe Removes more usages of legacy Access class to use new IPublicAccessService 2015-01-28 19:46:05 +11:00
Shannon
b3a93e369a WIP - bit of a refactor on the IFile stuff, moves all validation to the service level and obsoletes the IFile.IsValid methods. Adds v5 style CSS property parsing, but might integrate that with this zany css parser in the core for 'safer' parsing. 2015-01-14 12:09:30 +11:00
Shannon
caf972cd0f Ensures virtual path is set on the template, updates the tree controller to render the correct editor if it's webforms, updates the rest service to return the updated contents if the server changes it and updates the UI 2015-01-09 17:01:38 +11:00
Shannon
8cfdcbdd05 Updates how the webapi reflection works to ensure the property info's are cached 2015-01-06 18:23:47 +11:00
Shannon
4a72e8c3df Creates ReflectedFixedRazorViewEngine and version checkers to dynamically update code depending on the major versions of MVC and WebApi 2015-01-06 17:40:28 +11:00
Shannon
fa48af02a1 Merge branch 'leekelleher-U4-337' into 7.3.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
2015-01-06 12:24:29 +11:00
leekelleher
0c7826b250 Added 'Restore' action class
+ menu option for items in the recycle bin.
2015-01-03 19:52:06 +00:00
Shannon
2b25815eee Merge branch '7.2.0' into 7.3.0
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
2014-12-01 12:22:19 +11:00
Shannon
dc27368397 Fixes: U4-5891 2014-11-27 17:57:33 +11:00
Shannon
8328f09d6b Works on U4-2866 - converted template tree to new tree structure. 2014-11-25 17:59:59 +11:00
Shannon
5af67facad Removes non-completed/tested/used code for templates which was during a WIP of the grid some time ago. 2014-11-25 17:36:02 +11:00
Shannon
df3d427c0b WIP - Updates templates service and repo with some extra methods, creates new template tree, updates template model with some more properties, still need to finish the template tree, it's missing some menu actions. 2014-11-20 19:51:42 +11:00
Shannon
e558918432 Completes migrating the lang tree to the new format, a good starting place to convert the other ones even with having the legacy dialogs in place. 2014-11-20 17:54:30 +11:00
Shannon
e6d1eb0ba0 Converts languages tree to new structure 2014-11-20 16:28:50 +11:00
Shannon
6df6e3bdad Fixes: U4-3737 macro container make sure you can define the allowed macros + the max number 2014-11-13 17:44:03 +11:00
Shannon
9019c49ee8 Merge branch '7.1.9' into 7.2.0
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Sync/ServerEnvironmentHelper.cs
	src/Umbraco.Tests/Plugins/PluginManagerTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Scheduling/KeepAlive.cs
	src/Umbraco.Web/Scheduling/ScheduledPublishing.cs
	src/Umbraco.Web/Trees/ApplicationTreeRegistrar.cs
	src/UmbracoExamine/BaseUmbracoIndexer.cs
	src/UmbracoExamine/DataServices/UmbracoContentService.cs
	src/UmbracoExamine/DataServices/UmbracoMediaService.cs
	src/UmbracoExamine/UmbracoContentIndexer.cs
	src/UmbracoExamine/UmbracoMemberIndexer.cs
2014-11-13 16:32:50 +11:00
Shannon
aa11d3504d Makes the tree scanning and loading from the xml lazy so this no longer happens on startup but instead when trees are required, this ensures during startup there is no IO or scanning for trees, this should assist with U4-5126 config files get cleared out with zero size and of course also help a bunch with startup time. 2014-11-12 18:06:10 +11:00
per ploug
1de59f048b Fixed U4-5664 Change icon overlay on system list views 2014-10-27 14:29:01 +01:00
Shannon
86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10:00
Shannon
4494d8cc91 Merge branch 'partial-view-folders' of https://github.com/pynej/Umbraco-CMS into 7.2.0 2014-10-21 13:21:12 +10:00
Shannon
ca58e8f98f Fixes: U4-4176 v7, cannot disable users in right-click-menu. 2014-10-16 18:45:02 +10:00
Shannon
10c0d26a17 Fixes: U4-4828 Disable "Scripting Files" tree and don't ship the macroScripts folder 2014-10-16 15:37:32 +10: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
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
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
414dbe45a6 Fixes: U4-5460 User with start content set won't see the selected node. 2014-10-02 13:38:44 +02: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
5dbedcf67b Fixes: U4-5460 User with start content set won't see the selected node. 2014-09-23 16:50:05 +10:00
Shannon
5f95957e5b Makes sure custom membership providers work with the list view 2014-09-19 15:56:39 +10:00
Shannon
7c76cbf509 Allows for email and username to be fields in list view, fixes up the list view usage to display members from a custom membership provider. 2014-09-19 15:34:26 +10:00