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
|
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 |
|
Per Ploug Krogslund
|
0d44189f7f
|
Mocked login works again
|
2013-07-01 09:58:10 +02:00 |
|
Per Ploug Krogslund
|
0744adf8a2
|
Start on a proper httpbackend
|
2013-06-28 14:00:52 +02:00 |
|
Per Ploug Krogslund
|
47f1dcf4e5
|
Missing client files, excluding node_modules
|
2013-06-10 10:44:40 -02:00 |
|