Commit Graph

186 Commits

Author SHA1 Message Date
Shannon
09b68a75be Simplifies the IContentSection so that there's no nesting of interface classes and updates some unit tests 2013-09-16 15:52:59 +10:00
Shannon
046dcdcaf7 Replaces more calls to legacy UmbracoSettings with the new configuration section, fixes loads of null checks when dealing with package repository APIs 2013-09-16 11:22:11 +10:00
Shannon
f38a6e1561 Makes some massive headway with the real config section, have got all code re-delegated to using it and have migrated the baserest config to the core project, all configs will be shared out of the UmbracoConfiguration singleton, now to get the unit tests all wired up and using mocks for the most part. 2013-09-13 18:11:20 +10:00
Shannon
36d82dc43b Created umbraco config holder object which is exposed on the application context, updated the web.config with the new section and the transform to ensure it get's added. 2013-09-13 14:06:36 +10:00
Shannon
e16e2917c9 Interfaced all the new config elements with unit tests... hooray for fully mockable configs ! 2013-09-13 13:41:07 +10:00
Shannon
5aed53162e Implemented the remaining default values for the new configuration section with tests. 2013-09-12 19:12:21 +10:00
perploug
623a28c158 delete fontawesome 2013-09-02 15:40:14 +02:00
Shannon
5cd04b5c9e Got lots of the default values configured with unit tests, still need to finish the rest though. 2013-09-02 16:36:47 +10:00
Shannon
7806762b80 Implemented a real .Net configuration section for umbracoSettings.config + unit tests for every property. NOTE: This isn't referenced in the codebase yet, going to start setting default values for most of the properties so that we can remove them from the config file for shipping (ship minimal config) then reference these settings in the codebase. 2013-08-31 11:28:19 +10:00
Shannon
d257835cb5 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Models/ContentTests.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/umbraco/create/PartialViewTasks.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-08-28 11:08:23 +10:00
Sebastiaan Janssen
8cd9266ea6 Updated obsolete msg after feedback here: 2b532f72c3 (commitcomment-3899011) 2013-08-23 14:17:40 +02:00
Sebastiaan Janssen
e71fa681e6 Update build to v7 and include belle files 2013-08-20 14:18:02 +02:00
Shannon
c4b44ea0e3 Fixes: U4-2577 Can't save umbraco user - without re-filling in the password
Fixes: U4-541 Wrong dictionary key when using in backend template names
This changes the way that the value that is stored in the auth cookie. Previously we just stored a GUID which was the user's contextid stored in the db, now we store encrypted values of a few necessary user objects. In 6.2 we'll actually set a real .Net user object on the HttpContext. For now, the http module will simply just ensure that the culture is set correctly for the currently logged in user.
2013-08-02 15:16:04 +10:00
Shannon
66c2157bea Merge remote-tracking branch 'origin/6.1.4' into 7.0.0
Conflicts:
	src/Umbraco.Core/UriExtensions.cs
	src/Umbraco.Tests/TestHelpers/BaseDatabaseFactoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web/Editors/MediaController.cs
	src/Umbraco.Web/Install/UmbracoInstallAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/Mvc/UmbracoAuthorizedController.cs
	src/Umbraco.Web/Security/WebSecurity.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/UmbracoContext.cs
	src/Umbraco.Web/UmbracoModule.cs
	src/Umbraco.Web/WebApi/MemberAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoApiController.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizeAttribute.cs
	src/Umbraco.Web/WebApi/UmbracoAuthorizedApiController.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/DataTypes/editDatatype.aspx.cs
2013-07-31 18:52:14 +10:00
Shannon
6f464567bb Implements real FormsAuthentication for back office cookie authentication... finally :) 2013-07-31 17:08:56 +10:00
Sebastiaan Janssen
e41d3c7e84 Increase version to 6.1.4 2013-07-25 11:59:37 +02:00
Shannon
4df80eb976 Merge remote-tracking branch 'origin/6.1.3' into 7.0.0
Conflicts:
	src/Umbraco.Core/Models/PropertyExtensions.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/packages.config
	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
