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

655 Commits

Author SHA1 Message Date
Shannon
7e1b20e600 Merge branch 'umbUKFest-U4-5231' of https://github.com/AnthonyCogworks/Umbraco-CMS into 7.3.0 
Conflicts:
	src/Umbraco.Core/Services/ServiceContext.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/MockTests.cs
 2015-01-07 16:13:47 +11:00
Shannon
f6cd597841 Fixes up some things from PR 610 and fixes up quoted values when using the Insert.IntoTable migration. 2015-01-06 13:44:42 +11:00
Shannon
fa48af02a1 Merge branch 'leekelleher-U4-337' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-06 12:24:29 +11:00
Shannon
8509aef99a Merge branch 'U4-337' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-337 2015-01-06 12:23:31 +11:00
leekelleher
eace046342 Moved the SQL insert (to create the new relation type) to a separate DB migration for v7.3.0. 
(This may need to be reviewed by Core team?)
 2015-01-03 22:20:19 +00:00
Shannon
8c619e92d9 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2014-12-29 14:30:01 +11:00
Shannon
5b9a98ad6a Simplifies the ILocalizedTextService to not have an extension method for null tokens, adds another extension method to accept an array of tokens, adds null checks. 2014-12-18 12:45:04 +11:00
Shannon
da25970f79 wip - working on U4-5966 2014-12-17 15:19:03 +11:00
Shannon
d4fd58e038 Completes: U4-5846 Remove cmsTemplate.master column and transfer those values over to umbracoNode.parentId, U4-5847 Ensure the path is set correctly for templates in the db, almost done the other template service tasks too. 2014-12-05 17:29:47 +11:00
Shannon
c656bb632e WIP more template repo work and more unit tests 2014-12-01 16:22:18 +11:00
Shannon
520955a8db WIP - ported over viewhelper and MasterpageHelper to the Core lib, still wrapping new file service from old template class. 2014-12-01 12:59:36 +11:00
Shannon
2b25815eee Merge branch '7.2.0' into 7.3.0 
Conflicts:
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-12-01 12:22:19 +11:00
Sebastiaan Janssen
d8909fe09c Also adds migration for U4-5837 2014-11-27 14:11:18 +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
Anthony Dang
7f78aef05f Issue U4-5231 - Created an interface based on the LogHelper, and created a service, exposed through Application.Services. 2014-11-20 16:11:04 +00:00
Shannon
df3d427c0b WIP - Updates templates service and repo with some extra methods, creates new template tree, updates template model with some more properties, still need to finish the template tree, it's missing some menu actions. 2014-11-20 19:51:42 +11:00
Shannon
55190b7318 Fixes: U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:59:15 +11: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
Shannon
86e82c7674 Updates PartialView & PartialViewMacros models/services/repositories, streamlines their operations, fixes up other underlying problems with the FileRepository, fixes tree syncing for partial views, partial view macros and scripts, fixes scripts being created in folders, allows partial views and partial view macros to be managed and created in folders, fixes FileUnitOfWork to use a queue, publicizes some internal test classes, fixes tree syncing when dealing with invariant case, adds correct validation to the create dialogs of scripts and partial views (and partial view macros) 2014-10-22 16:44:45 +10: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
582357557f Had to remove the duplicate index updates, otherwise it will try to do it twice (U4-4133) 2014-10-16 13:33:38 +10:00
Shannon
7b99efb061 Working on: U4-4133 Database key changes are not fixed in the Umbraco 7 installer! 2014-10-16 11:24:29 +10:00
Morten Christensen
e6820ad52a Fixes U4-5077 Umbraco 7.2 Alpha - doc types with compositions get moved in doc type tree 
Return 0 if parent is the root
 2014-10-07 13:59:22 +02:00
