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

11014 Commits

Author SHA1 Message Date
Bjarke Berg
13ad1e0a88 remove hardcoded version number 
Signed-off-by: berg <mail@bergmania.dk>
 2020-09-04 20:12:49 +02:00
Bjarke Berg
361125e84b Merge remote-tracking branch 'origin/netcore/netcore' into netcore/feature/merge-v8-into-netcore-netcore 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/nestedcontent/nestedcontent.controller.js
 2020-08-27 08:39:02 +02:00
Bjarke Berg
9d79b46949 Merge remote-tracking branch 'origin/v8/8.7' into netcore/netcore 2020-08-26 15:49:19 +02:00
Niels Lyngsø
fd170094b6 minor visual adjustments 2020-08-26 13:09:00 +02:00
Warren Buckley
4a3f0f27f3 Merge pull request #8669 from umbraco/v8/feature/clipboard_sort_newest_first 
V8.7RC Sort paste entries by date
 2020-08-26 11:56:59 +01:00
Bjarke Berg
25a7a2c7fb Changed all view paths to lowercase from gulp 2020-08-26 09:44:15 +02:00
Bjarke Berg
3d55dcd3c4 Merge remote-tracking branch 'netcore/dev' into netcore/netcore 2020-08-26 08:05:15 +02:00
Warren Buckley
eee3d489f1 Update src/Umbraco.Web.UI.Client/src/views/components/blockcard/umbBlockCard.component.js 2020-08-25 13:32:05 +01:00
Niels Lyngsø
4cc9935b10 Merge remote-tracking branch 'origin/v8/8.7' into v8/bugfix/block-catalouge-use-absolute-path-and-dont-scale-svg 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/components/blockcard/umb-block-card.html
 2020-08-25 13:55:54 +02:00
Niels Lyngsø
30e6f83358 Update umbBlockCard.component.js 
change transparent to none
 2020-08-25 13:23:11 +02:00
Niels Lyngsø
7e32de7bb6 important fix 2020-08-24 21:59:34 +02:00
Niels Lyngsø
056a554875 use absolute path for thumbnail and dont scale SVGs 2020-08-24 21:38:36 +02:00
Bjarke Berg
c0d4516e15 Updated default config files 2020-08-24 14:15:53 +02:00
Bjarke Berg
a2b82970ac Migrate GetCurrentUserLinkedLogins api 2020-08-20 11:54:35 +02:00
Bjarke Berg
803fdcc890 Merge remote-tracking branch 'origin/v8/8.7' into netcore/netcore 
# Conflicts:
#	src/SolutionInfo.cs
 2020-08-20 11:24:58 +02:00
Niels Lyngsø
19037d0a89 append date to the clipboard entry, and use it for sorting entries in the UI. 2020-08-20 10:27:14 +02:00
Niels Lyngsø
4c0d05e4ea close tag 2020-08-20 09:44:52 +02:00
Niels Lyngsø
f0c06463a3 use an absolute path for test 2020-08-19 14:44:09 +02:00
Niels Lyngsø
2a7349f988 remove unused umbRequestHelper 2020-08-19 14:42:53 +02:00
Niels Lyngsø
5ad0efbf53 add umbRequestHelper 2020-08-19 14:42:42 +02:00
Niels Lyngsø
1e9aa675ea update paths when retriving the configuration 2020-08-19 14:31:01 +02:00
Niels Lyngsø
6031680a81 revert change 2020-08-19 14:30:34 +02:00
Niels Lyngsø
85de5bf835 refactor files to be convertVirtualToAbsolutePath at blockObject initialization. So devs dont need to worry about this. 2020-08-19 14:17:12 +02:00
Niels Lyngsø
2cf421f386 fixing the headline of custom view picker. 2020-08-19 14:13:33 +02:00
Niels Lyngsø
44fd8beff2 convert view to absolute path 2020-08-19 13:38:52 +02:00
Niels Lyngsø
ac44dc7559 thumbnail should be converted 2020-08-19 13:38:35 +02:00
Warren Buckley
93da8c4b55 Merge pull request #8631 from umbraco/v8/bugfix/fix_mandatory_varaiants_of_PublishedPendingChanges_should_not_prevent_publishing 
Accept PublishedPendingChanges state as a published state
 2020-08-19 08:56:19 +01:00
Niels Lyngsø
cd6ec321f5 use calculated property instead of calling the method. 2020-08-19 07:45:56 +02:00
Warren Buckley
6d6f525343 Fix to ensure we use virtual paths for any blocks with custom views (#8597) 
Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
Co-authored-by: Shannon <sdeminick@gmail.com>
 2020-08-18 13:43:29 +02:00
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ø
2b73b3ddad include PublishedPendingChanges as Published state. 2020-08-13 13:12:07 +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