yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
9,012 Commits 4 Branches 7 Tags
1621d01992686bb232feb9bf8763c797f705e136
Commit Graph

66 Commits

Author SHA1 Message Date
Shannon
662dfb37d3 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/Persistence/Querying/BaseExpressionHelper.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/Services/IMemberService.cs
	src/Umbraco.Core/Services/MemberService.cs
	src/Umbraco.Core/Umbraco.Core.csproj
 2013-12-18 18:11:56 +11:00
Shannon
a21aa079ff Adds ability to use the query builder with string matches based on an NText column 2013-12-18 17:22:00 +11:00
Shannon
2ce952bdbb backports data type service updates and fixes unit tests with correct seeding value. 2013-12-16 17:17:23 +11:00
Stephan
98c8d637f4 Merge remote-tracking branch 'origin/6.2.0' into 7.0.2 
Conflicts:
	src/Umbraco.Core/DatabaseContext.cs
	src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/utills/LegacyClasses.cs
 2013-12-13 13:05:10 +01:00
Stephan
5aec753859 U4-3710, -3732 - Fix default ShortStringHelper 2013-12-13 12:20:57 +01:00
Shannon
5b7e9c712e Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/LiveEditing/Modules/SkinModule/ImageUploader.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Cache/viewCacheItem.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/developer/Macros/assemblyBrowser.aspx.cs
 2013-12-04 13:50:55 +11:00
Shannon
1efa75c891 Fixes potential xss 2013-12-04 12:42:40 +11:00
Shannon
2a05687c8b Merge remote-tracking branch 'origin/6.2.0' into 7.0.1 
Conflicts:
	src/Umbraco.Core/Persistence/Relators/PropertyTypePropertyGroupRelator.cs
	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
	src/Umbraco.Core/PluginManager.cs
	src/Umbraco.Tests/Services/ContentServiceTests.cs
	src/Umbraco.Web.UI/install/Default.aspx.cs
	src/Umbraco.Web.UI/umbraco/LiveEditing/Modules/SkinModule/ModuleInjector.aspx
	src/Umbraco.Web.UI/umbraco/Umbraco.aspx.cs
	src/Umbraco.Web.UI/umbraco/dashboard.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/sort.aspx
	src/Umbraco.Web.UI/umbraco/dialogs/umbracoField.aspx
	src/Umbraco.Web.UI/umbraco/logout.aspx
	src/Umbraco.Web.UI/umbraco/umbraco.aspx
	src/Umbraco.Web/UI/Pages/UmbracoEnsuredPage.cs
	src/Umbraco.Web/Umbraco.Web.csproj
	src/Umbraco.Web/umbraco.presentation/install/LegacyClasses.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/dashboard.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/logout.aspx.cs
	src/Umbraco.Web/umbraco.presentation/umbraco/umbraco.aspx.cs
	src/umbraco.cms/businesslogic/Packager/Installer.cs
	src/umbraco.providers/members/MembersMembershipProvider.cs
 2013-12-03 18:10:00 +11:00
Shannon
a7e32e97e3 Fixes xss issue 2013-12-03 15:40:12 +11:00
Stephan
74df45a056 U3-3314 - refactor 4895b5a 2013-11-05 09:01:11 +01:00
Tim Geyssens
4895b5a2a8 Fixes U4-3314 Doctype property alias doesn't auto generate camelcase but does pascalcase instead 2013-11-04 15:00:13 +01:00
Stephan
9e1364db42 Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 2013-10-03 18:48:42 +02:00
Stephan
4c13dbf8b7 Core.StringExtensions - fix methods that should be extension methods 2013-10-03 18:10:50 +02:00
Stephan
3ee4399fca Merge remote-tracking branch 'origin/6.2.0' into 7.0.0 
Conflicts:
	src/Umbraco.Core/ObjectResolution/Resolution.cs
 2013-10-02 17:40:03 +02:00
Stephan
f64b8d680d Core.StringExtensions - switch over to the new DefaultShortStringHelper 2013-10-02 16:54:56 +02:00
Shannon
1e9a17babe Fixes merge issues, fixes up some unit tests, removes the For<T> config section stuff and simplifies the singleton, refactors it with methods as per discussion with stephen. 2013-09-25 19:23:41 +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
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