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

148 Commits

Author SHA1 Message Date
Niels Hartvig
afbceca184 Makes EXIF data in resized images default 2017-01-02 17:29:37 +01:00
Shannon
c8f0f05570 U4-9246 Should ship with numRecompilesBeforeAppRestart="50" to avoid max recompilations reached errors 2016-12-19 17:10:29 +11:00
Claus
d725f1362f U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:23:31 +02:00
Claus
e79427619b Revert "U4-8984 Upgrade AutoMapper to latest 3.x" 
This reverts commit 4887302b51.
 2016-09-16 21:22:35 +02:00
Claus
4887302b51 U4-8984 Upgrade AutoMapper to latest 3.x 2016-09-16 21:21:14 +02:00
Oliver Philpott
952ff74899 Fixed formatting for woff2 mimetype 2016-06-09 10:26:03 +01:00
Oliver Philpott
3f5729767d U4-8509 - Added woff2 mime type 2016-06-09 10:08:05 +01:00
Shannon
1361e017a2 Merge branch 'u4-222' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-222 
Conflicts:
	src/Umbraco.Core/Security/BackOfficeUserManager.cs
	src/Umbraco.Web.UI.Client/src/less/pages/login.less
	src/Umbraco.Web.UI.Client/src/routes.js
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/login.controller.js
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web.UI/web.Template.config
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2016-04-12 18:07:25 +02:00
Sebastiaan Janssen
5e8200ecb2 U4-7909 7.4-rc1 is missing references because it's using portable class libraries now 
#U4-7909 Fixed
 2016-02-09 17:10:43 +01:00
Stephan
b6a9734755 Fix ModelsBuilder integration 2016-02-09 11:46:26 +01:00
Shannon
6ad568c81a changes config template with new MB config option 2016-01-20 18:18:33 +01:00
Shannon
76dd7f8909 changes default upload limit to 50 mb 2016-01-20 10:48:10 +01:00
Sebastiaan Janssen
0621019918 Adds .models extension for the zip release 2016-01-19 12:31:22 +01:00
Sebastiaan Janssen
d1cdff6349 Reference to System.Runtime is required 
Release with a reference to ModelsBuilder
 2016-01-15 16:24:14 +01:00
Sebastiaan Janssen
742e0d69fa Removes duplicate requestFiltering node in web.Template.config 2016-01-15 15:56:26 +01:00
Shannon
8b2606f681 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:31:35 +01:00
Shannon
5aab50ba3b Ensures fcnMode and file size maximums are set for the debug web config transform and also for the nuget transform. 2016-01-13 17:27:56 +01:00
Shannon
dfa687e695 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI/web.Template.config
 2016-01-13 17:18:30 +01:00
Shannon
5b9cbae860 Fixes: U4-7712 fcnMode = Single by default 2016-01-13 17:17:39 +01:00
Shannon
5eff065835 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2015-12-28 10:19:24 +01:00
Robert Foster
fbee58e445 Added json mimetype Mapping to web.config.template to support things like manifest.json in certain browsers (e.g. IE). 2015-12-26 19:05:44 +11:00
Shannon
fcbac0138a U4-7549 For new installs make the Image use the image cropper instead of upload 
Also fixes issue with media type editor which was a bug resulting fromn(U4-6837)
 2015-12-16 17:23:50 +01:00
Shannon Deminick
283de5a7d6 Merge pull request #831 from umbraco/temp-U4-7178-media-library 
Temp u4 7178 media library
 2015-10-27 11:41:10 +01:00
Per Ploug
b6bbb8e79d Related to: U4-7264 Support for folder upload 
Enable a larger file max size for upload as 4mb is quickly very
limiting.
 2015-10-16 12:58:08 +02:00
Per Ploug
4d5ba9304f Adds modelbuilder ui intergration 
As we load the doctype editor, we detect if the install has the models
builder dlls, if not found / error, we should the normal save button,
otherwise you get a button + generate models option.
web.configs + translated prepared as well, but nothing is active untill
the zbu dlls are dropped in bin
 2015-10-15 13:14:06 +02:00
Sebastiaan Janssen
4142f47861 U4-6125 Installing MySQL Web Provider Breaks Page Publishing 
#U4-6125 Fixed Due in version 7.3.1
 2015-10-13 13:48:58 +02:00