Shannon
55a7f7c23b Updates GetProfile ext method to accept an IUserService so they can be mocked, this is now used by the entity serializer. Fixed examine unit tests that required this. Fixed: U4-5508 Remove cmsDocument.alias column from db, update the order in which tables are created since with the new foreign key, that order was incorrect. 2014-09-30 18:46:02 +10:00
Shannon
54b11ea871 Fixes: U4-5503 cmsContent.contentType requires a foreign key 2014-09-30 17:05:18 +10:00
Shannon
ad1075a1ce Fixes: U4-2120 cmsDataTypePreValues 'value' column should be nvarchar(MAX) or ntext instead of nvarchar(2500) 2014-09-30 15:34:49 +10:00
Shannon
6f7ec84f18 Backports fixes to SQL parameterization and PetaPoco mem updates 2014-09-29 16:46:37 +02:00
Shannon
00f86ffef7 More work on sql parameterization with sql expressions, lots of tests passing but a few fixes still required. Streamlines IQuery to actually have the correct method implementations so we're not casting everywhere. 2014-09-24 13:51:16 +10:00
Shannon
5bf9bf5175 Gets all content, media, members to get paged queries consistently, fixed up issues with the page sql created for SQL server, need to test mysql. Removes the non-needed readonly dtos for members, since we are retrieving property values consistenty between all repositories. 2014-09-18 00:51:30 +10:00
Shannon
1844b048be Adds new method to IContentTypeService to return all user defined property type aliases, updates the default pre-values for the list view to underscore system aliases, 2014-09-12 11:35:20 +10:00
Shannon
e3bf5d3487 Renames ContentAndMediaTypeBaseController, adds migration to add new db column for list view config 2014-09-10 15:47:01 +10:00
Shannon
5bc00e3e48 Fixes: U4-4989 Media with image cropper doesn’t get removed from disk after delete. 2014-09-10 15:07:20 +10:00
Stephan
185e5d9b7f Create missing ITemplate TemplateMapper 2014-09-08 08:52:09 +02:00
Shannon
202f582661 Renames TagsRepository to TagRepository, Fixes n+1 queries on entity repository, fixes n+1 queries on tag repository, updates umbraco member types to specify an entity type for IMember and IMemberType so the entity repository can use it. 2014-09-01 18:06:24 +10:00
Morten Christensen
7d52ed873e Merge pull request #449 from nul800sebastiaan/uaas-events 
Adding events for use by Courier/UaaS
 2014-08-20 14:12:38 +02:00
Sebastiaan Janssen
873eac7f24 Updating json.net dependency to 6.0.4 2014-08-20 10:44:05 +02:00
Sebastiaan Janssen
65a2b79189 Moves PartialView save/delete to the FileService 2014-08-18 17:47:55 +02:00
Stephan
0a321e37fc Merge branch '7.1.5' into 7.1-4931 2014-08-05 18:15:51 +02:00
Stephan
4814fb3e96 U4-5276 - get package installer to respect binding redirects 2014-08-05 18:07:50 +02:00
Stephan
53ea491bd6 U4-5286 - add property converter for color picker 2014-07-29 09:52:00 +02:00
Stephan
5165d70fbb Merge branch '7.1.5' into 7.1-4931 2014-07-25 11:05:31 +02:00
Shannon
84fad1300b All nuget refs are now up to date and installed correctly with copy local set correctly for all non gac 4.5 assemblies as well as the specific version attribute. 2014-07-23 12:19:40 -07: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
b207521f4b Merge remote-tracking branch 'origin/6.2.2' into 7.1.5 
Conflicts:
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
 2014-07-22 16:15:02 -07:00
Shannon
a2aaa9a1ea updates proj references to have SpecificVersion set to false 2014-07-22 16:14:13 -07:00
Shannon
217f591db0 updates proj references to have SpecificVersion set to false for libs 2014-07-22 16:13:26 -07:00
Stephan
cc6099c953 U4-4931 - fixing & refactoring 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/CacheHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Cache/HttpRequestCacheProviderTests.cs
 2014-07-10 10:39:28 +02:00
Stephan
fcd7e9517d U4-4931 - fixing & refactoring 
Conflicts:
	src/Umbraco.Core/Cache/DictionaryCacheProviderBase.cs
	src/Umbraco.Core/Cache/DictionaryCacheWrapper.cs
	src/Umbraco.Core/Cache/DictionaryItemWrapper.cs
	src/Umbraco.Core/Cache/HttpRequestCacheProvider.cs
	src/Umbraco.Core/Cache/ObjectCacheRuntimeCacheProvider.cs
 2014-07-10 10:37:15 +02:00