yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
6,801 Commits 4 Branches 7 Tags
36d82dc43bc2bfea1f5922419e1168bec0980b8e
Commit Graph

49 Commits

Author SHA1 Message Date
Shannon
e962e86c3c Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Models/Rdbms/MemberReadOnlyDto.cs
	src/Umbraco.Core/Models/Rdbms/PropertyDataReadOnlyDto.cs
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/Interfaces/IMemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Persistence/Repositories/MemberTypeRepository.cs
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/Persistence/Repositories/MemberRepositoryTest.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Web.UI/umbraco/dialogs/ChangeDocType.aspx.cs
	src/Umbraco.Web/Umbraco.Web.csproj
 2013-09-10 11:49:05 +10:00
Stephan
c5197dbe17 U4-2807 - better exception message on bogus domain 2013-09-07 10:25:39 +02: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
5581af2d25 Fixed up the file uploading and the readonly property editors and saving/updating their data/control based on the data changed on the server side. 
U4-2680 Fix file uploading
 2013-08-21 17:54:30 +10:00
Shannon
b2eac9ab8f Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Tests/BusinessLogic/BaseTest.cs
 2013-08-21 11:36:37 +10:00
Shannon
973b466798 Fixes: U4-2627 Ensure that the plugins cache files are named with the machine name 2013-08-16 12:25:38 +10:00
Shannon
d7fd1efd60 Merge remote-tracking branch 'origin/6.1.4' into 7.0.0 
Conflicts:
	src/Umbraco.Core/StringExtensions.cs
	src/Umbraco.Tests/Models/ContentExtensionsTests.cs
	src/Umbraco.Tests/TestHelpers/Entities/MockedContentTypes.cs
	src/Umbraco.Tests/Umbraco.Tests.csproj
	src/Umbraco.Tests/packages.config
 2013-08-13 18:22:45 +10:00
