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

40522 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
bf5f1364fd Fix build after merge 2021-10-29 10:14:52 +02:00
Bjarke Berg
02bf61667d Merge remote-tracking branch 'origin/v8/dev' into v9/feature/merge-v8_29-10-2021 
# Conflicts:
#	src/Umbraco.Core/Persistence/NPocoDatabaseExtensions-Bulk.cs
#	src/Umbraco.Web.UI.Client/package.json
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/user/user.html
#	src/Umbraco.Web.UI.Client/src/views/content/overlays/publish.html
#	src/Umbraco.Web.UI.Client/src/views/documenttypes/importdocumenttype.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/nl.xml
 2021-10-29 09:52:39 +02:00
Bjarne Fyrstenborg
b04609880b Accept udt as extension in import document type (#11108) 
* Pass in invalid files

* Fix pattern and accept udt file extension

* Remove wildcard

* fix help text - referred to 'browse' button, which does not exist

Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-10-27 12:05:08 +10:00
Rick Butterfield
ed167288c8 Change event name to rte.shortcut.saveAndPublish 2021-10-27 10:40:56 +10:00
Rick Butterfield
976711ef1c Publish hotkey doesn't work in RTE 2021-10-27 10:40:56 +10:00
BatJan
f12c4493b3 Map fallback texts 2021-10-27 10:18:57 +10:00
BatJan
3ee289fd2f Update fallback texts and add an ind so label and input are paired properly 2021-10-27 10:17:43 +10:00
BatJan
612f52985f Add new dictionary key 2021-10-27 10:17:43 +10:00
BatJan
5f7c00dc31 Add missing fallback texts 2021-10-27 10:14:11 +10:00
BatJan
f6854cddc9 Remove unused code 2021-10-27 10:14:11 +10:00
BatJan
5d4e1c6f98 Add missing fallback texts 2021-10-27 10:11:45 +10:00
BatJan
e8970c0d44 Add missing fallback texts 2021-10-27 10:09:26 +10:00
BatJan
35b0dda1f5 Add missing fallback texts 2021-10-27 02:03:03 +02:00
BatJan
57637da767 Add missing fallback texts 2021-10-27 10:02:28 +10:00
BatJan
80c9c09210 Add missing fallback values 2021-10-27 09:57:39 +10:00
Nathan Woulfe
cf40b904c9 update styling in rollback text - removes stray comma, slight change to wording 2021-10-27 09:56:54 +10:00
BatJan
d131df181b Add missing fallback texts 2021-10-27 09:56:54 +10:00
BatJan
d1005c5976 Add missing fallback texts 2021-10-27 09:38:23 +10:00
BatJan
713f204ea5 Add missing fallback texts 2021-10-27 09:37:31 +10:00
BatJan
090fe7e9ae Add missing fallback texts 2021-10-27 09:34:45 +10:00
BatJan
97775196ae Add missing fallback texts 2021-10-27 09:33:53 +10:00
BatJan
1fdfb2c434 Add missing fallback texts 2021-10-27 09:32:08 +10:00
BatJan
7794d55381 Add missing fallback texts 2021-10-27 09:29:44 +10:00
BatJan
0eb0b18560 Add missing fallback texts 2021-10-27 09:27:04 +10:00
BatJan
0d73d903d1 Add missing fallback texts 2021-10-27 09:26:05 +10:00
BatJan
87a8ea755e Add missing fallback texts 2021-10-27 09:18:57 +10:00
BatJan
072374913d Add missing fallback texts 2021-10-27 09:18:05 +10:00
BatJan
f1998ca5ab Add missing fallback texts 2021-10-27 09:17:00 +10:00
BatJan
965ce917bf Map missing fallback texts 2021-10-27 09:15:43 +10:00
BatJan
57634d5b4e Add missing fallback values 2021-10-27 09:14:47 +10:00
BatJan
20941016ff Map missing translations 2021-10-27 09:12:30 +10:00
BatJan
85c9d55b7a Add missing translations 2021-10-27 09:11:45 +10:00
Bjarne Fyrstenborg
1bffd97be9 Update noUiSlider to v15.5.0 2021-10-27 08:28:32 +10:00
BatJan
034e43d3b8 Add missing text fallback values 2021-10-27 08:27:22 +10:00
BatJan
ad17207072 Fix localizations 2021-10-27 08:23:16 +10:00
BatJan
1ce05d44e5 Map missing text values 2021-10-27 08:21:29 +10:00
BatJan
8b4398c006 Remove space 2021-10-27 08:19:56 +10:00
BatJan
bed34b9916 Map missing values 2021-10-27 08:19:56 +10:00
BatJan
52f56628e9 Add missing fallback texts 2021-10-27 08:16:54 +10:00
BatJan
f9ed371cb7 Add missing fallback texts 2021-10-27 08:13:43 +10:00
Nikolaj Geisle
e9ae567617 v9: Update cypress to newest version and fix errors (#11486) 
* fixed flaky macro test and updated cypress version

* fixed flaky macro test and updated cypress version

* Update package.json

* Updated cypress to 8.6 and fixed failing script test

* Updated cypress to 8.6 and fixed failing script test

* Update package-lock.json

* Fixed Scripts and stylesheet tests with proper waits instead of magic numbers

* Updated to newest version of cypress and fixed template test

* Remove duplicate click

* Revert version to 8.4.1

* changed template

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-10-26 15:03:19 +01:00
Erik-Jan Westendorp
123bceef08 Localization add tab text dutch (#11346) 
* Update nl.xml add addTab key

* tab to tablad

* Add translation to shortcuts sections

(cherry picked from commit d22297270b)
 2021-10-26 15:58:03 +02:00
Paul Johnson
9155329de8 Merge pull request #11496 from umbraco/v9/bugfix/cypress-streaming-log-output 
Use powershell / bash tasks instead of npm for acceptance tests

npm buffers output and flushes at end, which isn't ideal if cypress killed after an hour and we have no idea what happened.
 2021-10-26 14:56:36 +01:00
Sebastiaan Janssen
cdd4bd1f69 Merge branch 'v8/dev' into v8/contrib 2021-10-26 15:54:34 +02:00
Paul Johnson
b375d28bdb Use powershell / bash tasks instead of npm for acceptance tests 2021-10-26 14:08:11 +01:00
Nikolaj Geisle
34be464cf8 v9: Fixing flaky cypress test "Macro in Grid" (#11485) 
* fixed flaky macro test and updated cypress version

* fixed flaky macro test and updated cypress version

* Update package.json

* Fixed failing tabs test

* Amend magic numbers with actual wait

* Update tests/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts

* Updated UI to click on button instead of icon

* Make macro test click bottom to ensure we're not clicking on icon

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-10-26 14:01:14 +01:00
Bjarke Berg
a7ff1e2c93 Merge pull request #11447 from jaddie/bugfix/11442/MigrationStepsAreSkippedV817toV9 
Bugfix/11442/migration steps are skipped v8.17 to v9
 2021-10-26 14:09:20 +02:00
Jaddie
af17859139 Update src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs 
Co-authored-by: Bjarke Berg <mail@bergmania.dk>
 2021-10-26 10:47:00 +01:00
BatJan
45dec5c181 Add missing fallack values 2021-10-26 01:21:54 +02:00
Paul Johnson
9773726c95 Merge pull request #11489 from umbraco/v8/bugfix/prevent-github-actions-spam 
Prevent github actions spam
 2021-10-25 17:02:16 +01:00