yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,953 Commits 4 Branches 7 Tags
9421ae054f764ec921268d4429da51e70f3e9e2b
Commit Graph

5953 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Per Ploug Krogslund
9421ae054f Removes security.service 
Merges into user.service, moves the umbraco.security module into
umbraco.services, instead of in the root module, we could consider
doing that for umbraco.resources as well.
 2013-07-21 22:14:05 +02:00
Shannon
d58b1ac107 Changed serverValidationService to be called serverValidationManager and added a bunch of unit tests for it. 2013-07-18 19:18:53 +10:00
Shannon
d5c9d278df Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 2013-07-18 17:06:07 +10:00
Shannon
d3fe37a080 Adds RequiredForPersistenceAttribute to easily detect if any entity fails validation in a way that it cannot be persisted to the data store. Changes all tree events to not be jquery events and to not require a 'callback' jquery object, instead we just use angular events broadcast globally, much nicer. 2013-07-18 17:05:40 +10:00
Shannon
17eb3db336 Fixed validation problems when creating new content without the absolute mandatory values needed to create something (like name) 2013-07-18 12:28:01 +10:00
Shannon
4cd0489540 Fixed up creating content so that after creation it re-routes back in to edit mode so we don't just keep the 'create' flag. This caused some issues with validation because after creation the edit page needs to re-bind the entity from the server and previous to now that means that the server validation collection would have been cleared. We now persist the collection and it's up to the controller to re-bind if necessary. 2013-07-18 11:45:45 +10:00
Per Ploug Krogslund
8df39ddeab Docs update 2013-07-17 22:46:00 +02:00
Shannon
6f4a7f06a5 Changed naming conventions of spec files so they are human readable. Fixed up the route handling when clicking on nodes to ensure the query/search is cleared (so there's no overlap with creating nodes). Moved much of the data handling functionality of the content edit controller to a new service called contentEditingHelper which I've now written unit tests for. 2013-07-17 17:04:52 +10:00
Shannon
16574c2de3 Fixes tree re-loading when it doesn't need to based on navigating to the same section that was just accessed, improves performance a lot. 2013-07-17 14:58:15 +10:00
Shannon
428cb89ade updated getting started docs 2013-07-17 14:28:55 +10:00
Shannon
2212de3455 Got server side field validation wired up to non-user defined properties (such as name). 2013-07-16 18:52:58 +10:00
Shannon
e2fa610358 Lots of work for validation. We have a different type of validation model in Umbraco where we still save content even if some things are invalid (we just don't publish) so we have to take all of this into account. We also have other rules where if it is new content but required fields like 'name' are empty we cannot continue to save. Also started working on dealing with server side validation errors for content fields (not just user defined fields). 2013-07-16 18:23:20 +10:00
Shannon
c7b4cfd375 Creates umb-content-name to share amongst editors so we have less html duplication. 2013-07-16 12:58:57 +10:00
Shannon
c4d2c7d31a Fixes issue with 'headline' when there is no content. Added client side validation to the content name. 2013-07-16 12:25:54 +10:00
Shannon
6251b86a0a Fixes content type icons and removes reference to tagsResource since it doesn't actually exist (Think Per hasn't checked it in yet) 2013-07-16 11:58:45 +10:00
Shannon
66dd37b911 Fixes del animations when collapsing child nodes. 2013-07-15 23:41:27 +10:00
Shannon
556360143e Fixes issues with ObjectExtensions when converting an entity to XML. U4-2473 Installer throws examine exception: Unable to cast object of type 'System.Int32' to type 'System.String' 2013-07-15 23:27:15 +10:00
Shannon
5c9dabeeb6 Fixes delete animation issue with collapsing nodes. 2013-07-15 23:21:35 +10:00
Shannon
82cce853da Cleans up the navigationController to not have to duplicate all props of the nav service, we just make 'nav' a property of the scope that equals the nav service. 2013-07-15 23:08:23 +10:00
Shannon
10a0c33a99 Fixed up del animations to be dynamically set so they dont animate when switching sections. Added the loading bar for when the node is being deleted from the server to indicate activity. Updated the navigationService.currentTree to be currentSection since that is actually what it is. 2013-07-15 22:31:01 +10:00
Shannon
b624f95e2a got deleting working properly with the node animation and color changes. 2013-07-15 20:11:56 +10:00
Shannon
5738b5a4b8 Updated media/content type services to allow us to now create content/media at the root. 2013-07-15 18:05:58 +10:00
Shannon
28eff9b34b Updated the tree structure to support the root section node. Now we actually get a menu listing for section roots when there is only one tree (i.e. media/content). 2013-07-15 17:56:34 +10:00
Shannon
7926318709 start looking at tree service to remove a node but realized that our initial app tree loading isn't correct, we need to have a true root node but currently we dont. 2013-07-15 17:05:54 +10:00
Shannon
f2b28e6bfb Adds 'native' content deleting (not via the legacy objects) and updates the mock data to support this in the Client proj. 2013-07-15 16:48:29 +10:00
Per Ploug Krogslund
4ff4e3dfab Deleted unneeded icons files from pagedown 2013-07-12 11:59:55 +02:00
Per Ploug Krogslund
9daf61fd5a Completed the Property editor ngdoc 2013-07-12 11:55:02 +02:00
Per Ploug
e4a72caf96 merge 2013-07-12 11:51:39 +02:00
Per Ploug
22f6be61de Updates yepnope, adds markown sample editor 2013-07-12 11:36:22 +02:00
Shannon
e2ef802f65 Got delete working for legacy items... just need to get the tree to respond, do tree syncing, etc... but it is working. 2013-07-12 14:36:35 +10:00
Shannon
cdf114df4b Converted all resources over to use a newer structure for generating URLs, created unit tests for those, fixed the js build so that the name is still "umbraco" not "umbraco 7" since that causes problems with css and other file references. 2013-07-12 13:26:11 +10:00
Shannon
812686f5e2 Fixes merge issues 2013-07-12 11:51:10 +10:00
Shannon
de2660cfb2 Merge branch '4.11.7---ITask-updates' into 7.0.0 
Conflicts:
	.gitignore
	.hgtags
	src/Umbraco.Core/XmlExtensions.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/CreatedPackageTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScriptingTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MediaTypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/MemberGroupTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/ScriptTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/XsltTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/content.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/contentTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dialogHandler_temp.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/dictionaryTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/media.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/mediaTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodeType.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/nodetypeTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/simple.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/templateTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2013-07-12 11:30:06 +10:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Shannon
f0e4977d41 Created new base api controller for json only, started implementing the legacy controller for dealing with legacy delete, etc.. calls (based on the ui.xml) 2013-07-12 10:57:54 +10:00
Shannon
550f8b196d Fixed manifest comments, streamlined how the navigationService ensures only one dialog exists at a time and removes that functionality from the navigationController. Changes how the menu's work with showing dialogs and displaying the correct dialog title, the delete dialog is looking good! 2013-07-12 10:42:18 +10:00
Shannon
9e0dec89b1 updated ignore, we don't want to commit anything to App_Plugins, if you want stuff there you'll need to add them explicitly. 2013-07-12 09:20:25 +10:00
Per Ploug Krogslund
cfd4ded456 Start on property editor tutorial 2013-07-11 22:13:16 +02:00
Per Ploug Krogslund
18a0ff4fdd Adds dialog, notications and scriptloader docs 2013-07-11 14:01:38 +02:00
Shannon
5222cfcfe7 Got pretty far with deletions. It still doesn't actually do the deletions but the dialog is in place, now just need to inject some more metadata into the menu item to get the legacy delete controller to call the correct rest method to delete the legacy items (again, this is based on the silly ui.xml stuff) 2013-07-11 19:46:13 +10:00
Shannon
824b5ad5a4 Fixes issue with showing the recycle bin menu 2013-07-11 17:04:30 +10:00
Shannon
e7a00adff4 Removes hack for defaultAction, navigationService.showMenu now returns a promise because it needs to get the defaultAction from the resource. Fixes up the mock menu to have metaData assigned. 2013-07-11 16:18:58 +10:00
Shannon
a00074af44 Updated menu items and legacy action converters, now all legacy dialogs should now load. Now need to get legacy js actions being handled (i.e. just raw js calls like deleting) 2013-07-11 13:26:54 +10:00
Shannon
9d2c3865ed Updated icon mappings and updated to latest font-awesome but I have no idea how to make the font-awesome.min.less file from the download... will leave for Per :) 2013-07-11 11:03:03 +10:00
Shannon
35753a12a7 Fixes navigationController selectedSection issue 2013-07-11 10:11:15 +10:00
Shannon
b1a1bb547a Similar fix to the last commit, fixes the navigation controller when working in the UI project and the create action is displayed by default instead of the menu, the menuDialog was not being cleared when changing nodes. This causes a stack overflow exception and also causes the html stack to build up. However, now there's a flicker because the html is being replaced, not sure the best way to fix this ? 2013-07-11 10:06:34 +10:00
Shannon
c89efc8497 Fixes navigation controller sometimes trying to perform an apply when there's already one in progress. 2013-07-11 09:50:21 +10:00
Shannon
7395eba161 Fixes action dialog so that it doesn't keep appending content to the container each time you move to a diff tree node and click create. Before there was nothing removing the previous $modal object from the container so you'd end up with the same create action dialog being shown for each node and then it would eventually show a munged up duplicated markup and jquery would throw a stack overflow exception. 2013-07-11 09:43:47 +10:00
Per Ploug
410b664f7f Got legacy create dialogs working 
Its not pretty, but it works, and over time these hacks should slowly
fade away
 2013-07-10 15:35:38 +02:00
Per Ploug Krogslund
8ff4d9c24c harcoded create dialog hacks 2013-07-10 13:58:21 +02:00