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

10984 Commits

Author SHA1 Message Date
Bjarke Berg
6371fdbf4d post merge 2020-08-17 11:43:04 +02:00
Bjarke Berg
9ae878a185 Hardcode verion 9 in text, and change assembly versions to 0.5.0 2020-08-17 09:34:27 +02:00
Sebastiaan Janssen
dde735f75c Sync some dependencies that have been updated in v8/contrib 2020-08-13 14:33:19 +02:00
Niels Lyngsø
00edd197f8 added attribute name-required, which can be used to make name not required. Since the value defaults to true. 2020-08-13 08:13:32 +02:00
Niels Lyngsø
2896e260af Revert "dont render input if not shown." 
This reverts commit a2dd9ad0c4.
 2020-08-13 07:37:53 +02:00
Niels Lyngsø
a2dd9ad0c4 dont render input if not shown. 2020-08-12 10:34:15 +02:00
Bjarke Berg
7b6d64872f 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 10:05:55 +02:00
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
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
6d51dc4afa Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/6976-migrate-preview-middleware 2020-08-10 14:30:25 +02:00
Niels Lyngsø
5d73949b7a validation highlight for custom view 2020-08-10 11:37:39 +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
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
c73f9bc2a5 fixing the other umb-toggle. 2020-08-07 09:52:19 +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
Bjarke Berg
39162f0f6a Merge conflicts resolved 2020-08-06 12:59:21 +02:00
Niels Lyngsø
0c4e962ce8 rename contentTypeKey to contentElementTypeKey 2020-08-05 21:21:00 +02:00
Niels Lyngsø
3e55460bfb We should not require the vm.umbVariantContent in the DocumentTypeEditor 2020-08-05 13:37:53 +02:00
Niels Lyngsø
4b58dca1bf only append settings content-app if block has settings 2020-08-04 16:40:37 +02:00
Warren Buckley
475671a239 Merge pull request #8581 from umbraco/v8/bugfix/dropdownFlexibleController-fix 
Check for null before checking the length or value of first entry.
 2020-08-04 15:02:33 +01:00
Warren Buckley
2643a9a59d Merge pull request #8579 from umbraco/v8/bugfix/block-list-editor-always-set-content-app-active 
always set active in order to reset it
 2020-08-04 15:00:42 +01:00
Warren Buckley
5ce603e667 Merge pull request #8577 from umbraco/v8/feature/block-list-editor-remove-unused-block-index 
remove unused index
 2020-08-04 14:58:14 +01:00
Warren Buckley
fed35d5163 Merge pull request #8536 from umbraco/v8/bugfix/blockeditor_fixing_deleteAllBlocks 
deleteAllBlocks fix
 2020-08-04 14:57:26 +01:00
Niels Lyngsø
5713ea7a1c Merge remote-tracking branch 'origin/v8/8.7' into v8/feature/block-list-editor-remove-unused-block-index 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/blocklist/umbBlockListPropertyEditor.component.js
 2020-08-04 15:55:56 +02:00
Niels Lyngsø
30a3e62c7f use this loop, since loop manipulate array as we go. 2020-08-04 15:54:02 +02:00
Warren Buckley
ba0b429b63 Merge pull request #8541 from umbraco/v8/feature/blockeditor_confirmDiscardChanges 
Ask user if they are sure about discarding changes
 2020-08-04 14:51:38 +01:00
Warren Buckley
8768e8fd29 Merge pull request #8535 from umbraco/v8/bugfix/blockeditor_fixing_createFromElementType 
correct for the new spelling
 2020-08-04 14:48:58 +01:00
Warren Buckley
1207ac66e7 Merge pull request #8580 from umbraco/v8/feature/block-list-display-validation-state-in-button 
Display validation state in submit button
 2020-08-04 14:48:25 +01:00
Warren Buckley
13e789be83 Merge pull request #8574 from umbraco/v8/bugfix/block-list-append-drag-class-again 
append lost drag class
 2020-08-04 14:32:18 +01:00
Warren Buckley
6bd1e0b7b4 Merge pull request #8563 from umbraco/v8/bugfix/block-list-start-load-as-the-last-thing-of-init 
moving load to the bottom of init
 2020-08-04 14:29:52 +01:00
Niels Lyngsø
ff3d0b1770 append a badge for settings, and make sure it visible. 2020-08-04 12:57:21 +02:00
Niels Lyngsø
041d6a91a8 use the right red for error borders, no need for it to be darker. 2020-08-04 12:57:05 +02:00
Niels Lyngsø
8981fd9c6f should check for value before checking the length or the value of first entry. 2020-08-04 11:34:07 +02:00
Niels Lyngsø
74f3b8073f show state in submit button 2020-08-04 11:32:02 +02:00
Niels Lyngsø
7cbe50b2f1 need to define active always, in order for it to become false. 2020-08-04 11:23:13 +02:00
Niels Lyngsø
1710a079a6 remove unused index from blockEditorModel for infinite editor 2020-08-04 11:09:45 +02:00
Niels Lyngsø
52fa96c824 append the drag class if a stylesheet is present. 2020-08-04 10:00:39 +02:00
Niels Lyngsø
c9b0f20fa3 move load to the buttom of init() 2020-08-03 14:13:38 +02:00