Shannon
aa1c411c8c Fixes U4-2618 PDF indexer does not ensure spaces are added to textual content and fixes med trust compat relating to U4-2180 Problem with Examine MultiIndexSearcher after upgrading from 4.11.3 to 4.11.8 2013-08-13 13:47:57 +10:00
Shannon
b3b2b5b9ee Implemented much more of the new tree api structure. Have converted most of the content tree over to use it. 2013-07-30 13:29:05 +10:00
Shannon
e2fa610358 Lots of work for validation. We have a different type of validation model in Umbraco where we still save content even if some things are invalid (we just don't publish) so we have to take all of this into account. We also have other rules where if it is new content but required fields like 'name' are empty we cannot continue to save. Also started working on dealing with server side validation errors for content fields (not just user defined fields). 2013-07-16 18:23:20 +10:00
Shannon
a6acb4c558 Got tree menu items loading async so the menu is not part of the treenode json. Created docs for using Umbraco resources and how to use promises properly. Created a helper: angularHelper.resourcePromise for use with all of our resources (still need to convert the rest). Got the legacy tree data working with seperate requests for menu items (not too easy!) 2013-07-09 18:51:45 +10:00
Sebastiaan Janssen
c8a19dff44 Merge branch '6.0.7' into 6.1.2 
Conflicts:
	src/Umbraco.Web/Media/ImageUrl.cs
	src/Umbraco.Web/Media/ImageUrlProviders/ImageUrlProvider.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/uQuery/MediaExtensions.cs
 2013-06-19 18:26:45 +02:00
WadeKallhoff
a6768263d3 image thumb extension fix 2013-06-19 18:11:28 +02:00
Sebastiaan Janssen
44f5c3a34f Fixes U4-2019 Create new Document Type dialog displays poorly in Chrome 2013-03-29 09:13:44 -01:00
Shannon Deminick
ee9f91b5cf Merge with 4.11.6 2013-03-15 11:31:34 +06:00
Shannon Deminick
db3f21429e Fixes infinite loop bug with string trimming. 2013-03-15 11:31:11 +06:00
Shannon Deminick
2b750843c5 Fixed up base web test, removes RequiresDbSetup in place of new database behavior - NoDatabasePerFixture. 
Fixed issue with another test... no idea how it didn't show up failing before.
Fixes issue with string extensions and an infinite loop when the string to strip is empty/null.
 2013-03-15 11:28:05 +06:00
Stephan
3ab0879a99 Core.Strings - refactor ToSafeFileName 2013-03-11 14:58:07 -01:00
Sebastiaan Janssen
13b1191aad Additional fixes for U4-1776 SafeAlias culture problem 2013-02-25 13:44:31 -01:00
Sebastiaan Janssen
adaec42982 Merge with 4.11.5 2013-02-25 13:35:39 -01:00
Sebastiaan Janssen
b6d5b7d603 Fixes U4-1776 SafeAlias culture problem 2013-02-25 13:33:51 -01:00
Stephan
f9f998e823 Core.Strings - refactor cms.helper.Casing 2013-02-26 18:12:22 -01:00
Shannon Deminick
6b8bfc2e2d Manually applies fix for U4-1776 SafeAlias culture problem since the files/class structure has changed in 6.1 2013-02-26 01:13:31 +06:00
Stephan
03fc0c868c Core.Strings - fix more unit tests (resolvers init issues) 2013-02-21 16:53:25 -01:00
Stephan
a3f0b7a37f Core.Strings, Web.UI - refactor UI aliases management (1) 2013-02-19 06:26:58 -01:00
Stephan
a0f662c114 Core.Strings - refactor + new IShortStringHelper 2013-02-07 13:30:50 -01:00
Stephan
7a736344f9 Core.Strings - reorg StringExtensions (no change to code) 2013-02-15 08:42:08 -01:00
Shannon Deminick
13e5590efa Obsoleted methods in old Casing class and redirects to use StringExtensions. Removes eroneous webforms files not needed in the Umbraco.Web prject 
(didn't convert the related UI project ones to have code behinds though... one thing at a time and there's a lot of them to do... over time)
 2013-02-06 05:56:49 +06:00
Stephan
212b86d8f6 merge from 4.11.4 2013-01-27 12:59:41 -01:00
Shannon Deminick
1568e5f19c updated comments. 2013-01-23 01:44:01 +03:00
Shannon Deminick
8dff47db78 Merge 2013-01-23 01:39:45 +03:00
Morten Christensen
72ff03f142 Fixes U4-1512 by using the same safe alias method as in the legacy code base. 
This should ensure that published content aliases has the same format as in v4.
 2013-01-22 08:44:06 -01:00
Sebastiaan Janssen
ad62cf0123 Fix merge issue, sorry 2013-01-17 14:53:55 -01:00
pcw@pcw-PC.shout.local
ac5142443a Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit 
http://issues.umbraco.org/issue/U4-1455
 2013-01-15 20:40:28 +00:00
pcw@pcw-PC.shout.local
021cb817d4 Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit 
http://issues.umbraco.org/issue/U4-1455
 2013-01-15 20:17:12 +00:00
pcw@pcw-PC.shout.local
dec5e8ad6c Fixed EncryptWithMachineKey to handle values longer than FormsAuthentication.Encrypt max length limit 
http://issues.umbraco.org/issue/U4-1455
 2013-01-15 20:07:07 +00:00
Shannon Deminick
5458c9a310 Adds Encryption/Decryption string extension methods that work in medium trust, with unit tests. 2013-01-15 01:35:10 +03:00
Morten Christensen
c98d906f36 Correcting a few formatting issues after importing patch. 2012-12-28 19:08:01 -01:00
Morten Christensen
e198f76356 Committing changes from randy.mccluer's pull request 2012-12-28 19:03:15 -01:00
Morten Christensen
1053492a29 Freedom Friday POC of native code first - limited to test project. 
Making a few corrections to the serialization attributes after having tested ContentType Serialization.
Enabling bulk saving of new ContentTypes with Parent/Composition dependencies.
 2012-11-23 19:58:19 -01:00
Morten@Thinkpad-X220
9e37e1674d Adds Media implementation U4-931 
Adding some notes and small change to IContentBase, PropertyValues and the ability to set property values with an anonymous object is shared for Content and Media.
 2012-10-04 12:38:43 -02:00
Shannon Deminick
7175860ae0 Added tests for dynamic node to select children based on the child doc type names including pluralized names and added 
support for checking with case insensitivity. Example. CurrentPage.NewsItems where NewsItem is a child doc type alias.
Found one reason why the old dynamic node has performance issues and have added a note, just need to do more reseearch to
make sure my findings are correct.
Changed over all of the new DynamicNode classes to be DynamicDocument instead.
 2012-08-18 11:03:30 +06:00
Shannon Deminick
9177257952 Fixed/Cleaned up new dynamic node, added more support for member properties such as propertyId and added much better 
support for camel case vs pascal case names. Also added support for returning the strongly typed value for reflected properties.
Also added support for handling "@" prefixed property names when using GetProperty("@Id") or similar.
Added unit tests for all of the above and other dynamic node methods.
 2012-08-17 14:02:29 +06:00
shannon@ShandemVaio
b68bcba85e Updated UmbracoModule to support the TransferRequest just like umbraMVCo does using query strings. Added more 
unit tests for UmbracoModule, refactored the Umbraco.Web.Routing.Domains to not have static methods and created an
interface for it so that we can unit test it. Changed DocumentRequest stuff to internal. Finally got unit test working for the module
 2012-08-07 02:33:08 +06:00
shannon@ShandemVaio
ddc2619511 Merge with 4.9.0 2012-08-01 06:31:28 +06:00
shannon@ShandemVaio
e55e688dc7 Added unit test for ContentStore, added object extensions and supporting classes from v5, 
added RhinoMocks to the test project and httpcontext factory from v5 unit tests to be used
in our v4 ones.
 2012-07-31 00:02:27 +06:00
Matt@MBP13-PC
ef0f8b5282 Created ThumbnailProviders for folder browser to allow custom thumbnail generation based on file ext 2012-07-24 10:06:07 -01:00
sgay
3546b3e954 refactor routing 2012-07-22 14:01:18 -02:00
shannon@ShandemVaio
23b2899101 Imports many of the useful extension methods from v5 that are also used in umbraMVCo to begin the 
MVC integration.
Imported the unit tests associated with each of these imported classes.
 2012-07-17 03:51:34 +06:00