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

91 Commits

Author SHA1 Message Date
Sebastiaan Janssen
86ad3f6b05 Makes sure that R# doesn't suggest C#6 features 2015-07-24 17:25:52 +02:00
Shannon
d5460068d4 Merge remote-tracking branch 'origin/master-v7' into dev-v7 
Conflicts:
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Macros/MacroTagParser.cs
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Controllers/BackOfficeControllerUnitTests.cs
	src/Umbraco.Tests/Macros/MacroParserTests.cs
	src/Umbraco.Tests/Strings/StringExtensionsTests.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI.Client/src/common/services/macro.service.js
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/BackOfficeController.cs
	src/umbraco.cms/Actions/Action.cs
 2015-07-16 17:04:25 +02:00
Sebastiaan Janssen
2f714d0b3e Update MySql.Data dependency 2015-07-16 13:59:19 +02: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
Sebastiaan Janssen
4144590189 Upgrade to latest MySql.Data and loosen up NuGet dependency 2015-05-05 12:15:28 +02:00
Shannon
ff602da0fa Updates owin packages and updates the web.config tempate for owin redirects 2015-04-01 13:41:45 +11:00
Shannon
a2a8c8fbd7 updated to latest owin 2015-04-01 13:41:36 +11:00
Shannon
927add6f44 Updates UmbracoBackOfficeIdentity to add claims and adds a new ctor so people can create an identity manually - this is really the key, by doing this we'd already be able to have 3rd party authentication happening. Ensures our custom secure data format persists the user data 2015-04-01 13:41:21 +11: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
6c2750b0cc Moves fix for VS14 to the SqlCEHelper class itself, InternalsVisibleTo didn't seem to work in VS (worked on command line build though) 2014-10-24 10:32:41 +02:00
Sebastiaan Janssen
abc672e348 Fixes VS14 build. SqlCEHelper.cs - the compiler in Vs14 doesn't like that we're callng public IRecordsReader ExecuteReader(string commandText, params IParameter[] parameters) like this: ExecuteNonQuery("alter table [" + table + "] drop constraint [" + constraint + "]"); 
Added two internal method overloads that just send an empty parameter array instead.
 2014-10-23 17:52:14 +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
Shannon
0da4879400 downgrades mini profiler to what it used to be 2014-06-09 15:32:44 +02:00
Shannon
df3bc873df Upgrades mini profiler and enables it in the back offfice. 2014-05-30 15:26:22 +10:00
Shannon
f168093b92 Merge commit 'f06c9e823545d8e86309bb751e63b99a2a3b1a18' into 7.1.0 
Conflicts:
	src/Umbraco.Core/Models/Member.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Core/packages.config
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Web.UI/config/ClientDependency.config
	src/Umbraco.Web/umbraco.presentation/umbraco/controls/passwordChanger.ascx.cs
 2014-02-18 18:03:29 +11:00
Shannon
f1a439e851 removes version specific references to mysql in the proj files and web.config 
ensures that escaping in the sql expression classes is done correctly without any double escaping. Also ensures that escaping is happening using the equals operator, not just the Equals() method and adds unit tests for them.
Fixes: U4-4232 Umbraco.Core.Persistence.Querying issue with backslashes
 2014-02-18 14:57:03 +11:00
Shannon
105af392dc Obsoletes all legacy installer classes from the legacy data layer. 2013-09-10 11:43:07 +10:00
Shannon
8adfec51d0 Getting more unit tests fixed up, removed the old SQL installer scripts since there are not used whatsoever anymore 2013-09-06 18:03:00 +10:00
Shannon
deceec3fa2 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Membership/IUser.cs
	src/Umbraco.Web/Cache/CacheRefresherEventHandler.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/umbraco.businesslogic/packages.config
	src/umbraco.cms/Actions/ActionNew.cs
 2013-07-12 11:03:49 +10:00