Sebastiaan Janssen
91a1955454 Make sure to redirect to the current version of HTML Agility Pack 2015-09-17 12:20:11 +02:00
Sebastiaan Janssen
d87b268a40 Update to MVC5 2015-07-30 17:08:39 +02:00
Sebastiaan Janssen
9f000eb90c Updates build to include and exclude correct files, syncs web.config and syncs dependency versions between core and nuget pkg 2015-07-27 15:52:10 +02:00
Sebastiaan Janssen
ea653cbd18 U4-6762 7.3 beta: Could not load file or assembly 'System.Web.Mvc, Version=4.0.0.0 
#U4-6762 Fixed
 2015-07-20 11:30:04 +02:00
Sebastiaan Janssen
f1d26d0990 Bring web.config in line with the nuget one 2015-06-09 14:35:30 +02:00
Shannon
d2deaf0375 Fixes MVC references and updates to 4.0.0.1 2015-05-11 12:43:45 +10:00
Shannon
95ff94c532 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
	src/Umbraco.Web/Editors/AuthenticationController.cs
	src/Umbraco.Web/packages.config
 2015-05-11 12:26:53 +10:00
Shannon
a4a49b1466 Revert "Fixes MVC 4.0.0.1 problem once and for all." - All MVC ref's are 4.0.0.0, no web config transforms (also there was never a 4.0.0.1 version of System.Net.Http). Everything works on my machine now, even with 4.0.0.1 installed in the GAC. 2015-05-11 11:45:13 +10:00
Shannon
3be1cd8b0d Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Web.UI.Client/src/views/common/dialogs/user.controller.js
	src/Umbraco.Web.UI/packages.config
	src/Umbraco.Web/packages.config
 2015-05-07 16:24:29 +10:00
Shannon
1cac4ed075 Fixes MVC 4.0.0.1 problem once and for all. 2015-05-07 08:10:45 +10:00
Shannon
1de9dbf18c Updates build process to include building a nuget Identity package to provide extensibility points in Umbraco. 2015-04-01 13:42:36 +11:00
Shannon
394cab5ab4 Updates the owin startup classes - we now have a default one shipped as a DLL which will always execute based on the appSettings, then we can ship with 2 optional ones that people can learn and use from which just requires them to update the appSetting. Now to decide on how to ship these .cs files 2015-04-01 13:42:34 +11:00
Shannon
140d3c0268 Update to latest Identity. Moves startup code to App_Start like VS templates have, this will be better for our nuget packages (like i do in UmbracoIdentity which works for both web apps and websites). Updates web.config to explicitly declare the owin startup otherwise we'll end up with conflicts (YSODs) and now people can configure it properly. 2015-04-01 13:42:26 +11:00
Shannon
ff602da0fa Updates owin packages and updates the web.config tempate for owin redirects 2015-04-01 13:41:45 +11:00
Sebastiaan Janssen
6b92e47631 Unfortunately, we HAVE to point to MVC 4.0.0.0 else you get YSODs on machines with 4.0.0.1 in the GAC (and we can't point to 4.0.0.1 because 4.0.0.0 might be in the GAC and then it'll YSOD for THOSE people). BOOOO 2014-12-01 10:57:24 +01:00
Sebastiaan Janssen
98ceabaf7e Don't point web.config to MVC 4.0.0.1, it may not be installed (merge fail..) 2014-11-27 20:44:48 +01:00
Sebastiaan Janssen
a1c223bc2b Revert to using MVC 4.0.0.0 OOB so that people who have only 4.0.0.0 in the GAC can actually install Umbraco. If 4.0.0.1 is in the GAC that version will be taken. 
Leaves the additional reference to System.Web.Http in web.config so that you don't get the System.Web.Http.ApiController when 4.0.0.1 is indeed in the GAC.
 2014-11-26 10:43:46 +01:00
Sebastiaan Janssen
3330c617b4 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/SQLCE4Umbraco/SqlCEHelper.cs
 2014-11-25 17:04:47 +01:00
Sebastiaan Janssen
0df0b78b90 #U4-5453 Fixed 
Enabling IIS Compression gives ERR_CONTENT_DECODING_FAILED in backoffice
 2014-11-25 16:56:44 +01:00
Sebastiaan Janssen
cb869b9064 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	build/Build.bat
 2014-11-14 16:53:34 +01:00
Sebastiaan Janssen
b20fc22577 U4-5814 Apply MVC 4.0.0.1 security update 2014-11-14 16:51:51 +01:00
per ploug
48cb51e1e1 Updates forms installer dashboard 
Requires a web.config update to support .mp4 mimetypes
 2014-10-25 01:09:40 +02:00
Sebastiaan Janssen
f4231b1692 Upgrade to System.Web.Mvc 4.0.0.1 (or 4.0.40804.0 whatever you want to call it) 2014-10-17 17:24:32 +02:00
Sebastiaan Janssen
9f4d72e137 Improve NuGet upgrades 2014-10-16 13:41:00 +02:00