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

3688 Commits

Author SHA1 Message Date
Shandem
59811c2841 Merge pull request #11 from florisrobbemont/6.1.2 
Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umb...
 2013-06-17 21:27:19 -07:00
Shannon
5719820fad Merge branch '6.0.7' into 6.1.2 
Conflicts:
	.gitignore
	src/Umbraco.Web/umbraco.presentation/umbraco/Trees/loadPackages.cs
 2013-06-18 14:18:17 +10:00
Shannon
9d15228c68 manually applies patch for drag/drop fix in media for vdir 2013-06-17 03:06:24 +02:00
Floris Robbemont
aecc3d28bf Fix U4-2286 - IFilteredControllerFactory classes are not resolved by Umbraco 
Simple fix, just made the FilteredCOntrollerFactoriesResolver public. This way developers can add their own on application start
 2013-06-15 22:46:01 +02:00
Sebastiaan Janssen
b51022575f Merge pull request #8 from mattbrailsford/6.1.2 
Updated RenderMvcController to have the view engines test for file existance
 2013-06-13 03:42:34 -07:00
Sebastiaan Janssen
6600e9c899 Merge pull request #6 from dpen2000/UserPermisionsFixIn6.1.2 
Fix U4-2320 - Error on saving User Permissions (for 6.1.2 release)
 2013-06-13 03:18:37 -07:00
mattbrailsford
9b78cb3f7c Updated RenderMvcController to have the view engines test for file existance, rather than assuming views will always be razor. This allows alternative MVC view engines to be used. 2013-06-13 09:26:45 +01:00
Jeremy Pyne
c6c90fde44 Fixed Ctl+S on stylesheets editor. 2013-06-12 23:41:49 -03:00
david.pendray
773500332b Fix U4-2320 - Error on saving User Permissions 
Nodes can be null but NodeIds property always returns a collection and this will return Ids from Nodes if _nodeIds are null and Nodes is not.
 2013-06-13 02:50:25 +01:00
Jayshoe
2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
leekelleher
e0c68a8e1c Resolves #U4-184 Upgrade package when installing a newer version. 
Multiple package versions can be installed, only the latest version is listed under "Installed Packages".
When the installed package is viewed, a list of previously installed versions (of that package) are listed.
 2013-06-10 13:55:58 -01:00
Morten Christensen
bc1b2dc5f4 Fixes #U4-2333 2013-06-07 05:19:45 -02:00
Morten Christensen
0bb643672f Adding some minor changes/adjustments to the TypeFinder to make a bit more flexible for external usage. 2013-06-07 05:19:25 -02: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
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
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
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
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
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
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
a8ad8c2a43 Bump version number 2013-05-30 10:23:35 -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
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
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
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