Morten Christensen
0d54e8df89 Updating MySql package dependency 2013-07-03 11:00:26 +02:00
Shannon Deminick
cdbd1b504f upgraded other projs to 4.5, added page to render for back office for, now to get requirejs wired up properly as its not returning the correct 
paths.
 2013-05-27 01:23:49 -10:00
Shannon Deminick
2c05eda899 Merge with 6.0.3 2013-03-07 04:01:04 +06:00
Sebastiaan Janssen
b7dc052cb2 Additional fixes for U4-1845 to maintain compatibility for people using the 
wrong connection string
 2013-03-06 14:09:01 -01:00
Shannon Deminick
9324ab8e0e Merge with 6.0.1 2013-02-19 04:11:30 +06:00
Shannon Deminick
73bd0137e3 Merge with 4.11.5 2013-02-19 03:57:24 +06:00
Sebastiaan Janssen
564d92bed7 Possible fix for TeamCity 2013-02-15 12:05:25 -01:00
Stephan
eaa36a248c datalayer - remove mess introduced in f312bd7ee03b 2013-02-05 14:36:56 -01:00
Shannon Deminick
3608242b25 Merge with 4.11.4 2013-02-01 06:22:28 +06:00
Shannon Deminick
a5bea7fc59 Added the ability to automate any c# scripts for an upgrade process. I realize this is superceded already in 6.0 
but we need a way to do this in 4.x too especially for this release since we need to run a script to fix some db
issues. I've added a framework using an UpgradeScriptManager and another install step + unit tests for some of the
UpgradeScriptManager methods.
 2013-01-31 04:26:37 +06:00
Shannon Deminick
6b3de00e08 Merge with 6.0.1 2013-02-01 06:52:27 +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
Stephan
d24e4834aa datalayer - bugfix SqlCE dababase clear & initialize 2013-01-23 09:41:00 -01:00
Sebastiaan Janssen
1304a9d791 Fixed U4-1495 Include Umbraco assemblies' XML files to make use of comments 2013-01-18 08:44:39 -01:00
Sebastiaan Janssen
d922b0dc90 Fixes U4-1463 Unable to create an ISqlHelper from another connectionstring since 2013-01-14 15:06:23 -01:00
Sebastiaan Janssen
8a5e61bb26 Check if the _dataHelperTypeName is null 2013-01-09 10:43:12 -01:00
Sebastiaan Janssen
1b5970b446 D'oh! Forgot to seperate out the connectionstring 2013-01-09 05:08:05 -01:00
Sebastiaan Janssen
a24d202efe Make sure MySql gets loaded with old AND new connectionstring 2013-01-08 16:46:56 -01:00
Sebastiaan Janssen
212fd47237 U4-1376 Better formatting of the CE connectionstring and fixing the installer 2013-01-02 07:08:02 -01:00
Sebastiaan Janssen
173d5552c0 U4-1376 Remove internal dependencies on GlobalSettings.DbDsn 2012-12-31 13:57:29 -01:00
Sebastiaan Janssen
2cc8ac74d6 Fix SQL regressions (I expected them) 2012-11-29 17:07:38 -01:00
Sebastiaan Janssen
c3f9a2ae12 Reimplement the changed DB schema and adjust the code to work with it 2012-11-29 15:38:04 -01:00
leekelleher
4796cdd803 MySQL: Corrected a typo in the "DropDow" data-type definition. 2012-11-26 22:04:44 +00: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
Morten Christensen
78b05eb44c Correcting SolutionInfo and AssemblyInfo, so assembly version is correct for all shipped assemblies 2012-11-26 07:46:29 -01:00
Morten Christensen
99820bf5e1 Merge with 4.11.0 2012-11-23 07:53:22 -01:00
Sebastiaan Janssen
0a6e91a2f9 Fixed U4-1235 Changing document type alias YSOD's on SQL CE 2012-11-22 15:04:27 -01:00