2013-07-23 13:41:42 +10:00
Sebastiaan Janssen
90cfd004cb Merge branch 'wip-u4-1949' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-wip-u4-1949 2013-07-19 15:41:15 +02:00
Shannon
9e419f9bcc Merge remote-tracking branch 'origin/6.1.3' into 7.0.0 2013-07-02 12:58:40 +10:00
Sebastiaan Janssen
ffce1a3e6b Open new branch for 6.1.3 2013-06-28 14:44:56 +02:00
Morten Christensen
4368f15097 Updating nuspec files which is a bit different for 6.1.x then 6.0.x 2013-06-27 15:36:25 +02:00
Shannon
5af8e86e3b updated web.config settings and default settings. 2013-06-24 13:37:25 +10:00
Shannon
ed1aee5047 Implements: #U4-1770 - no more umbracoDebugMode, will use the compilation setting in the web.config 2013-06-21 16:20:18 +10:00
Sebastiaan Janssen
d8a8bf5f74 Bump version number 2013-05-30 10:26:40 -02:00
Sebastiaan Janssen
ae9d77a765 Bump version number 2013-05-29 05:40:55 -02:00
Sebastiaan Janssen
d10eff04a7 Update version 2013-05-10 07:09:43 -02:00
Shannon Deminick
d6d630cb2c Merge with 6.0.4 2013-04-19 04:40:49 +06:00
Shannon Deminick
35a698cdc9 Merge with 4.11.7 2013-04-19 04:40:13 +06:00
Shannon Deminick
f7ddb1ed49 fixed typo 2013-04-19 04:30:15 +06:00
Shannon Deminick
c0fd974cc1 fixes typo on word disallow 2013-04-19 04:20:24 +06:00
Shannon Deminick
c410b6dc20 Changed UmbracoSettings back to internal, it should not be exposed atm 2013-04-16 02:49:14 +06:00
Shannon Deminick
f716ba380c Merge with 6.0.4 2013-04-12 03:02:40 +06:00
Shannon Deminick
01290f8174 Merge with 4.11.7 2013-04-12 02:14:59 +06:00
Shannon Deminick
26a7bf8187 Fixes: #U4-2087 2013-04-12 02:11:01 +06:00
Stephan
84e990c239 Core.Configuration - fix setting that accidentally became public 2013-04-10 14:19:26 -02:00
Sebastiaan Janssen
809badd1cf Update version to 4.11.7 2013-04-10 08:54:31 -02:00
Stephan
e1c810c033 merge with 6.1.0 2013-04-04 14:27:11 -02:00
Morten Christensen
03c65c8eec Updating build version to 6.1.0 beta
Updating nuspec with new references.
2013-04-04 12:13:59 -02:00
Morten Christensen
14aeb55c14 Removing unused ServiceStack.Text reference/nuget package.
Ignore Macro tests for the model and repo as its not used and still internal. Might be an idea to remove it altogether.
2013-04-04 12:02:27 -02:00
Shannon Deminick
b56f8c8fb3 Fixes: #U4-2043 - User Type cache is not invalidated in LB scenarios 2013-04-04 03:43:05 +06:00
Stephan
2490908401 merge with 6.1.0 2013-04-03 08:41:53 -02:00
Shannon Deminick
a7e939e71f Merge with 6.0.4 2013-04-02 22:39:39 +06:00
Shannon Deminick
b9d7f0c5a5 Fixes merge issues, merge ensures that js error is fixed and that thread-safe caching is in place
in the ContentType.cs class.
2013-04-02 22:06:15 +06:00
Shannon Deminick
3d76614a78 Merge with 4.11.7 2013-04-02 21:31:21 +06:00
Sebastiaan Janssen
bea50f4562 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:50:27 -02:00
Sebastiaan Janssen
ff337457f8 Fixes: U4-662 Most icon for document type can't be shown in 4.8.1. 2013-04-01 11:31:03 -02:00
Sebastiaan Janssen
8576d9c67e Bump version to 4.11.6 2013-03-27 08:56:30 -01:00
Stephan
ba24deffc9 Core.Configuration - fix version 2013-03-20 16:01:48 -01:00
Shannon Deminick
780a9632f0 Merge 2013-03-19 23:49:51 +06:00
Stephan
abe4ec6524 Core.Configuration - simplify 2013-03-18 15:49:43 -01:00