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

57 Commits

Author SHA1 Message Date
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
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
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
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
6319b10881 Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/SQLCE4Umbraco/SqlCE4Umbraco.csproj
	src/SQLCE4Umbraco/app.config
	src/Umbraco.Core/app.config
	src/Umbraco.Tests/App.config
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/app.config
	src/umbraco.MacroEngines/App.Config
	src/umbraco.businesslogic/app.config
	src/umbraco.datalayer/app.config
	src/umbraco.editorControls/app.config
 2014-07-23 10:08:01 -07:00
Shannon
c24775adb0 re-installs mvc, webapi and ensures running the latest 2.0.x versions of webpages and razor, now all proj's are consistent with correct versions referenced and copy local set correctly. 2014-07-23 10:03:26 -07: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
1e99c466ee Updates some tests and fixes a couple things 2014-03-04 16:40:23 +11:00
Shannon
f9304d7f04 Gets lots of the new installer logic working 2014-02-26 16:01:31 +01:00
Shannon
d39cea7edd Fixes merge issues with new member stuff regarding the column controlId -> propertyEditorAlias change. Removed the old sqlce sql scripts ( 
U4-2802  Obsolete unused/obsolete legacy umbraco.datalayer SQL utilities and installers)
 2013-09-11 13:19:35 +10: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 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
33c5c41a31 Added better support for clearing the db schema for test. Added more support for different db behaviors for tests, now to update 
the behaviors where necessary as this will speed things up quite a lot.
 2013-03-14 02:43:17 +04:00
Shannon Deminick
8d3c798c6c Changed tests to clear out the current database instead of trying to delete/re-create it. Fixes up 
other test inconsistencies and more error checking on the ApplicationContext.Dispose.
 2013-03-14 01:07:54 +04: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
Stephan
e333ad2b23 Tests.Routing - fix tests 2013-02-20 14:38:28 -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
173d5552c0 U4-1376 Remove internal dependencies on GlobalSettings.DbDsn 2012-12-31 13:57:29 -01:00
Shannon Deminick
b73efd16dc Fixes ServiceContext to ensure the repo's are lazy instantiated because their ctor's rely on the 
RepositoryResolver.Current being initialized which normally doesn't occur until after the ServiceContext
is constructed. Adds instance level caching for the GetRecursiveValue method in case this is called more than
one time for a property in one view. Reverts PetaPocoUnitOfWork to allow more than one call to Commit().. this
isn't 'best practices' per se but it is more for performance reasons because otherwise we'd have to create a new
repo object + uow for any bulk saving operations... The end result is the same, bulk operations in the Services
cannot be processed in one transaction. Fixing up the ContentServiceTests by ensuring that the shared and always open sqlce
connection with the legacy SqlCeContextGuardian is closed on TearDown.
 2012-12-15 10:33:29 +05: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
Sebastiaan Janssen
9d5b1e178a Move all the lib files to NuGet/MyGet and remove legacy folders 2012-11-26 17:11:13 -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
AnthonyCogworks@Anthony-PC
7af10e3b67 Issue : http://issues.umbraco.org/issue/U4-858 
Fixed media thumbnails for SQL CE
 2012-10-25 14:00:33 -01:00
Sebastiaan Janssen
258d19df22 Remove Container DocTypes for now 2012-10-23 10:40:22 -02:00
Sebastiaan Janssen
c2f420be7a Fix issue where installer would not create properties on the media types because 
it was trying to put information in the tabId column that's no longer there
 2012-10-21 11:07:48 -02:00
Shannon Deminick
a1da12f033 Fixed SQL and CE installer to have the proper version spec queries... only by pure fluke did it ever work for 4.8! Argh! 
Modified the CE one so that it is consistent with the Sql one, we should be relying on the same scripts here (or at least the same logic)
the one for CE will not work because even if the db is not installed it would have still returned 0 which would pass and the installer would have
thought it was installed.
 2012-10-13 07:05:11 +05:00
Shannon Deminick
ea406d2d7c Fixed SqlServer and CE installers to flag their latest available install version as 4.9, looks like MySQL hasn't been done yet 
so have left it's installer flagged as 4.8 (just means that the intall will just hang... not sure why we have this flag anyways??
shouldn't we always support the latest version for all dbs??)
 2012-10-13 06:43:24 +05:00
Sebastiaan Janssen
f01a195369 Updated total.sql for SQL CE - Installs with CE from scratch work again 
Upgrade detection from 4.9 > 4.10 added
UNTESTED: Upgrades from 4.9 > 4.10 should perform the database upgrade now
 2012-10-12 10:13:50 -02:00
Shannon Deminick
56c93891a8 Fixes the ClearDatabase call in SqlCEHelper... pretty flukey that unit tests were even working with this bug for so long. 
Fixes the RenderRouteHandlerTests.
 2012-10-02 02:33:19 +05:00
tg@umbraco.com
25721afcf4 Also makes sure tinyMCE embed plugin is enabled by default on SQLCE 2012-09-04 10:34:35 -02:00
leekelleher
bf5c3bf5ae Fixes U4-688 - 4.8.1 can't upgrade using SQLCE 
(Also preparation for resolving U4-677 - SQLCE Medium Trust)
 2012-08-24 13:56:39 -01:00
Matt@MBP13-PC
7a93c108fb Merge with 4.8.1 (2nd) 2012-08-06 07:20:46 -01:00
Matt@MBP13-PC
29ec45d9e2 Updated version check code to use direct SQL statements for more flexibility. In doing so, also fixed work item 30972. 2012-08-03 08:40:00 -01:00
Matt@MBP13-PC
c5adb6a2e1 Updated field value check to surround value with quotes 2012-08-02 14:58:39 -01:00
Matt@MBP13-PC
2a55868846 Changed the DB Installer scripts to check a different constraint (the one that causes the main problems) 2012-08-02 14:38:48 -01:00
Matt@MBP13-PC
f6beeab813 Added fixed SQL CE Upgrade script 2012-08-02 13:55:45 -01:00
Matt@MBP13-PC
3fe9a63957 Added fix to database installers to make sure they run the upgrade scripts. 2012-08-02 09:51:06 -01:00
shannon@ShandemVaio
25bd7b8ad7 Merge with 4.8.0 2012-07-19 01:02:16 +06:00
shannon@ShandemVaio
ddbde6e15f Got ApplicationTests working with new unit test project. 
Had to fix the ApplicationTree and Application classes to lazily call the Cache method
(which is no renamed to EnsureCache) so that we could set the config location in the unit tests.
This should also improve performance a teeny bit and allow for better error handling if required.
 2012-07-17 03:14:22 +06:00
shannon@ShandemVaio
bd2017c9a1 Fixes assembly info for SqlCE4Umbraco 2012-07-17 01:38:56 +06:00
shannon@ShandemVaio
21203b8070 Renamed umbraco.Test to Umbraco.LegacyTests 
Updated InternalsVisibleTo declarations.
Updated the ApplicationTest test to use a new base class as a test to install a local sqlce database
for testing against.
Added Umbraco.Core project.
Added Umbraco.Web project.
Created new sln folder Legacy
 2012-07-17 01:32:46 +06:00
shannon@ShandemVaio
85aafbdb85 Updated sln to reference sqlce by default so its alwasy shipped with it and always works 
locally when debugging. Updated build script to not have to manually build the umbracosqlce project
since its now referenced.
Updated ignore file.
Removed Umbraco.sdf as being referenced in the repository.
Fixed SqlCEInstaller to automatically create the sqlce database if it doesn't exist, we now don't ship the empty database
and this is much nicer for working in the core.
 2012-07-17 00:52:08 +06:00