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

39457 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
43ae1fa3e4 Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge_v8_dev_03082021 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Web.nuspec
#	src/SolutionInfo.cs
#	src/Umbraco.Core/ContentEditing/ContentTypesByKeys.cs
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompression.cs
#	src/Umbraco.Core/PropertyEditors/IPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/PropertyEditors/NoopPropertyCacheCompressionOptions.cs
#	src/Umbraco.Core/Services/LocalizedTextServiceExtensions.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/V_8_15_0/AddCmsContentNuByteColumn.cs
#	src/Umbraco.Web.BackOffice/Controllers/ContentController.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/PublishedCache/NuCache/DataSource/DatabaseDataSource.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheComposer.cs
#	src/Umbraco.Web/PublishedCache/NuCache/NuCacheSerializerComponent.cs
#	src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
#	src/Umbraco.Web/Umbraco.Web.csproj
#	src/Umbraco.Web/UrlHelperRenderExtensions.cs
 2021-08-03 09:48:34 +02:00
deMD
c1dcdfa634 Changed ConfigConnectionString to accept more valid connectionstrings (#10766) 
* Added test cases for valid connectionstring configuration and updated code to pass tests

* Removed unneeded reference added by reverted changes

Co-authored-by: Dave de Moel <d.demoel@wearetriple.com>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-08-03 10:04:49 +03:00
Bjarke Berg
7cbe205472 Merge pull request #10742 from umbraco/v9/task/migrate-test-data 
Migrated Umbraco.TestData to .NET 5.
 2021-08-03 06:49:14 +02:00
Julia Gru
b070a36039 reset confirmDiscardChanges on save (#10777) 2021-08-02 15:11:42 +02:00
Zeegaan
1e20724882 Merge pull request #10676 from umbraco/v9/bugfix/image-upload 
V9: Fix drag and drop image upload
 2021-08-02 12:57:15 +02:00
Andy Butland
9957149008 Removed debug reference to test data from Umbraco.Web.UI.NetCore. 2021-08-02 09:31:45 +02:00
Kenn Jacobsen
d40e503c82 V8: Fix JS error when using the hide search function in treepicker (#6931) 
* Fix JS error when using the hide search function in treepicker

* updates with same defensive change from original pr - only explores child.children after confirming the child indeed has children

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-08-02 09:26:30 +10:00
Bjarne Fyrstenborg
d537545fa9 Use umb-icon component in user history 2021-08-02 09:14:15 +10:00
Bjarne Fyrstenborg
050cdd2bb0 Update icon in member group picker (#10094) 
* Use member group icon as default icon

* Make pickers consistent using member group entity icon

* Remove unused functions

* Use vm

* Use original getSelected() function

* Include clear function again

* Fix merge conflict

* Remove comment - remove function is requested from <umb-node-preview> in view

* Remove comment - wasn't used, but intend to use in PR 10096 to use property actions to clear member group picker
 2021-08-02 08:32:54 +10:00
Bjarne Fyrstenborg
d9555ea57c Update noUiSlider to v15.2.0 (#10319) 
* Upgrade to noUiSlider v15.1.1

* Configurate on drag event

* Update nouislider dependencies

* Update description

* Upgrade to latest noUISlider v15.2.0
 2021-08-02 08:31:41 +10:00
Bjarne Fyrstenborg
56790f72b0 Replace angular.forEach with Utilities.forEach (#10759) 
* Replace angular.forEach with Utilities.forEach

* Use localizeMany to localize translations in a single request

* Replace angular.forEach

* Replace angular.forEach in mocks
 2021-08-02 08:18:30 +10:00
Robert Ghafoor
168abbf2f7 10758 Caption will now be correctly set when passing in a target to the media picker. 2021-07-30 12:45:39 +01:00
Sebastiaan Janssen
3b227b9c67 Merge branch 'v8/dev' into v8/contrib 2021-07-29 14:10:26 +02:00
Sebastiaan Janssen
05973ecae8 Merge branch 'v8/8.15' into v8/dev 2021-07-29 14:10:09 +02:00
Sebastiaan Janssen
7c336554db Fix: Issue when upgraded from 8.14 to 8.15 when inviting user into the backoffice. #10746 (#10767) 
* Remove unusable method

* Fixes #10746 by removing the recursive call ending in an infinite loop

Also: the culture is already known, don't take the `CurrentUICulture`
(cherry picked from commit cb06442de4)
 2021-07-29 14:06:29 +02:00
Sebastiaan Janssen
cb06442de4 Fix: Issue when upgraded from 8.14 to 8.15 when inviting user into the backoffice. #10746 (#10767) 
* Remove unusable method

* Fixes #10746 by removing the recursive call ending in an infinite loop

Also: the culture is already known, don't take the `CurrentUICulture`
 2021-07-29 12:54:05 +01:00
Sebastiaan Janssen
905b43f8af Merge branch 'v8/dev' into v8/contrib 2021-07-29 10:22:36 +02:00
Sebastiaan Janssen
52e8237a0e Merge branch 'v8/8.15' into v8/dev 2021-07-29 10:22:10 +02:00
Bjarne Fyrstenborg
7f2b85da19 Don't squeeze avatar when help panel is open 2021-07-29 08:07:25 +10:00
Shannon
5cec6ab8f4 Fixes issue with resolving a scheme name since that is managed via IOptions but we were capturing it. 2021-07-27 16:12:23 -06:00
Shannon
29ebb42a01 Fixes ugly classes not structured correctly and removes dead code, simplifies how db types are initialized and removes hacks. Fixes datetimeoffset definition. 2021-07-27 10:41:46 -06:00
Shannon
499a0608ec Fixes sql server DateTimeOffset mapping. Makes Custom DB types much more flexible and usable by 3rd parties. 2021-07-27 10:15:45 -06:00
Bjarne Fyrstenborg
8209525611 Modernize mini listview component to use svg icons and umb-search-filter component (#10740) 2021-07-27 15:49:16 +02:00
Sebastiaan Janssen
e8926ab17d Merge branch 'v8/8.14' into v8/8.15 2021-07-27 14:54:40 +02:00
Bjarne Fyrstenborg
f7529e0cf5 Inject windowResizeListener in Image Crop directive (#10745) 
(cherry picked from commit 2eb554f1b4)
 2021-07-27 14:53:09 +02:00
Bjarne Fyrstenborg
2eb554f1b4 Inject windowResizeListener in Image Crop directive (#10745) 2021-07-27 14:52:01 +02:00
Shannon
d218cb4599 Fixes migration and redirect 2021-07-26 16:55:41 -06:00
Shannon
a89a92efea Fixing upgrade redirect when using external providers. 2021-07-26 13:28:18 -06:00
Shannon
27fc159e28 ensures the last login date, etc... are updated with external logins 2021-07-26 13:12:29 -06:00
Shannon
b939da3668 adds invited date to back office user 2021-07-26 11:51:54 -06:00
Shannon
c8d36cfc4f Fix ordering of css files and set correct defautl icon for external providers. 2021-07-26 11:10:37 -06:00
Shannon
4759bcac69 Fixes migrations for external login table. 2021-07-26 10:54:06 -06:00
Shannon
15e65f0c1e Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 10:44:51 -06:00
Shannon Deminick
f1bc76e709 Merge pull request #10670 from cleversolutions/temp-10656 
Umbraco 9 - LoginProvider Duplicate Key
 2021-07-27 02:43:01 +10:00
Shannon
68737f8682 Merge remote-tracking branch 'origin/v9/dev' into v9/bugfix/external-login-changes 2021-07-26 09:58:43 -06:00
Shannon Deminick
b1c4be4299 Merge pull request #10675 from cleversolutions/temp-10674 
Change the property accessed on the external provider from SocialIcon to Icon.
 2021-07-27 01:56:59 +10:00
Shannon
3a229ef8af update comment and method name 2021-07-26 09:49:56 -06:00
Shannon
0e1c10ca7b adds comments, fixes null check. 2021-07-26 09:44:59 -06:00
Shannon
5c59b54b6e Adjust how the umbraco builder works 2021-07-26 09:23:34 -06:00
Shannon
86dea11711 chagen to IOptionsMonitor 2021-07-26 08:58:23 -06:00
Andy Butland
ab5272c6d3 Corrected comment. 2021-07-26 09:37:52 +02:00
Andy Butland
5bd00c8fc9 Migrated Umbraco.TestData to .NET 5. 2021-07-26 09:32:08 +02:00
Niels Lyngsø
9807365800 Escape HTML in localization tokens. (#10729) 
Co-authored-by: Niels Lyngsø <nsl@umbraco.com>
 2021-07-23 14:26:12 +02:00
Sebastiaan Janssen
175bb3e6df Bump version to 8.15.1 and merge branch 'v8/8.14' into v8/8.15 
# Conflicts:
#	src/SolutionInfo.cs
 2021-07-23 13:35:15 +02:00
Sebastiaan Janssen
071a89a59b Bump version to 8.14.2 2021-07-23 13:32:30 +02:00
Patrick de Mooij
c86d3b1dae 9157: Use the sorting event instead of the saving 2021-07-23 09:44:19 +10:00
Anders Bjerner
6116ec814d Update umbeditorview.directive.js 2021-07-23 09:32:51 +10:00
Bjarne Fyrstenborg
c812dab967 File upload checkered background (#10621) 
* Use umb-icon component

* Cleanup unused css and use checkered background on both image cropper and file upload
 2021-07-23 09:26:37 +10:00
Shannon
0f7e5a2f2f fix null auto link options. 2021-07-22 16:39:06 -06:00
Shannon
ed5ab8b866 Fix delete user clause 2021-07-22 16:34:30 -06:00