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

40892 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bjarke Berg
cabc30341a Merge pull request #11592 from rickbutterfield/feature/temp-11591 
v9: Fix for OAuth ExternalLogin
 2021-11-15 12:54:44 +01:00
Andy Butland
fe396ba0cf Inverted conditional on linking user for clarity. 2021-11-15 11:45:00 +01:00
Andy Butland
c6176a0ae7 Added null check for external login invocation when linking users. 2021-11-15 11:42:04 +01:00
Andy Butland
3d43815981 Added suggestions from code review. 2021-11-15 11:17:47 +01:00
BatJan
e07a2b1abd Add missing text fallback 2021-11-15 03:07:51 +01:00
Enkel Media
c59d799557 Update docs for localize.directive.js 
Updated docs to add information about tokens and watch-tokens.
 2021-11-15 09:14:35 +10:00
Jesper Mayntzhusen
ea9d6919a8 Cy create language (#11546) 
* add create language test

* add create language test

* fix bug, move test to new folder and add type definitions

* update to use culture command

Co-authored-by: Jesper <jmh@umbraco.dk>
 2021-11-14 02:20:17 +01:00
Bjarke Berg
caa49a1463 package-lock 2021-11-12 15:32:34 +01:00
Bjarke Berg
1862b81418 Unbreak 2021-11-12 15:32:13 +01:00
Patrick de Mooij
baaed139c3 Updated version to 9.1.0 2021-11-12 14:55:12 +01:00
Bjarke Berg
b0e39fe548 Merge branch 'v9/dev' into v9/9.1 2021-11-12 14:53:11 +01:00
Nikolaj Geisle
d66fde6056 Fix after cherry pick 2021-11-12 14:42:53 +01:00
Nikolaj Geisle
15fa9e1bc1 v9: Don't load all translation files (#11576) 
* Update systemInformation.ts

* Added lazy loading

* Update systemInformation.ts

* Update systemInformation.ts

* Use CharArrays.ForwardSlash instead of hardcoded string

* Align braces

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-12 14:37:50 +01:00
Bjarke Berg
581934da00 Merge pull request #11608 from umbraco/v9/task/obsolete-unneeded-deploy-events 
Obsoletes events added for local database initialization for Umbraco Cloud that are no longer required.
 2021-11-12 07:47:12 +01:00
Søren Kottal
55de670246 makes the log viewer prettier (#6890) 
Co-authored-by: Nathan Woulfe <nathan@nathanw.com.au>
 2021-11-12 15:43:09 +10:00
Elitsa Marinovska
b8cd731b0d Don't send null but fall back to the user's email in case SMPT settings are not configured in appsettings 2021-11-11 15:07:51 +01:00
Andy Butland
e634c818d0 Obsoletes events added for local database initialization for Umbraco Cloud that are no longer required. 2021-11-11 15:02:06 +01:00
Nikolaj Brask-Nielsen
d9c7640a8d Fixes userpicker filter 
#11520
 2021-11-11 13:13:21 +01:00
Nikolaj Geisle
837cef0b14 Update user test to use constants 2021-11-11 13:06:09 +01:00
Rick Butterfield
f92070cee9 v9: Health Check still references web.config instead of appsettings.json (#11600) 
* Fix an old reference to web.config instead of appsettings.json

* Match en_us.xml to en.xml

* adding FR translations
 2021-11-11 01:00:04 +01:00
Nikolaj Geisle
f5ea5df8f3 v9: Don't load all translation files (#11576) 
* Update systemInformation.ts

* Added lazy loading

* Update systemInformation.ts

* Update systemInformation.ts

* Use CharArrays.ForwardSlash instead of hardcoded string

* Align braces

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-10 11:48:09 +01:00
Matthew Care
fe7b696c7c Add support for media saving messages in dropzone (#11304) 
* WIP

Waiting for a response on the issue about how to proceed

* Support messages in dropzone

Update dropzone to allow the showing of messages that may be added in a media saving notification / handler

* Remove test code

Remove code used for testing

* Sort usings

Remove unused using

* Fix ordering

Ordering of files when they were being processed was backwards / out of order

* Add button to "okay" all messages

PR Feedback to add a button to dismiss all of the messages all at once.
Fixing a referencing issue with `currentFile`

Co-authored-by: Michael Latouche <michael@crossingpaths.be>
 2021-11-10 02:32:21 +01:00
Lennard Fonteijn
570841b958 Allow appsettings.json to set SMTP authentication to string.Empty 2021-11-10 01:33:13 +01:00
Paul Johnson
cf38e3a97b Separate customizations for clarity 2021-11-09 19:40:20 +00:00
Bjarke Berg
17abf0474c Added unit tests for ContentVersionService (#11597) 
* Added unit tests for ContentVersionService

* Clean up

* Fixed tests after using ConfigureMembers = true

* Fixed tests after using ConfigureMembers = true
 2021-11-09 16:48:50 +00:00
Sebastiaan Janssen
1fbf02d61e Merge branch 'v8/dev' into v8/contrib 2021-11-09 11:04:38 +01:00
Sebastiaan Janssen
e59f855aa9 Merge branch 'v8/contrib' of https://github.com/umbraco/Umbraco-CMS into v8/contrib 2021-11-09 11:04:01 +01:00
Sebastiaan Janssen
2aad2087a5 Merge branch 'v8/8.17' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/contenttypehelper.service.js
 2021-11-09 11:02:21 +01:00
Ronald Barendse
2993c301f3 Hide localization key while loading 2021-11-08 23:42:06 +01:00
Rick Butterfield
709c2498fe Remove unreachable code 2021-11-08 12:46:04 +00:00
Rick Butterfield
b00e686936 Fixes #11591 2021-11-08 12:44:01 +00:00
Ronald Barendse
1aeed3173b Do not allow deleting tabs with locked properties 2021-11-08 11:47:12 +01:00
Ronald Barendse
4f6a073f79 Re-bind readonly property state after save 2021-11-08 11:22:35 +01:00
Ronald Barendse
4bf598d9a4 Change IsLockedOut property to readonly when it's true (only allow unlocking members) 2021-11-08 11:22:07 +01:00
Rick Butterfield
1117440a04 Fix for #11591 2021-11-06 11:40:05 +00:00
Ronald Barendse
5bda825fd1 Add Member Content App to display membership properties 2021-11-05 11:05:13 +01:00
Bjarke Berg
90c64a22c7 Merge pull request #11582 from umbraco/v9/bugfix/downgrade_cypress 
v9: Downgrade cypress to 8.4.1
 2021-11-05 09:50:36 +01:00
Nikolaj Geisle
07feb8f79b Downgraded cypress to 8.4.1 2021-11-05 09:10:37 +01:00
Nikolaj Geisle
fdd62d367b Merge pull request #11579 from umbraco/v9/bugfix/allow_map_filesd_as_default_BrowsableFileExtensions 
Allow .map files as default browsable file extensions from the App_Pl…
 2021-11-05 08:53:08 +01:00
Bjarke Berg
a528b9d5f4 Allow .map files as default browsable file extensions from the App_Plugins static file handler. 2021-11-04 20:58:02 +01:00
Nikolaj Geisle
cd596b444e v9: Implemented new routing tests (#11571) 
* Implemented new routing tests

* Update package-lock.json

* Cleanup

* Updated routing to cleanup before and after tests

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-04 16:54:25 +01:00
Nikolaj Geisle
ba7db3b842 v9: Use localization keys instead of hardcoded string (#11406) 
* Update help.controller.js

* updated with better localization keys

* Added more translations

* Fixed spelling mistakes

* Updated help.controller.js according to review

* Fix localizaMany to include another call

* Cleanup

Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
 2021-11-04 16:50:33 +01:00
Nikolaj Geisle
1359eb8f77 v9: Create new 'delete stylesheet' cypress test (#11528) 
* Create new cypress test- delete stylesheet

* Cleanup

Co-authored-by: Elitsa Marinovska <elm@umbraco.dk>
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-11-04 16:49:21 +01:00
Ronald Barendse
86fb382f81 Do not explicitly create standard member property group 2021-11-04 15:45:42 +01:00
Nikolaj Geisle
740c2e4b53 Update systemInformation.ts (#11572) 
Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
 2021-11-04 14:07:59 +01:00
Bjarke Berg
b8616426ee Merge remote-tracking branch 'origin/v8/dev' into v9/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/mediatypes/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviewmacros/create.html
#	src/Umbraco.Web.UI.Client/src/views/partialviews/create.html
#	src/Umbraco.Web.UI.Client/src/views/relationtypes/create.html
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2021-11-04 12:43:16 +01:00
Bjarke Berg
fa96ba1e82 Bump version to 9.2.0-rc 2021-11-04 12:36:10 +01:00
Bjarke Berg
a64c58d68e Merge branch 'v9/9.1' into v9/dev 2021-11-04 12:34:21 +01:00
Bjarke Berg
7b98cc3c4d Merge pull request #11495 from umbraco/v8/feature/version-history-cleanup 
Version history cleanup
 2021-11-04 12:33:07 +01:00
Bjarke Berg
02dfb5af25 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/version-history-cleanup 
# Conflicts:
#	src/Umbraco.Tests.AcceptanceTest/package.json
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2021-11-04 11:40:11 +01:00