yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
36,606 Commits 4 Branches 7 Tags
8d7ec23f6913f3c1029b272f94de2bce0146ac32
Commit Graph

36606 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
1481804014 Merge remote-tracking branch 'origin/netcore/dev' into netcore/netcore 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/da.xml
#	src/Umbraco.Web.UI.NetCore/Umbraco/config/lang/en_us.xml
 2020-08-11 10:01:17 +02:00
Bjarke Berg
9432f71a63 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 2020-08-11 10:00:19 +02:00
Bjarke Berg
0fe50728df Fix csproj of Umbraco.Web.UI 2020-08-11 09:50:17 +02:00
Warren Buckley
3c9bd45ea6 Delete rich-code-navigation.yml 2020-08-11 08:25:43 +01:00
Bjarke Berg
7ced06bc05 fix tests 2020-08-11 09:11:53 +02:00
Bjarke Berg
1123b8bea5 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/better-linux-support 
# Conflicts:
#	src/Umbraco.Web.UI.NetCore/umbraco/config/lang/en.xml
 2020-08-11 08:33:11 +02:00
Bjarke Berg
3c2f2ac0b3 Netcore: Let build.ps1 create the dotnet new templates (#8591) 
* Creates the Umbraco.Templates.nuspec on build

* Update nuspec to match nuget packages

* Updated namespace of Program.cs and Startup.cs and replace these with the project name in templates

* Bugfixes for sqlce

* Simplified template to have one template with --UseSqlCe as option

* Update build/build.ps1

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>

Co-authored-by: Elitsa Marinovska <21998037+elit0451@users.noreply.github.com>
 2020-08-11 08:28:16 +02:00
Bjarke Berg
94e1056dd9 Merge pull request #8603 from umbraco/netcore/feature/6976-migrate-preview-middleware 
Migrates preview auth Middleware
 2020-08-11 08:24:57 +02:00
Shannon
f4baab1bb4 Gets custom OAuth errors working 2020-08-11 16:06:37 +10:00
Bjarke Berg
d98d1d8373 Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-11 07:30:50 +02:00
Bjarke Berg
a02b5e93a5 Merge pull request #8598 from umbraco/netcore/feature/6972-migrate-non-oauth-auth-controller 
Migrates remaining non-oauth AuthenticationController actions to netcore
 2020-08-11 07:30:23 +02:00
Shannon Deminick
2aae974281 Merge pull request #8394 from umbraco/netcore/feature/fix-integration-tests 
Netcore: More tests migrated..
 2020-08-11 11:54:37 +10:00
Shannon
9fc3699a48 Reduces the Member update calls when logging a member in 2020-08-11 11:52:36 +10:00
Shannon
2d3d919c31 adds notes 2020-08-10 22:57:34 +10:00
Shannon
295db967de Updates member repository to select/update instead of delete/insert for property data 2020-08-10 22:55:45 +10:00
Bjarke Berg
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Shannon
5cf94a7639 Updates member repository to take a lock on the property value rows being updated 2020-08-10 22:29:04 +10:00
Bjarke Berg
8322151426 Fix test issue. Now testserver tests always is executed in debugmode 2020-08-10 14:10:08 +02:00
Bjarke Berg
8dea65286b Fix test. Asserting on something irrelevant 2020-08-10 13:21:44 +02:00
Niels Lyngsø
5d73949b7a validation highlight for custom view 2020-08-10 11:37:39 +02:00
Shannon
cfc4933170 Merge branch 'netcore/netcore' into netcore/feature/fix-integration-tests 2020-08-10 15:50:05 +10:00
Shannon
635f1ba984 removes unused code 2020-08-10 15:48:13 +10:00
Bjarke Berg
499ffdfe97 Merge pull request #8584 from umbraco/netcore/feature/request-localization-from-user 
Netcore: Added request localization from the current user.
 2020-08-10 07:04:20 +02:00
Niels Lyngsø
79478cd5e2 highlight validation issues for content part of blocks, first take. 2020-08-07 16:11:13 +02:00
Shannon Deminick
35b6652949 Fix server validation issue with block editor due to cultures not being carried over correctly (#8594) 
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
 2020-08-07 15:37:32 +02:00
Niels Lyngsø
82e4217e47 Merge branch 'v8/8.7' of https://github.com/umbraco/Umbraco-CMS into v8/8.7 2020-08-07 15:04:29 +02:00
Niels Lyngsø
015dc9944a set settingsPreview when updated 2020-08-07 15:04:24 +02:00
Warren Buckley
d2e072dc2b Merge pull request #8609 from umbraco/v8/feature/block_list_rename_postFormSubmitting 
renamedpostFormSubmitting
 2020-08-07 13:39:31 +01:00
Bjarke Berg
379454cd4b fix appsettings.json 2020-08-07 14:36:45 +02:00
Bjarke Berg
8539ffa27a Fix issue where Umbraco.Tests.Common know a legacy mvc package 2020-08-07 14:10:29 +02:00
Niels Lyngsø
d5f658f0c1 rename postFormSubmitting to formSubmittingFinalPhase 2020-08-07 14:08:38 +02:00
Bjarke Berg
c57c42d2ec Fixes merge conflicts 2020-08-07 14:00:56 +02:00
Claus
d00c07592e merging over a bunch of fixes from contrib for element tags not correctly closed. 2020-08-07 12:42:28 +02:00
Claus
f25ee0a369 Merge pull request #8605 from bjarnef/v8/bug/fix-self-closing-umb-toggle 
Fix self closing umb-toggle

(cherry picked from commit f7588da514)
 2020-08-07 10:00:08 +02:00
Claus
39fcdb01e0 Merge pull request #8601 from umbraco/v8/bugfix/publishdescendants 
Fixing publish descendants dialog
 2020-08-07 09:56:37 +02:00
Claus
c73f9bc2a5 fixing the other umb-toggle. 2020-08-07 09:52:19 +02:00
Claus
36af2f6ed2 Merge pull request #8547 from bjarnef/v8/bug/fix-self-closing-angular-elements 
Fix self closing angular elements
 2020-08-07 09:45:32 +02:00
Claus
f7588da514 Merge pull request #8605 from bjarnef/v8/bug/fix-self-closing-umb-toggle 
Fix self closing umb-toggle
 2020-08-07 09:42:31 +02:00
Bjarne Fyrstenborg
deef02bd32 Toggle when clicking label text 2020-08-06 20:14:38 +02:00
Bjarne Fyrstenborg
73860285eb Fix issue with void element for angular directive/component which is custom HTML element 2020-08-06 19:59:54 +02:00
Bjarne Fyrstenborg
112215ac5b Remove additional whitespace 2020-08-06 19:57:20 +02:00
Shannon
cca7303abd Migrates preview auth Middleware 
Migrates UriExtensionsTests to netcore, fixes preview controller bits, adds tests for preview path for back office route check, fixes virtual paths for views,
 2020-08-07 00:48:32 +10:00
Niels Lyngsø
9370dacd16 remove console.log 2020-08-06 15:30:01 +02:00
Claus
4799f73775 using label on umb-toggle instead of a separate element. 
updating localized texts to reflect what is happening.
ensure the selected value is pushed back to scope and used for the action.
 2020-08-06 15:04:18 +02:00
Niels Lyngsø
58e3deb935 Merge branch 'v8/8.7' of https://github.com/umbraco/Umbraco-CMS into v8/8.7 2020-08-06 14:43:32 +02:00
Niels Lyngsø
745e0b7990 fix js issue appearing when mouseLeave is undefined. 2020-08-06 14:43:27 +02:00
Shannon
1239975b07 Ensures all back office controllers have the thread culture set, we do this with a new application model targeting all back office controllers. 2020-08-06 22:08:27 +10:00
Warren Buckley
21c17dd65d Merge pull request #8593 from umbraco/v8/feature/bock-list-rename-contentTypeKey-to-contentElementTypeKey 
rename contentTypeKey for consistency.
 2020-08-06 12:41:07 +01:00
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Shannon
b9a4a75656 Migrates remaining non-oauth AuthenticationController actions to netcore 2020-08-06 19:09:05 +10:00