Commit Graph

5483 Commits

Author SHA1 Message Date
Shannon Deminick
9cfbb24f4c Content is now saving properly in the editor. 2013-06-07 02:29:24 -10:00
Shannon Deminick
9431ae7fdb Fixed issues of using StateHelper since we do things in async which don't have an HttpContext.Current, so we use our
UmbracoContext.Current instead if required. Changed StateHelper to be obsolete as we need to replace all calls to it with
proper extension methods. Updated the content model mappers to ensure we ToArray property objects so they don't keep
re-processing the Linq statement when iterating. Content is now saving to the db.
2013-06-07 01:39:53 -10:00
Shannon Deminick
96fac60c3f So close to having data saving but now we have issues with HttpContext.Current because we are running async processes... fail. 2013-06-05 14:37:19 -10:00
Shannon Deminick
406edc4aab Adds a bunch of directives from my POC to do with validation but haven't implemented them. Ensures that ng-form is applied to each property item. 2013-06-04 23:01:26 -10:00
Shannon Deminick
6dd48262e1 Fixed up how tabs are loading to work with async data and am now displaying real data ! 2013-06-04 22:30:49 -10:00
Shannon Deminick
fea28df758 Fixed more tree merge issues, fixed how property editors are rendered. 2013-06-04 15:59:14 -10:00
Shannon Deminick
c932f31f40 merged in other styling and fixes from belle repo 2013-06-04 14:39:23 -10:00
Shannon Deminick
55521458b4 Fixed up some merge issues 2013-06-04 14:29:41 -10:00
Shannon Deminick
9e928ef0fa Merged in latest changes from Belle repo 2013-06-04 14:05:13 -10:00
Shannon Deminick
35ada35257 Updated content model mapper to re-use mappings as much as possible. Added most of the missing properties to content and inline with the expected format
in the UI project. Added basic user model and a mapper for that too. updated tree service in UI to automatically create the 'view' for each node based on
the section and id, the same way it updates the level for each node.
2013-06-03 23:50:20 -10:00
Shannon Deminick
13c2aaf346 Fixed hard coded paths, removed html path in markup 2013-06-03 21:43:46 -10:00
Shannon Deminick
34cb8ea633 Changed back office routes to use a proper MVC area and ensures that the controller creations for all controllers are limited
to ONLY look in the namespaces declared for them, this will increase performance and ensure there's not conflicting controller
creation... need to back port this to 6.0.x
2013-06-03 21:38:43 -10:00
Shannon Deminick
8bced15f56 updates icon output 2013-06-03 21:19:38 -10:00
Shannon Deminick
bb1052c063 Started integrating the contentTypeResource with the real back office data. 2013-06-03 18:56:16 -10:00
Shannon Deminick
0d071e9fe9 Changed all my custom stuff over to only be a part of the 'umbraco' module, this will just help with merging later so I'm not
mucking about with other module definitions. Added an icon converter so that we can automatically try to map all legacy sprite icons
to the new icons. Merged in recent chagnes from Belle repo to get sections working again.
2013-06-03 17:36:04 -10:00
Shannon Deminick
695b238499 Merge with 6.1.2 2013-06-03 16:27:42 -10:00
Shannon Deminick
813d60521c Merge with 6.0.7 2013-06-03 16:27:20 -10:00
Shannon Deminick
5212d17f49 Fixes: #U4-2313 - manually adding a reserved route value in BeginUmbracoForm 2013-06-03 14:56:15 -10:00
Shannon Deminick
76bbdcd32c Merge with 6.1.2 2013-06-03 13:36:40 -10:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -10:00
Shannon Deminick
edfffad122 updates proj file 2013-06-03 13:09:49 -10:00
Sebastiaan Janssen
948ffe4796 Merge with 6.0.7 2013-06-03 15:11:44 -02:00
Sebastiaan Janssen
6b1dd07310 Fixes U4-2254 [Object object] error when selecting media link for content. 2013-06-03 15:11:23 -02:00
Sebastiaan Janssen
dc2554c6d0 Fixes U4-2254 [Object object] error when selecting media link for content. 2013-06-03 15:08:56 -02:00
Shannon Deminick
47af165ad8 Got legacy icons working 2013-06-02 23:00:02 -10:00
Shannon Deminick
1a5eb33422 Ok, no reverted to my merged versions... now we have a clear idea of whats chagned. 2013-06-02 22:34:35 -10:00
Shannon Deminick
87103ceba7 Ok, this is the raw belle files that I've modified which I'll revert to after this commit. 2013-06-02 22:30:34 -10:00
Shannon Deminick
193fcd3083 merged all new changes in... going to revert to the raw belle files after this and then move back to this revision so we have a
clear picture of whats changed.
2013-06-02 22:29:07 -10:00
Sebastiaan Janssen
5c6514929e Opening branch 6.1.2 2013-06-03 06:16:19 -02:00
Sebastiaan Janssen
9739b3e2ef Closing branch 6.1.1 2013-06-03 06:15:57 -02:00
Sebastiaan Janssen
0b1f72f139 Added tag release-6.1.1 for changeset 7271ae03cb53 2013-06-03 06:15:31 -02:00
Shannon Deminick
dd3490a2ab added extension.js, trying to add legacy sprites for tree icons, updates tree icon filters (still not working) 2013-06-02 20:34:06 -10:00
Shannon Deminick
4a24abca17 Fixes issues with requirejs not loading in things in order. 2013-06-02 18:42:17 -10:00
Shannon Deminick
575b5b71ab got legacy tree icons showing up now, added a couple of filters for this to work. 2013-06-02 17:09:16 -10:00
Shannon Deminick
c60cc5d10d fixes blue tree style, updated tree.html to not show caret when there is no children, applied inline styles to it which
should be moved to the stylesheet.
2013-06-02 15:48:43 -10:00
Shannon Deminick
1fc262063a Fixes tree styles. 2013-06-02 15:20:57 -10:00
Shannon Deminick
8aba37cb10 removes container controller 2013-06-02 14:35:26 -10:00
Shannon Deminick
2cf1ee283f Ensures controllers are authenticated. fixes type with login directive. 2013-06-02 14:35:15 -10:00
Morten Christensen
2a2e867784 Fxies U4-2257 2013-06-02 11:30:27 -02:00
Sebastiaan Janssen
79e0242468 Show containers in folderbrowser again 2013-06-02 05:03:51 -02:00
Morten Christensen
242443d861 Fixes the EntityRepository for Content and Media, so trees load correctly.
Fixes U4-2306
Fixes loading of MNTP.
FolderBrowser is now able to show multiple images on a single media item.
FolderBrowser only shows images and not containers.
2013-06-01 20:40:51 -02:00
Shannon Deminick
f3fbae7173 Updated trees to get children nodes from the server... nearly working and also works with proxying
to legacy trees. In fact there are not new trees created yet, just focusing on adapting for legacy trees
which so far seems to be good.
2013-05-31 17:20:56 -10:00
Shannon Deminick
4a57dcfd01 Updates tree service and controller to work with promises when retreiving data for the tree. 2013-05-31 16:14:16 -10:00
Sebastiaan Janssen
7c066b9ded Merge with 6.0.7 2013-05-31 14:01:21 -02:00
Sebastiaan Janssen
159d605434 U4-2262 Release 6.1.0 Build 2 (Beta) has Razor Errors on scripting files 2013-05-31 13:59:35 -02:00
Shannon Deminick
ad1a36c0ee Changed new directives over to user proper function declaration with code comments. Added new tree data resource, using
promise api to return the data (handy!)
2013-05-31 04:28:26 -10:00
Sebastiaan Janssen
1971006a48 Merge with 6.0.7 2013-05-31 12:16:09 -02:00
Sebastiaan Janssen
5c0c33a46b Fixes U4-2304 Typo bug in umbraco.cms.businesslogic.packager 2013-05-31 12:14:03 -02:00
Sebastiaan Janssen
9bd255d9a5 Include ExamineManagementIco.png in project so it's included in the build 2013-05-31 11:35:21 -02:00
Shannon Deminick
84856eaf30 Merge with 6.1.1 2013-05-31 03:11:16 -10:00