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

1034 Commits

Author SHA1 Message Date
Shannon
f7097d571c U4-10301 Change the PluginManager hash to use more reliable and consistent hashes 2017-08-17 11:38:57 +10:00
Claus
51997d0651 U4-10098 Update FileService to support legacy MacroScript and UserControl folders 2017-07-04 14:28:15 +02:00
Stephan
464711d3c8 U4-10026 - use id-key map for getting by guid 2017-06-16 14:09:20 +02:00
AndyButland
712cd29fea Upload checks to utilise whitelist. Refactored check on white and black list to common extension method. 2017-05-09 23:29:30 +02:00
Shannon
004e00599d Fixing nuget package issues , semver 2 is only for 452+ which we dont have, we shouldnt be using it and it adds more dependencies that we don't need right now 2017-04-30 23:19:45 +10:00
Stephan
ea14170272 minor cleanup 2017-04-30 10:14:48 +02:00
Shannon
1274fbaefd Fixes up the equality members for the event args types to include Gethash code and sequence equal checking, this is done by a base class used by event args that deal with collections. 2017-04-28 18:14:50 +10:00
Shannon
0b61685fc8 Adds ability to supersede events so we don't have an issue of saved event being raised for an entity after it's been deleted. 2017-04-28 13:26:56 +10:00
Shannon
944b3dcaac New method for IPackagingService to fetch a package from the repo, removes usages of the old repo endpoint, removes ability to push a package from the back office to Our since that would require a different endpoint. 2017-04-26 19:02:36 +10:00
Shannon
a6f9d14a1b Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267 2017-04-26 14:18:05 +10:00
Shannon
bfb81f6362 Allows for the umb pckage repo rest api endpoint to be configurable - for testing 2017-04-26 14:04:47 +10:00
Warren Buckley
a9b820de31 Merge branch 'dev-v7.6' into temp-U4-9758 2017-04-25 09:58:20 +01:00
Stephan
1adbe9ddcb deploy-293 - normalize template guids on upgrade to 7.6 2017-04-24 15:52:44 +02:00
mikkelhm
f76fa6bde6 Moves LockTable and LockObject Migrations to 7.6 2017-04-20 23:42:15 +02:00
Shannon
13cfb42287 Resizes LoginName column so that it can be indexed but only if the data in the column doesn't exceed a max size 2017-04-19 20:16:43 +10:00
Shannon
bc8829ce14 U4-8432 Update log4net async appender to use the official log4net one 2017-04-07 12:08:16 +10:00
Sebastiaan Janssen
16582c8207 U4-9745 Update outdated NuGet dependencies 2017-04-06 16:27:41 +02:00
Shannon
ed0f0f7942 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/Configuration/CoreDebug.cs
#	src/Umbraco.Core/Publishing/PublishingStrategy.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-03-23 12:24:16 +11:00
Stephan
3121ea6111 Merge branch 'dev-v7.6' into temp-u4-9462 2017-03-15 13:48:27 +01:00
Stephan
e432b7061d U4-9606 - New DumpOnTimeoutThreadAbort debug option 2017-03-14 19:02:33 +01:00
Shannon
7100a00ef1 fix merges 2017-03-10 12:22:44 +01:00
Shannon
df04100ff6 Merge remote-tracking branch 'refs/remotes/origin/dev-v7' into dev-v7.6 
# Conflicts:
#	build/UmbracoVersion.txt
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/Persistence/Querying/ExpressionVisitorBase.cs
#	src/Umbraco.Core/Persistence/Querying/SqlExpressionExtensions.cs
#	src/Umbraco.Core/Persistence/Repositories/ContentRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/EntityRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MediaRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/MemberRepository.cs
#	src/Umbraco.Core/Persistence/Repositories/VersionableRepositoryBase.cs
#	src/Umbraco.Core/Services/ContentService.cs
#	src/Umbraco.Core/Services/MediaService.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/Persistence/DatabaseContextTests.cs
#	src/Umbraco.Tests/Umbraco.Tests.csproj
#	src/Umbraco.Web.UI.Client/src/less/tree.less
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/Editors/EntityController.cs
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-03-10 10:40:28 +01:00
Stephan
6439e2fdd0 Merge dev-v7.6 into temp-u4-9462 2017-03-09 15:29:26 +01:00
Stephan
d1111009e3 Fix SemVer lib version 2017-03-08 18:45:00 +01:00
Shannon Deminick
1722831bf5 Merge pull request #1640 from umbraco/temp-u4-7318 
Value Converters for All Core Property Editors
 2017-03-08 14:29:40 +01:00
