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
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
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
Sebastiaan Janssen
8c841f97cc
Merge with 6.0.7
2013-05-31 05:57:18 -02:00
Sebastiaan Janssen
a1ee352514
Additional fix for U4-335 Image cropper out of memory
2013-05-31 05:46: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
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
