Per Ploug Krogslund
e09272316f
Merge
2013-06-10 10:56:44 -02:00
Per Ploug Krogslund
9c32a4ead0
Merge
2013-06-10 10:48:56 -02:00
Per Ploug Krogslund
f472e139b5
clearing out legacy common folder
2013-06-10 10:48:36 -02:00
Per Ploug Krogslund
47f1dcf4e5
Missing client files, excluding node_modules
2013-06-10 10:44:40 -02:00
Per Ploug Krogslund
6b6ece01f6
Moved all JS files to umbraco.ui.client folder so naming and structure is consistent with the umrbaco 7 structure
...
Added locally mocked data in a seperate module
2013-06-10 10:39:34 -02:00
Shannon
47d70e858b
Getting media picker working
2013-06-10 10:36:59 -02:00
Shannon
1b59c1ba6e
Got content item creation working and rte property editor working/saving
2013-06-09 11:40:52 -02:00
Shannon
083328e473
Fixes tree source parsing.
2013-06-09 06:27:16 -02:00
Shannon
54bad14590
Merge
2013-06-09 06:21:09 -02:00
Shannon Deminick
1f8aa65b5d
missing template to get demo working
2013-06-09 06:19:36 -02:00
Shannon
0205f8a025
Merge
2013-06-09 06:19:27 -02:00
Shannon
1da4f2379f
Temp removes uGoLive since the old TypeFinder isn't there anymore.
2013-06-09 06:19:08 -02:00
Shannon Deminick
b341cf8b93
Commits temp js files needed for demo to work
2013-06-09 06:16:56 -02:00
Shannon Deminick
e888bd39d6
Commits some directive views - temporary to get demo working
2013-06-09 05:58:06 -02:00
Shannon Deminick
8e3f075fd9
missing file
2013-06-07 04:18:30 -10:00
Shannon Deminick
6028cebc90
Fixes lookup for getting allowed child content types
2013-06-07 02:45:06 -10:00
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
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
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
