yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
5,472 Commits 4 Branches 7 Tags
34cb8ea633547ddf6fcffaf0c1f499d8765e5ec2
Commit Graph

1607 Commits

Author SHA1 Message Date
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
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
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
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
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
2cf1ee283f Ensures controllers are authenticated. fixes type with login directive. 2013-06-02 14:35:15 -10: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
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
Sebastiaan Janssen
b4b0a37c2c Fixes U4-2302 Breaking change in 6.1? Macro parameter "contentPicker" no longer 
passes an id, but a node
 2013-05-31 09:13:25 -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
Morten Christensen
c25b06b15f Fixes #U4-2296 2013-05-30 14:28:34 -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
Morten Christensen
d3916a1d85 Sorting - now it works 2013-05-29 13:37:41 -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
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
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
e6fcdc8dc6 Fixes: #U4-2279 2013-05-28 14:16:39 -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
f484dbf0fc Fix merge issue 2013-05-28 12:37:29 -02:00
Sebastiaan Janssen
6d0ededd9f Merge with 6.0.6 2013-05-28 12:21:31 -02:00
Sebastiaan Janssen
e7d157a209 Merge with 4.11.9 2013-05-28 12:18:49 -02:00
Sebastiaan Janssen
d3ed90c23e Some fixes & refactor 2013-05-28 12:10:29 -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
f6155d8e49 Fixes: #U4-2243 - reverts code to use the legacy API to create a template until the new template service is updated to work as it did. 2013-05-27 17:13:12 -10:00
Sebastiaan Janssen
fa8934f89a Merge with 6.0.6 2013-05-27 10:09:00 -02:00
Sebastiaan Janssen
c6940096d3 Merge 2013-05-27 10:08:36 -02:00
Sebastiaan Janssen
f399a9f52b Merge with 4.11.9 2013-05-27 10:00:28 -02:00
Sebastiaan Janssen
562851b93e Possible fix for U4-2251 TreeDataService throws JSON JavaScriptSerializer. The 
length of the string exceeds the value set on the maxJsonLength property
 2013-05-27 09:59:02 -02: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
7ccae64dd1 Fix merge issue 2013-05-27 08:19:20 -02: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
f5bf05a6f5 Move embed media service from webservices dll into it's own /base class 2013-05-27 07:19:42 -02:00