Commit Graph

5445 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
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
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
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
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
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
Morten Christensen
c25b06b15f Fixes #U4-2296 2013-05-30 14:28:34 -02:00
Sebastiaan Janssen
78bfb6a8cc Fix missing Examine dashboard 2013-05-30 10:26:54 -02:00
Sebastiaan Janssen
d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen
b70c98ea74 Merge with 6.0.7 2013-05-30 10:25:20 -02:00
Sebastiaan Janssen
a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -02:00
Sebastiaan Janssen
96f8cd3d60 Opening branch 6.1.1 2013-05-30 10:21:34 -02:00
Sebastiaan Janssen
91436ad247 Closing branch 6.1.0 2013-05-30 10:20:59 -02:00
Sebastiaan Janssen
678f911ff1 Added tag release-6.1.0 for changeset 8309c3bd6db5 2013-05-30 10:20:36 -02:00
Sebastiaan Janssen
afbe3ca3b9 Creating branch 6.0.7 2013-05-30 09:57:33 -02:00
Sebastiaan Janssen
32d6f2e50c Closing branch 6.0.6 2013-05-30 09:57:03 -02:00
Sebastiaan Janssen
9909f5b6be Added tag release-6.0.6 for changeset 953c466faf8f 2013-05-30 09:56:32 -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
Morten Christensen
d3916a1d85 Sorting - now it works 2013-05-29 13:37:41 -02:00
Morten Christensen
db7cb2dcb4 Merge with 6.0.6 2013-05-29 13:18:40 -02:00
Morten Christensen
6281268954 Updating sort method in Content- and MediaService 2013-05-29 13:18:03 -02: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
Sebastiaan Janssen
cd606a7e9e Merge 2013-05-29 05:41:50 -02:00
Sebastiaan Janssen
ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Morten Christensen
f6e44b4e7c Merge with 6.0.6 2013-05-29 05:38:35 -02:00
Morten Christensen
8e1c45e981 Updating Sort methods to skip items that hasn't been sorted 2013-05-29 05:37:55 -02:00
Sebastiaan Janssen
955282f260 Merge with 6.0.6 2013-05-29 03:49:44 -02:00
Sebastiaan Janssen
4a7ee52d63 Merge with 4.11.9 2013-05-29 03:47:26 -02:00
Sebastiaan Janssen
b4d88b0361 U4-2279 TryGetRouteDefinitionFromAncestorViewContexts has infinite loop when
currentContext doesnt contain umbraco-route-def
2013-05-29 03:44:01 -02:00
Sebastiaan Janssen
b41cf37dd5 U4-2290 Notifications do not handle fields that have null values. 2013-05-29 03:42:20 -02: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