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

8414 Commits

Author SHA1 Message Date
Shannon
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +02:00
Shannon
6793167865 fixes brackets 2019-09-26 14:25:06 +02:00
Shannon
7d47432e96 Ensure we don't add duplicate keys 2019-09-25 21:37:22 +02:00
Shannon
f6f8e3cbd5 Merge branch 'temp-5362' of https://github.com/dave0504/Umbraco-CMS into v8/dev 
# Conflicts:
#	src/Umbraco.Core/Services/Implement/ContentService.cs
 2019-09-25 15:54:07 +02:00
elitsa
1aa6c17c7e Merge branch 'v8/dev' into v8/temp-packaging 2019-09-24 12:41:12 +02:00
Kenn Jacobsen
23ee9eae42 Grant the default admin group access to the Translation section 2019-09-19 09:23:48 +02:00
Benjamin Carleski
f4e61ddf23 Add missing FROM clause 2019-09-19 09:10:56 +02:00
Warren Buckley
8b7418164d Merge pull request #6347 from umbraco/v8/bugfix/AB2684-purelive-model-regen 
Lazily recompile PureLive models and lazily create models for nucache
 2019-09-18 10:47:04 +01:00
Shannon
e6805b23e3 Oops! didn't complete the scope, ok now package install works within a trans, fixes nucache changes to not pass around _liveGen since sometimes we want the latest that is not _liveGen 2019-09-18 00:10:02 +10:00
Shannon
ab79cd74b8 Fixes lazy iteration issue on package install 2019-09-17 23:31:32 +10:00
elitsa
f8924df711 Merge branch 'v8/dev' into v8/content-migration 2019-09-17 14:34:54 +02:00
Shannon
e1433ddac9 Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB2684-purelive-model-regen 2019-09-17 13:09:54 +10:00
Shannon
de8d253a7c obsoletes WithSafeLiveFactory 2019-09-16 17:44:50 +10:00
Shannon
2b9ab0a38a Merge branch 'v8/bugfix/background-pure-live-rebuild-AB1833' into v8/bugfix/AB2684-purelive-model-regen 
# Conflicts:
#	src/Umbraco.Web/Cache/ContentTypeCacheRefresher.cs
#	src/Umbraco.Web/Cache/DataTypeCacheRefresher.cs
 2019-09-16 17:38:10 +10:00
Shannon
00c720413a Uses reflection to call ResetModels to flag MB to recompile. 2019-09-16 17:23:00 +10:00
Shannon
47d3af9bb3 removes the test suspendable model factory code 2019-09-16 16:59:57 +10:00
Shannon
bc40216eca Ensure package installation for data is executed within a single scope/trans 2019-09-16 16:31:16 +10:00
Shannon
ebada94a48 temp - removing the SuspendSafeLiveFactory for now 2019-09-16 14:59:12 +10:00
Shannon
fc821000f3 Adds ext methods for creating a flag to indicate model recompilation should occur 2019-09-16 14:50:05 +10:00
Shannon
ba74b7543c wraps package uninstall in a scope, creates temp SuspendSafeLiveFactory method for testing 2019-09-16 11:47:05 +10:00
Michael Pontin
1c9ed847a1 Added double check for the decimal label 2019-09-15 12:29:12 +02:00
Steve Megson
ffcc84b1fb Data type configuration serialization 2019-09-12 08:57:05 +01:00
Steve Megson
b0deb4ceab AddTypedLabels - find standard label properties based on alias rather than ID 2019-09-12 08:45:52 +01:00
Shannon
942c6c75c5 fixes tests 2019-09-11 23:01:11 +10:00
Warren Buckley
e8ccfd52af Merge remote-tracking branch 'origin/v8/dev' into v8/feature/2349AB-RTE-Image-Upload 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tinymce.service.js
 2019-09-10 10:58:24 +01:00
Shannon
0a12f86108 Moves the reserved path detection to RoutableDocumentFilter, adds caching to MVC route detection 2019-09-10 16:09:09 +10:00
Warren Buckley
7d2c92b651 A new temp location for RTE uploads 2019-09-09 15:54:03 +01:00
Niels Lyngsø
02534c4ac5 Merge pull request #5706 from kjac/v8-feature-copy-property 
V8: Copy on property level
 2019-09-09 15:13:10 +02:00
