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

5935 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Per Ploug
beef52e555 adds nodetype to tree converter 2013-07-10 13:57:58 +02:00
Per Ploug Krogslund
a16855dac2 Fixes the dialog I broke yesterday 
Adds some defaults to the dialogs, so we can open the inline without
animation as well
 2013-07-10 13:12:07 +02:00
Sebastiaan Janssen
aa327696fe Fixes U4-2354 MiniProfiler - Show SQL parameter values and more stacktrace info 
Refactored duplicate code
 2013-07-10 12:35:21 +02:00
Shannon
e7b816a958 All resources now converted to using resourcePromise. 2013-07-10 18:48:14 +10:00
Shannon
0060aa816b Converts media resource to use correct structure, fixes up the media editor and controller so at least stuff renderes now. 2013-07-10 18:18:48 +10:00
Shannon
6652016faa Makes the 'active' property on a tab a server side thing, updates more resources to use the resourcePromise. 2013-07-10 17:28:15 +10:00
Shannon
0f207b01f2 Integrated auth into the UI project and unit tests (you need to log in each time with arbitrary username/password). Fixes authorization, the auth check SHOULD return a 401 so that the MainController re-fires the auth check in order to re-set the 'authenticated' scope flag. Fixed err caused by trying to launch login dialog too many times when too many http calls fail. Converted over authResource to use correct resourcePromise structure. The mock auth is done with angular cookies, so integrated that too. Removes main.js since we don't use it anymore. Fixes media mocks. Removes call to get sections in navigationService since it is irrelevant and causing more issues when not authenticated. 2013-07-10 13:24:28 +10:00
Shannon
5a18c0b0e2 Fixes up resourcePromise 2013-07-10 11:33:36 +10:00
Shannon
74ca129697 Changed auth.resource to use the new resource promise and also enhanced the resource promise + docs. 2013-07-10 11:08:58 +10:00
Shannon
08f6f92e8c Fixed JS Build issues - Mixed spaces/tab issues, missing semi-colon. Fixed grunt build to ensure that a self executing function wraps the JS build output. 2013-07-10 10:38:16 +10:00
Per Ploug Krogslund
58500bd5b8 Merge branch '7.0.0' of https://github.com/umbraco/Umbraco-CMS into 7.0.0 
Conflicts:

src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
	src/Umbraco.Web.UI.Client/src/common/services/navigation.service.js
 2013-07-09 22:22:29 +02:00
Per Ploug Krogslund
245c764bf1 docs on navigationService 
working ngDocs setup, started adding docs to navigation and dialog
service
 2013-07-09 22:17:23 +02:00
Shannon
5af57d9667 Fixed up the 401 issue with checking authentication which led to other issues of lazy loading in the legacy js tree JS block. 2013-07-09 21:01:29 +10:00
Shannon
76c6d952f3 Fixed up the 401 issue with checking authentication, but now have other auth issues... but better than before :) 2013-07-09 20:13:26 +10:00
Shannon
9af23fdaf7 Converted compat.js to use namespaces 2013-07-09 19:21:44 +10:00
Shannon
7e0066f405 Merge remote-tracking branch 'origin/7.0.0' into 7.0.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/common/directives/umbtreeitem.directive.js
 2013-07-09 18:52:54 +10:00
Shannon
a6acb4c558 Got tree menu items loading async so the menu is not part of the treenode json. Created docs for using Umbraco resources and how to use promises properly. Created a helper: angularHelper.resourcePromise for use with all of our resources (still need to convert the rest). Got the legacy tree data working with seperate requests for menu items (not too easy!) 2013-07-09 18:51:45 +10:00
Shannon
ba68da5736 Makes Domain.GetDomains public (#U4-2483) 2013-07-09 11:55:29 +10:00