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

47 Commits

Author SHA1 Message Date
Shannon
3c3f2d7c8d Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Constants-Conventions.cs
	src/Umbraco.Core/DateTimeExtensions.cs
	src/Umbraco.Core/Models/PropertyType.cs
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Factories/PropertyGroupFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IUserRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/Repositories/PermissionRepository.cs
	src/Umbraco.Tests/App.config
	src/Umbraco.Tests/Persistence/Repositories/MemberTypeRepositoryTest.cs
	src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Xslt/xsltInsertValueOf.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dialogs/umbracoField.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/members/EditMember.aspx.cs
	src/umbraco.MacroEngines/App.Config
	src/umbraco.providers/members/UmbracoMembershipProvider.cs
 2014-02-21 16:32:53 +11:00
Shannon
1ada5210ad updated to latest examine 2014-02-21 09:54:53 +11:00
Shannon
0fc5af5e17 Merge remote-tracking branch 'origin/6.2.0' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Persistence/Factories/MemberTypeReadOnlyFactory.cs
	src/Umbraco.Core/Persistence/Repositories/ContentTypeBaseRepository.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Persistence/RepositoryFactory.cs
	src/Umbraco.Tests/packages.config
	src/Umbraco.Web.UI/packages.config
 2014-02-20 23:06:13 +11:00
Shannon
ce649f54d7 Upgraded to latest examine, completes: U4-4240 Update with new examine version 0.1.53 2014-02-20 15:01:47 +11:00
perploug
2bd2f12831 ImageCropper Upload enabled 
The cropper can now fully replace the upload datatype
 2014-02-17 16:17:02 +01:00
Shannon
4db6ce4b22 Fixes various issues relating to File Repositories and Services: U4-4014 FileRepositories offer no way to create folders, U4-4013 The models that the FileService produces causes security exceptions, U4-3993 Replace system.io calls in umbraco.scriptTasks legacy task 
updates to latest CDF
 2014-01-09 18:08:13 +11:00
Shannon
72a366d0dc Fixes: U4-4012 When loading in a lot of separate assets in a manifest CDF is throwing exceptions with a 'too long query string' - updates to latest CDF 2014-01-09 15:58:06 +11:00
Shannon
478b7cde42 Removes uGoLive from the core (for now until it is rebuilt against v7 ) 2013-11-28 10:51:54 +11:00
Shannon
d0c5dd208f Reverted to Newtonsoft.Json 4.5.11 2013-11-13 11:28:14 +11:00
Stephan
8a8b09141f Merge remote-tracking branch 'origin/7.0.0' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Tests/TestHelpers/BaseWebTest.cs
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-10 16:15:23 +02:00
Stephan
31535e3bd8 Merge remote-tracking branch 'origin/6.2.0-pubcontent' into 7.0.0-pubcontent 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx
	src/Umbraco.Web.UI/Umbraco/create/PartialView.ascx.designer.cs
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/create/UI.xml
	src/Umbraco.Web.UI/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web.UI/umbraco/create/xslt.ascx
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoHelper.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/DLRScripting.ascx
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/create/xslt.ascx
 2013-10-08 11:21:38 +02:00
Sebastiaan Janssen
45ad51b8df U4-2737 Snippets that are available when creating new MacroScripts should also be available for Partial Views 2013-10-06 16:45:21 +02:00
Shannon
6ac724951b Explicitly adds automapper to the UI proj so we don't get that strange YSOD that says it's not there sometimes. 2013-10-03 12:18:21 +10:00
Shannon
30095000e6 Updates to latest version of JSON.Net 2013-09-27 13:25:28 +10:00
Shannon
5d224cca9b Updates to latest version of Microsoft.Net.Http 2013-09-27 13:22:27 +10:00
Shannon
bfabfd9fa5 Updated to latest Examine version (contains bug fix for U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8) and removes the partially trusted callers attribute from the PDF lib because itextsharp by default doesn't support med trust. 2013-08-13 15:41:40 +10:00
Shannon
41c920a4ec Updated to latest CDF version which contains some fixes. 2013-07-22 11:29:32 +10:00
Morten Christensen
f06a6f42da Updating nuget dependency for ClientDependency 2013-07-03 11:20:42 +02:00
Morten Christensen
9d4e1362c4 Updating nuget references for ASP.NET MVC, Razor, WebPages and WebApi to latest patch release 2013-07-03 11:11:37 +02:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Shannon Deminick
932115585e Fixes: #U4-2315 - CDF grouping issue, updated to new version 2013-06-03 13:35:41 -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
Shannon Deminick
cb8d080f1d Removes the abstraction on the profiler, no need for a resolver, it will work in unit tests and we can override the provider if needed. 
Added better support for MVC profiling by using the built in ProfilingViewEngine and ProfilingActionFilter.
 2013-05-12 19:05:49 -10:00
