Commit Graph

17154 Commits

Author SHA1 Message Date
Stephan
35aac2cdec Merge origin/dev-v7 into dev-v7.6 2016-11-18 09:52:45 +01:00
Shannon Deminick
78a2a4a55b Merge pull request #1624 from umbraco/temp-u4-9195
U4-9195 - fix PetaPoco page of int
2016-11-17 17:06:02 +01:00
Sebastiaan Janssen
0a883ae109 Make sure Umbraco runs in Visual Studio 2017 2016-11-16 18:55:12 +01:00
Stephan
568a4987e3 U4-9195 - fix PetaPoco page of int 2016-11-16 17:51:00 +01:00
Warren Buckley
02bfe3ad72 Merge pull request #1603 from rjabreu/U4-9036
added finish button so page only reloads after user input. also added…
2016-11-16 16:14:53 +00:00
Stephan
27eaa8d4af Inject filesystems into partial repositories 2016-11-16 15:19:15 +01:00
Shannon Deminick
3eba4f462f Merge pull request #1619 from umbraco/temp-u4-6994
U4-6994 - N+1 queries
2016-11-16 13:46:22 +01:00
Shannon Deminick
55f3d72cc8 Merge pull request #1543 from umbraco/temp-u4-9108
U4-9018 - provide a way to disable server master election
2016-11-16 13:10:16 +01:00
Shannon Deminick
e0eb8473ee Merge pull request #1454 from umbraco/dev-v7-deploy
U4-8909 - Merge dev-v7-deploy into dev-v7
2016-11-16 13:06:41 +01:00
Sebastiaan Janssen
2fa2cc1574 Merge pull request #1622 from umbraco/temp-U4-9188
U4-9188 Remove unnecessary duplicate index IX_cmsPropertyData
2016-11-16 10:18:21 +01:00
Stephan
7ea156d422 IEventMessagesFactory without HttpContext 2016-11-16 09:57:24 +01:00
Shannon
95f5773046 U4-9188 Remove unnecessary duplicate index IX_cmsPropertyData 2016-11-16 08:23:53 +01:00
Stephan
28fe2f7d22 Merge remote-tracking branch 'origin/dev-v7' into dev-v7-deploy 2016-11-15 18:43:14 +01:00
Stephan
289d7a01d8 Fix BulkInsert, was rolling back 2016-11-15 18:41:03 +01:00
Sebastiaan Janssen
47dbb648fb Merge pull request #1614 from umbraco/temp-u4-9077
U4-9077 - relation type repository cache
2016-11-15 18:30:01 +01:00
Stephan
0478f01113 Fix merge 2016-11-15 14:08:30 +01:00
Stephan
ddf29c5875 Merge dev-v7.6 into dev-v7-deploy 2016-11-15 13:59:19 +01:00
Stephan
ad82270dcc Merge branch origin/dev-v7 into dev-v7.6 2016-11-15 13:48:01 +01:00
Stephan
6c8a033a56 Fix build.bat 2016-11-15 13:46:49 +01:00
Stephan
e499f2d148 U4-9108 - add missing change 2016-11-15 13:44:44 +01:00
Stephan
62325f0a27 Merge branch origin/dev-v7 into temp-u4-9108 2016-11-15 13:34:13 +01:00
Shannon Deminick
ff499bff04 Merge pull request #1607 from umbraco/temp-u4-backport
U4-8909 backport from 7.6
2016-11-15 13:11:05 +01:00
Sebastiaan Janssen
26a04ca7e9 Merge pull request #1610 from umbraco/temp-U4-9134
U4-9134 XSS security issue in the grid
2016-11-15 12:56:21 +01:00
Claus
6f39439e3d removing string.empty checks for attributes.
removing the redundant clean for outputting model.value in TextString.cshtml.
2016-11-15 12:10:36 +01:00
Claus
34d4b284fe Merge pull request #1613 from umbraco/temp-U4-7833
U4-7833 Changing doc type results in invalid cache, lucene indexes, e…
2016-11-15 11:14:56 +01:00
Stephan
9d2fb0dd03 Fix after merges 2016-11-14 19:01:44 +01:00
Stephan
a5695b71eb Merge pull request #1553 from umbraco/temp-U4-9105
U4-9105 SPIKE: Ensure our Lambda expression tree parsers at our service layer are not performance bottlenecks
2016-11-14 18:58:16 +01:00
Stephan
2b9ffdb6b9 Merge branch origin/dev-v7 into dev-v7-deploy 2016-11-14 18:53:53 +01:00
Stephan
539e7c80bf Merge branch origin/dev-v7 into temp-U4-9105 2016-11-14 18:45:56 +01:00
Stephan
cfc1704c64 Fix build after merge 2016-11-14 18:33:16 +01:00
Stephan
bbe1cb1813 Merge branch origin/dev-v7 into temp-u4-6994 2016-11-14 18:31:36 +01:00
Stephan
feb120cbeb Merge branch 'dev-v7' into temp-u4-6994 2016-11-14 18:20:06 +01:00
Stephan
2bc07ad4cc Merge branch 'dev-v7' into temp-U4-9105 2016-11-14 18:13:45 +01:00
Sebastiaan Janssen
1c036b1a11 Merge pull request #1562 from umbraco/temp-u4-9136
Temp u4 9136
2016-11-14 18:04:37 +01:00
Stephan
f5fe07ffb7 U4-6994 - more N+1 and refactoring 2016-11-14 17:52:40 +01:00
Shannon
213f02cbc6 Revert "U4-7833 Changing doc type results in invalid cache, lucene indexes, etc..."
This reverts commit 3deda7efab.
2016-11-14 17:39:46 +01:00
Shannon
2de465e8f3 Ensures that indexes are rebuild for items that have had their content type's or property type's aliases changed, also ensures that the content refresher kicks in if a property type alias has changed (this wasn't previously being done) 2016-11-14 17:39:28 +01:00
Sebastiaan Janssen
5b714572e3 Bump version 2016-11-14 17:04:55 +01:00
Sebastiaan Janssen
8e95acb4c5 Merge pull request #1561 from umbraco/temp-U4-9132
U4-9132 Macros from packages are empty when restored
2016-11-14 17:02:07 +01:00
Sebastiaan Janssen
0439e5782e Merge pull request #1542 from umbraco/temp-u4-9115
U4-9115 - move locks to umbracoLocks table
2016-11-14 16:18:48 +01:00
Sebastiaan Janssen
740abb1426 We don't support C# 6 yet 2016-11-14 16:18:20 +01:00
Stephan
df12f19c53 U4-9115 - fix issue 2016-11-14 16:08:21 +01:00
Sebastiaan Janssen
9c40218f48 Merge pull request #1551 from umbraco/temp-U4-9104
U4-9104 Update the UmbracoExamine logic for Media to read the data di…
2016-11-14 15:41:31 +01:00
Sebastiaan Janssen
714b7019c5 Fix unit tests to have the correct types as well 2016-11-14 15:38:50 +01:00
Sebastiaan Janssen
935d010dd2 The foreach is actually more readable 2016-11-14 15:26:25 +01:00
Sebastiaan Janssen
199c502396 Get the correct types 2016-11-14 15:24:41 +01:00
Claus
f2c406f168 Merge pull request #1572 from umbraco/temp-U4-4196-gkonings-html5-dropzone
U4-4196 U7 - Umbraco HTML5 Drop Zone should honor media types
2016-11-14 09:59:22 +01:00
Claus
2115367353 updating the migration to include only needed ids.
formatting stuff in js.
2016-11-14 09:57:17 +01:00
Claus
9e24b694b3 adding migration to retain functionality as it has always been in root when upgrading. 2016-11-10 13:09:22 +01:00
Claus
4f5bc9eb89 updating MediaController with AutoSelect option. 2016-11-10 12:36:52 +01:00