yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
33,032 Commits 4 Branches 7 Tags
64ba5b6879eb73cf41c4e0a789a4ffcba8a19248
Commit Graph

33032 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Poornima Nayar
a43fbaee82 Merge pull request #7325 from kjac/v8/fix/treepicker-conditionally-load-languages 
V8: Don't load languages in treepicker unless they're needed
 2020-02-26 16:08:31 +00:00
Kenn Jacobsen
384746cd26 V8: Use current client culture when searching content pickers (#7123) 
* Use current client culture when searching content pickers

* Use string interpolation
 2020-02-26 15:16:26 +00:00
Matthew-Wise
4dc5b02b89 Changed showPage to Save and publish updated button style to link (#7649) 
* Changed showPage to Save and publish updated button style to link

* Change language key from showPage to saveAndPreview
 2020-02-26 13:44:57 +00:00
Bjarke Berg
ba97598044 - Moved dashboards to Core 
- Introduced IUserAgentProvider, instead of using HttpContext directly
- Introduced IUmbracoApplicationLifetime, instead of using UmbracoApplication directly
- Introduced IMachineKeyConfig instead of using WebConfigurationManager directly
- Move information about dbProvider to the SqlSyntax
- Moved install steps
 2020-02-26 13:52:06 +01:00
Bjarke Berg
c7a45eff1d Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-26 10:39:11 +01:00
Bjarke Berg
8d76499969 Separated TreeNode stuff from the commonMapper to allow move of more mappers 2020-02-26 10:33:05 +01:00
Bjarke Berg
57aa93959a Merge pull request #7717 from umbraco/netcore/feature/migrate-more-property-editors 
Netcore: Move property editors to Infrastructure
 2020-02-26 07:49:36 +01:00
Anders Bjerner
7d0733f40d Making DataEditor.GetValueEditor method virtual 2020-02-26 07:42:59 +01:00
Bjarke Berg
35eb67dd10 Merge pull request #7712 from umbraco/netcore/feature/AB5168-migrate-macros 
Netcore: Move macros to Abstractions and Infrastructure
 2020-02-26 07:39:06 +01:00
Shannon
3553bb2aa3 Fixes CollectionBuilder's to ensure that each item in the collection is registered in DI with the same lifetime as the collection itself 2020-02-26 12:12:15 +11:00
Poornima Nayar
e36df809c0 Merge pull request #7140 from kjac/v8/fix/media-picker-logout-login 
V8: Make sure the media picker can survive a logout and subsequent login
 2020-02-25 22:26:18 +00:00
Sebastiaan Janssen
b42883280b Merge branch 'v8/dev' into v8/contrib 2020-02-25 22:36:33 +01:00
Sebastiaan Janssen
67168068f6 Merge branch 'v8/contrib' into pr/7449 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
 2020-02-25 22:12:37 +01:00
Tom Pipe
f7594b36db Ensure macromodel implements IContentModel, fixing #7504 2020-02-25 22:08:03 +01:00
Kenn Jacobsen
7d0c5508da Rollback breaks for non-string property values 2020-02-25 21:54:34 +01:00
Kenn Jacobsen
50ab5ce79b Open rollback in a medium sized panel 2020-02-25 21:53:41 +01:00
Kenn Jacobsen
044dc4eb98 Only show culture for content links if there is more than one culture 2020-02-25 21:51:31 +01:00
Kenn Jacobsen
ea29eb993c Align "Field is mandatory" label with the actual toggle 2020-02-25 21:50:30 +01:00
Kenn Jacobsen
e4edd47a48 Ensure that empty asset URLs in plugin manifests do not break the application 2020-02-25 21:48:58 +01:00
Kenn Jacobsen
5e155a871c Fix the create dialog on empty installs 2020-02-25 21:42:37 +01:00
Kenn Jacobsen
f4cd1c2f0c Fix JS errors for Nested Content in single mode 2020-02-25 21:28:40 +01:00
Bjarke Berg
5e1ac76e5f Bugfix: Sometimes the httpcontext is null here 2020-02-25 21:11:17 +01:00
elitsa
42db16b430 Moving the last few Property Editors to Infrastructure proj 2020-02-25 16:06:14 +01:00
Elitsa Marinovska
e0b9219528 Update MacroContent.cs to use is operator for comparison to null 
Co-Authored-By: Bjarke Berg <mail@bergmania.dk>
 2020-02-25 14:27:58 +01:00
Warren Buckley
aa8e2b0859 Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
(cherry picked from commit 4acddb288a)
 2020-02-25 13:08:22 +00:00
Warren Buckley
4acddb288a Merge pull request #7696 from kjac/v8/fix/login-culture-unset-2 
V8: Make sure mculture is set after logout and login
 2020-02-25 13:07:34 +00:00
elitsa
02fbf0f9e7 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/AB5168-migrate-macros 2020-02-25 13:44:48 +01:00
elitsa
0bdf03bda2 Removing the last references to MacroTypes and removing the references to pageElements coming from old legacy (PublishedContentHashtableConverter), which is deleted as well 2020-02-25 13:43:08 +01:00
elitsa
65e719cfa6 Migrating more Macro files to Abstractions or Infrastructure 2020-02-25 13:40:22 +01:00
elitsa
0a130d6bbd Removing MacroType enum as we only have one type - PartialView. Refactoring all its references and fixing tests 2020-02-25 13:38:36 +01:00
elitsa
c3d3e6e27d As GetAsText() had no other purpose when WebForm Controls were removed, it is now replaced with the populated Text property 2020-02-25 13:33:22 +01:00
elitsa
10563577d9 Eliminating WebForms Controls from MacroContent and migrating the file from Web to Abstractions/Core project 2020-02-25 13:29:03 +01:00
Bjarke Berg
85df997486 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-25 12:00:40 +01:00
Bjarke Berg
bf4023afa7 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Infrastructure/PropertyEditors/DataValueReferenceFactoryCollection.cs
#	src/Umbraco.Web/Models/Mapping/ContentMapDefinition.cs
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MarkdownEditorValueConverter.cs
 2020-02-25 11:57:11 +01:00
Bjarke Berg
814e74b5c5 removed reference to non existing project 2020-02-25 10:58:53 +01:00
Bjarke Berg
d140723b22 Cleanup legacy stuff in Umbraco.Web.csproj 2020-02-25 10:56:33 +01:00
Warren Buckley
a65bf08f1a Merge pull request #7630 from kjac/v8/fix/nested-content-single-mode-add-more-than-one 
V8: Nested Content can't add multiple items
 2020-02-25 09:43:56 +00:00
Bjarke Berg
95a27b82a2 Fix for jobject casting issue 2020-02-25 10:40:39 +01:00
Bjarke Berg
f5a1981ea5 Moved dashboards 2020-02-25 10:18:31 +01:00
Bjarke Berg
4aac898e08 Worked on AspNetCoreHostingEnvironment.cs 2020-02-25 10:18:07 +01:00
Bjarke Berg
8f5ffb8da6 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 2020-02-25 09:03:52 +01:00
Bjarke Berg
9a8ecea8a6 Updated copyright year 2020-02-25 08:56:58 +01:00
Bjarke Berg
04caec842a Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/executable-backoffice 
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
 2020-02-25 08:38:15 +01:00
Bjarke Berg
06af62d87d Merge pull request #7691 from umbraco/netcore/feature/move-mappings-after-httpcontext 
NetCore: Move more files
 2020-02-25 08:26:39 +01:00
Bjarke Berg
6bb920b457 Added comments, and replaced a static helper with extension methods 2020-02-25 07:57:59 +01:00
Kenn Jacobsen
69b3bc6fc7 V8: Remove create option in listviews for deleted content (#7655) 2020-02-24 18:46:36 +00:00
Kenn Jacobsen
23f8c3e474 V8: Correct cursor for list view search icon (#7656) 2020-02-24 18:28:11 +00:00
Shannon Deminick
92da83194a Missing null check which will cause a YSOD if empty value (#7661) 2020-02-24 18:27:26 +00:00
Warren Buckley
4275401c4b Merge pull request #7654 from kjac/v8/fix/recycle-bin-without-mculture 
V8: Ensure that the recycle bin doesn't delete content at root
 2020-02-24 15:50:13 +00:00
Bjarke Berg
14eb630cc3 Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/move-mappings-after-httpcontext 
# Conflicts:
#	src/Umbraco.Examine/Umbraco.Examine.csproj
 2020-02-24 16:19:14 +01:00