Rasmus John Pedersen
8f32fce781 Update Headless assembly names 2019-09-09 11:53:12 +02:00
Kenn Jacobsen
2cbed6c6b0 Merged with v8/dev 2019-09-09 11:22:39 +02:00
Kenn Jacobsen
604bb6b526 Don't allow selecting non-element types when composing element types 2019-09-05 17:57:40 +02:00
Stephan
280f4e7cbe Fix member properties [#6227] 2019-09-05 16:34:17 +02:00
Poornima Nayar
e0d4168f3f Show a friendly exception message when the media name exceeds 255 characters 2019-09-05 16:26:24 +02:00
Poornima Nayar
7d3655c78c better exception message on content type save 2019-09-05 16:22:07 +02:00
Poornima Nayar
d2efcc822d Better exception message on media type save 2019-09-05 16:21:38 +02:00
Poornima Nayar
79f8dc200a Friendly exception message when datatype with name more than 255 characters is saved 2019-09-05 16:21:21 +02:00
Matt Brailsford
c92eafd8f1 Fixes #6255 
Updated GetCtrs / GetMaps to merge found maps, rather than replacing all for a given type.
 2019-09-05 15:37:26 +02:00
leekelleher
83588b2dc8 ContentTypeService GetAllElementTypes method 
Added an extension method to get all the Element Types from
the ContentTypeService.

Refactored NestedContent's controller accordingly.
 2019-09-05 15:36:14 +02:00
leekelleher
ff72a341b2 Added method to add to a list of ConfigurationFields 2019-09-05 15:35:08 +02:00
Steve Megson
79bea8b440 Update umbracoUser2NodeNotify in SuperZero migration 2019-09-05 14:48:26 +02:00
Sean McLemon
915b24e4e4 When deciding whether to use SSL, ApplicationUrlHelper.GetApplicationUrlFromCurrentRequest() has an expression port == "443" which is always false. The variable port is set to to either "" or ":" + request.ServerVariables["SERVER_PORT"], so it might sometimes be ":443" but it will never be just "443". This code has been this way for at least a year, and I don't know if the situation it tried to handle makes any sense (using port 443 over plain HTTP, for some reason??) so I've just removed it. 2019-08-29 14:26:16 +02:00
Steve Megson
09def9f352 Migration of MarkdownEditor prevalues 2019-08-29 14:12:32 +02:00
Steve Megson
934e2066a0 #6158 - missing media folders after migration 2019-08-29 14:09:19 +02:00
jmayntzhusen
4dad427a64 Improve error messages (#6154) 2019-08-29 14:01:30 +02:00
Steve Megson
9e1424fb24 RefactorMacroColumns 2019-08-29 13:58:43 +02:00
Warren Buckley
b205f19f40 Merge pull request #6130 from stevemegson/v8/temp-6060 
V8: Handle missing grid values in migration from 7.15
 2019-08-27 14:31:52 +00:00
Warren Buckley
727c32843c Merge branch 'v8/8.1' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2019-08-27 11:53:52 +01:00
Kenn Jacobsen
d09be604d9 Allow plugin "Lang" folders to reside in nested directories 2019-08-23 08:56:42 +02:00
Sebastiaan Janssen
4b9ce6bb10 Merge branch 'v7/dev' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Core/DateTimeExtensions.cs
#	src/Umbraco.Web.UI.Client/src/common/directives/components/media/umbmedianodeinfo.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/media/umb-media-node-info.html
#	src/Umbraco.Web.UI.Client/src/views/content/create.html
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/listview/listview.html
#	src/Umbraco.Web/Profiling/WebProfilerProvider.cs
#	src/Umbraco.Web/umbraco.presentation/umbraco/webservices/legacyAjaxCalls.asmx.cs
 2019-08-22 22:05:14 +02:00
Lars-Erik Aabech
5b1f2ef95d V7: Fixes #6132, dates being blanked out on save/publish when user locale (momen… (#6138) 2019-08-21 15:21:31 +02:00