Shannon
5291558b23 Further refactoring, using attributes, moving and removing some classes, using DI where necessary. 2017-03-08 14:27:39 +01:00
Warren Buckley
736b3565d0 Merge pull request #1784 from umbraco/temp-deploy-257 
deploy-257 Downgrade Core and Deploy to framework 4.5
 2017-03-08 12:17:08 +00:00
Claus
7fa8f04b11 deploy-257 Downgrade Core and Deploy to framework 4.5 2017-03-08 11:20:48 +01:00
Stephan
9e55f5835c U4-9605 - debug switch for uncompleted scopes 2017-03-07 12:42:44 +01:00
Shannon
a9c5877e5b Merge branch 'refs/heads/dev-v7.6' into temp-u4-7318 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.config
#	src/Umbraco.Web/Umbraco.Web.csproj
 2017-03-01 15:04:00 +01:00
Shannon
337ba4ef34 U4-9577 Ability to store the xml content file in diff storage locations: Default, Environment Temp or ASP.NET temp location 2017-02-28 23:53:12 +01:00
Shannon
90ba9a1a3a Adds new overload to IMediaService.GetPagedChildren to filter on media type ids which turns out to be much easier than filtering on media type aliases, however i did all of the work to make that happen including unit tests and then it turned out to not be required but we now have the code if necessary, i've left comments about it. I've backported some updates from 7.6 for the SqlIn stuff for the ExpressionVisitor which we still use in the media type id filtering. I updated the JS to query for the folders which all works now. 2017-02-22 17:22:22 +11:00
Stephan
86a3780c61 Cleanup IFileSource for Deploy/IFileSource 2017-02-21 16:01:01 +01:00
Stephan
08c8b84a10 U4-9462 - cleanup units of work, code, fixmes 2017-02-21 13:19:58 +01:00
Stephan
23b3bb37ee Scope - fix issue with EventMessages 2017-02-17 13:10:22 +01:00
Claus
42c23da9f5 removing IPrettyArtifact and moving properties to IArtifact instead. 2017-02-16 12:54:42 +01:00
Claus
cc885c1231 Merge pull request #1750 from umbraco/deploy-219 
deploy-219 - files management
 2017-02-16 09:52:59 +01:00
Shannon
4d1e64b279 U4-9512 Missing index on umbracoUser2NodePermission 2017-02-15 21:51:14 +11:00
Warren Buckley
e619c402b4 Merge branch 'temp-U4-9310' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/UdiEntityType.cs
 2017-02-14 11:53:38 +00:00
Stephan
9b4a6f2761 Merge origin/dev-v7.6 into deploy-219 2017-02-14 11:22:03 +01:00
Stephan
b58d8677b3 Scope - bugfixing 2017-02-14 11:11:39 +01:00
Stephan
c64e3a8908 Scope - refactor event dispatching 2017-02-13 09:05:32 +01:00
Stephan
67fc8b6215 Scope - fix media files deletion 2017-02-11 09:55:32 +01:00
Claus
5226762528 Merge branch 'temp-U4-9351' into dev-v7.6 
Conflicts:
	src/Umbraco.Core/Events/ImportPackageEventArgs.cs
	src/Umbraco.Core/Umbraco.Core.csproj
	src/Umbraco.Web/Editors/PackageInstallController.cs
 2017-02-10 10:08:31 +01:00
Sebastiaan Janssen
3d1a44b32c Merge branch 'temp-U4-8998' into dev-v7.6 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-02-10 08:25:52 +01:00
Shannon
aa0eaf590c adds indexes to relation type 2017-02-10 15:51:41 +11:00
Shannon
2b82520067 U4-8998 umbracoRelation table needs unique index on columns: parentId, childId, relType 2017-02-10 15:38:53 +11:00
Shannon
91157caf0e U4-8835 cmsMember.LoginName needs a DB index 2017-02-10 14:23:46 +11:00
Shannon
e612bcae58 Merge branch 'refs/heads/dev-v7.6' into temp-U4-9310 2017-02-10 10:04:58 +11:00
Shannon
1c0d4001ab U4-9433 Add index to path column on umbracoNode 2017-02-09 17:27:23 +11:00