Shannon Deminick
979fe46e9b Updated CDF to 1.6.0.0 2013-04-18 00:55:40 +06:00
Shannon Deminick
2dfdc1050b Updates solution to use latest examine 1.5.1 from official Nuget source. 2013-04-05 06:19:52 +06:00
Shannon Deminick
6ead98a51d updated latest examine patch dll. added indexing actions to the dashboard. have optimize working great all 
with the new umbraco api framework.
 2013-02-28 05:05:06 +06:00
Shannon Deminick
bcfc7b2507 Adds UrlHelper extensions to get the url of any umbraco web api controller. Updates proj dependencies. 2013-02-26 23:13:32 +06:00
Shannon Deminick
7deae8ea37 Update to latest examine (bug fixed), started Examine Management dashboard FF project. 2013-02-23 23:00:31 +06:00
Shannon Deminick
a3f7ef7002 Merge with 6.0.1 2013-02-22 20:04:57 +06:00
Shannon Deminick
e2d806f5d9 Merge with 4.11.5 2013-02-22 20:00:10 +06:00
Sebastiaan Janssen
87947871d1 Have to add new Examine version to Web.UI as well, else the build output from 
build.bat file will not be able to find it.
 2013-02-22 09:57:58 -01:00
Shannon Deminick
8ea9627d51 Updated to Examine 1.45, Updated FixedDisplayModes to 1.0.1 2013-02-20 21:29:56 +06:00
Shannon Deminick
6e1316cb95 Fixes up some merge issues. 2013-02-01 19:41:23 +06:00
Sebastiaan Janssen
59c844eb8f Upgrade to MySQL connector 6.6.4.0 to fix U4-1519 2013-01-26 15:10:02 -01:00
Sebastiaan Janssen
5e2d991fab Update uGoLive 2013-02-01 08:16:10 -01:00
Sebastiaan Janssen
c103f93004 Possible fix for U4-1452 Umbraco 6 beta / MySQL: Unable to find the requested 
.Net Framework Data Provider.
 2013-01-15 14:19:31 -01:00
Sebastiaan Janssen
c150a91e50 Update uGoLive & Fixes U4-1447 uGolive result: Unable to find node 
/configuration/system.web/compilation/@debug in config file web.config
 2013-01-14 08:43:50 -01:00
Sebastiaan Janssen
7d0fecb078 Update uGoLive to v1.3.0 (has better reporting of which folders have incorrect permissions) 2013-01-07 14:06:07 -01:00
Sebastiaan Janssen
094fbf2e6b Putting ClienntDependency.Mvc back now that we have assembly redirects 2012-12-12 07:20:58 -01:00
Sebastiaan Janssen
7e3faf3810 Add FixedDisplayModes package, as per issue #U4-1305 2012-12-10 11:45:36 -01:00
Sebastiaan Janssen
323af078ca Upgrade to MVC4 2012-12-06 10:31:54 -01:00
Sebastiaan Janssen
9d5b1e178a Move all the lib files to NuGet/MyGet and remove legacy folders 2012-11-26 17:11:13 -01:00
Sebastiaan Janssen
9f9f754d15 Update log4net references to use the medtrust version 2012-11-26 11:27:56 -01:00
Sebastiaan Janssen
59c452d2ea Updated log4net to get the medium trust supported version from myget 2012-11-26 10:12:50 -01:00
Shannon Deminick
159718bf4f Updated sln to use Nuget for ClientDependency references, ensures that all config changes 
are backward compatible. Have updated the new ClientDependency.config file with the new
features, though these are not required for existing installs but we should advise to merge
the new changes in.
Added ClientDependency.Core.Mvc to the UI project so that it will now ship with this library.
 2012-11-21 08:01:23 +05:00
Sebastiaan Janssen
664a0ff4ec Add MVC3 dlls to bin folder so that hosts don't have to have MVC installed 
Fixed #U4-1137
 2012-11-08 07:05:29 -01:00
shannon@ShandemVaio
b09422ed5e Added Log4Net and supporting classes from v5 in order to start integration of new diagnostic logging system. 2012-07-28 01:28:39 +06:00