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

5459 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
768eb3d1ed Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
	src/Umbraco.Web/Mvc/PluginControllerArea.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/WebBootManager.cs
 2013-06-18 15:13:43 +10:00
Shannon
120bdca9eb removed constraint names on SurfaceControllers, they don't need to be suffixed with SurfaceController, only Controller. 2013-06-18 15:05:13 +10:00
Shannon
a5041aa34e Backported changes to use a real Area to do Umbraco area routes and updates our extension methods with the UseNamespaceFallback data token to only check in one namespace. 2013-06-18 14:59:00 +10:00
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
38eee6135e Merge branch '6.0.7' into 6.1.2 2013-06-18 14:21:11 +10:00
Shannon
d3780848dc updated ignore file with correct case sensitivity 2013-06-18 14:20:50 +10: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
Shannon
c9c3623457 updated ignore 
Signed-off-by: Shannon <sdeminick@gmail.com>
 2013-06-17 02:59:00 +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
Sebastiaan Janssen
68aa2abbc0 Merge pull request #7 from pynej/6.1.2 
Fixed Ctl+S on stylesheets editor.
 2013-06-13 03:11:57 -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
Sebastiaan Janssen
3921b0974e Merge pull request #3 from Jayshoe/patch-1 
Sitemap provider be gone! Issue #U4-1950
 2013-06-12 07:19:56 -07:00
Jayshoe
2cd07c841f Sitemap provider be gone! Issue #U4-1950 2013-06-12 16:19:14 +02:00
Sebastiaan Janssen
292dd9115b Update README.md 2013-06-11 00:57:36 +02:00
Sebastiaan Janssen
c6d0a9be00 Update README.md 2013-06-11 00:57:34 +02:00
Sebastiaan Janssen
14c3acc4b7 Create README.md 2013-06-11 00:57:31 +02:00
Sebastiaan Janssen
a4098b5d25 Update README.md 2013-06-11 00:57:03 +02:00
Sebastiaan Janssen
acdcca0b91 Add missing files 2013-06-11 00:48:29 +02:00
Sebastiaan Janssen
33ff82e766 Add missing files 2013-06-11 00:47:44 +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
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
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
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