Commit Graph

5066 Commits

Author SHA1 Message Date
Shannon Deminick edfffad122 updates proj file 2013-06-03 13:09:49 -10: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 2cf1ee283f Ensures controllers are authenticated. fixes type with login directive. 2013-06-02 14:35:15 -10: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 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
Shannon Deminick 43c7ccc5cc adds custom directives to simplify the default razor view markup so it can be managed externally. 2013-05-31 03:04:38 -10:00
Sebastiaan Janssen cc7f41d9ee U4-2295 Templates tree doesn't refresh and Master template stays at "None" 2013-05-31 09:15:10 -02:00
Shannon Deminick 160811e190 added new tests for model mapping and serialization of the content display models. Started integrating trees. Committed the compiled
angular controllers, directives, services, resources since I'll be modifying them to work with the real data services. Then we'll have
to merge back to the belle repo with the changes.
2013-05-30 21:21:52 -10:00
Sebastiaan Janssen 78bfb6a8cc Fix missing Examine dashboard 2013-05-30 10:26:54 -02:00
Sebastiaan Janssen ddbe15de08 Config file formatting, remove logger from CD for now as it was throwing errors 2013-05-30 08:47:17 -02:00
Sebastiaan Janssen 5c5d63ce9a web.Template.config formatting 2013-05-30 06:26:55 -02:00
Shannon Deminick 03f64521cb updated sln to have a simple website project in the Umbraco.UI.Client folder which will be the Belle development folder, its a website so it doesn't compile or anythng
just a space to be able to edit files. We can probably also update it to launch IIS Express to point to the build folder for testing. Moved the back office
scripts controller actions just to the normal back office controller. Tweaked some of the Belle POC so now it is loading and have created an index.html
file which contains all the belle stuff so people won't have to worry about the container razor file.
2013-05-29 20:25:29 -10:00
Shannon Deminick 957e98ac78 adding libs to repo to support Belle, again these are temporary until the real integration starts in a few weeks. 2013-05-29 17:33:05 -10:00
Shannon Deminick 5d10325d50 Adding required files to get the Belle demo working, these files will are not part of VS project and will actually be removed from this
space in the future, they are here for now until we integrate the belle repo with this one.
2013-05-29 17:30:36 -10:00
Shannon Deminick 936c2a87ab Fixed up the property editors to now all work with saving data, updated the file uploaded to actually save the files, clear the files, and update
its UI accordingly. Ensures that when data is saved we send back down the up-to-date model and re-bind everything which works awesome.
2013-05-28 22:58:31 -10:00
Shannon Deminick c5ff9ddec9 Updated property editors deserialization method to accept more information and original values, updated the upload property editor to now save
files in accordance with exactly how we are saving them currently and it is all working... expcept the new uploader can do multiple files. It is
now persisting to the database as well.
2013-05-28 18:27:11 -10:00
Shannon Deminick 94786f08c6 Removes old type finder and type resolver. Updates POC postcode editor to work with new config array. 2013-05-28 16:49:01 -10:00
Shannon Deminick 302b3c3750 Fixed some build problems, replaces all calls to the legacy/obsolete data type factory to the DataTypesResolver and removes test for DataTypeFactoryTests.
Updates data type editor to show legacy data types at the bottom and the new Property editors at the top. Updated the data type editor to use the new api
so that we can test assigning Belle property editors to data types (pre-values have not been converted though). #U4-2289
2013-05-28 15:54:19 -10:00
Shannon Deminick 522d909d37 Merge with 6.1.0 2013-05-28 14:20:43 -10:00
Shannon Deminick 547a137b9a Merge 2013-05-28 13:49:17 -10:00
Shannon Deminick 5041e6fcc4 Updated to latest CDF version that has a few bug fixes and added a CDF logger. 2013-05-28 13:24:48 -10:00
Sebastiaan Janssen db0d139a39 Merge with 6.0.6 2013-05-28 15:48:51 -02:00
Sebastiaan Janssen fc32100142 Merge with 4.11.9 2013-05-28 15:45:59 -02:00
Sebastiaan Janssen 7ecbc3b391 Fixes U4-2248 Spelling error in back office 2013-05-28 15:44:59 -02:00
Sebastiaan Janssen c3c44df52e Merge with 4.11.9 2013-05-28 15:43:40 -02:00
Sebastiaan Janssen 13a86624ff Fixes U4-2248 Spelling error in back office 2013-05-28 15:39:12 -02:00
Shannon Deminick cf631974a8 Updated validator definitions, updated ToXml logic to take into account new Property Editors, added Serialization and Deserialization methods
for property editor's to override if necessary, updated the ContentItemBinder to bind the db and dto models so now that validator filter
just validates against the model and doesn't actually do any data lookups itself (much nicer). Now saves and retreives from the database !!
2013-05-27 21:32:37 -10:00
Shannon Deminick 7d7ca4530b Getting server side integration working from ported over Belle POC including temporary custom property editors.
Many files committed will be temporary and will be removed once development between the Belle UI project and this project are merged
and working.
2013-05-27 18:21:07 -10:00
Shannon Deminick 8ab85133bd Merge with 6.1.0 2013-05-27 17:17:52 -10:00
Shannon Deminick cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct
paths.
2013-05-27 01:23:49 -10:00
Sebastiaan Janssen aef44065c5 Merge with 6.0.6 2013-05-27 08:17:49 -02:00
Sebastiaan Janssen 4ce22b836e Merge with 4.11.9 2013-05-27 08:16:18 -02:00
Sebastiaan Janssen 6afa6a277f Fixes U4-2263 unable to create or save stylesheet content 2013-05-27 07:40:29 -02:00
Sebastiaan Janssen f5bf05a6f5 Move embed media service from webservices dll into it's own /base class 2013-05-27 07:19:42 -02:00
Sebastiaan Janssen 071f3dcc01 Fix javascript error with the speechbubble 2013-05-27 06:05:13 -02:00
Shannon Deminick 8b841e19eb Upgrades required projects to .Net 4.5 2013-05-26 13:33:43 -10:00
Shannon Deminick b6f52bf782 Changed the profiler over to use resolvers again. We no longer will call MiniProfiler directly.
Added an HtmlHelper extension which is used to render the profiler html output.
Added an HtmlHelper property to the new base page too.
2013-05-13 20:10:28 -10:00