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

10197 Commits

Author SHA1 Message Date
Bjarke Berg
e6c315ff69 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Web/Editors/UpdateCheckController.cs
#	src/Umbraco.Web/Install/InstallHelper.cs
 2020-02-20 08:06:37 +01:00
Bjarke Berg
4ca4d8e6e0 Merge pull request #7684 from umbraco/v8/feature/AB4953-change-webservice-to-rest 
Change web service invocation to new Our rest endpoints
 2020-02-20 08:02:38 +01:00
Niels Lyngsø
278f8cc99f css change 2020-02-19 10:13:51 +01:00
Niels Lyngsø
088c51e84d enabling transclude for umb-form-check 2020-02-19 09:36:33 +01:00
Bjarke Berg
9ed94f753d Fixed issue with wrong installId in cookie. + Refactored to not use Newtonsoft.Json + Minor renames 2020-02-19 08:32:47 +01:00
Benjamin Carleski
bcd26b9243 Merge remote-tracking branch 'umbraco/temp-7538-image-url-generator' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/IImageUrlGenerator.cs
#	src/Umbraco.Abstractions/ImageUrlGenerationOptions.cs
#	src/Umbraco.Core/Composing/Current.cs
#	src/Umbraco.Core/Models/UserExtensions.cs
#	src/Umbraco.Core/PropertyEditors/ValueConverters/ImageCropperValue.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Tests/PropertyEditors/ImageCropperTest.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Runtimes/StandaloneTests.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
 2020-02-11 16:53:13 -08:00
Nathan Woulfe
d1503eba03 update angular-aria to 1.7.9 (#7606) 2020-02-10 11:47:07 +01:00
Nathan Woulfe
608555126e 7168 hotkeys in rte (#7604) 2020-02-10 11:46:21 +01:00
Bjarne Fyrstenborg
58b2c3f791 Align icon in mini search (#7589) 
* Align icon vertically and horizontally inside icon placeholder

* Add aria-hidden to search icon
 2020-02-10 10:22:44 +00:00
Poornima Nayar
b6efb86f61 Merge pull request #6951 from kjac/v8/fix/reapply-focus-after-dialog 
V8: Re-apply input focus to the last focused element when closing dialogs
 2020-02-10 10:07:13 +00:00
Benjamin Carleski
7e7d38e74b Add ImageUrlGeneratorController 2020-02-08 16:49:12 -08:00
Bjarke Berg
35a736e6cd Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Core/IO/SystemDirectories.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
 2020-02-07 10:04:28 +01:00
Bjarne Fyrstenborg
b182141d6c Fix jumping section name on focus 2020-02-06 17:33:22 +01:00
Warren Buckley
45e4e39412 Merge pull request #7556 from umbraco/dependabot/npm_and_yarn/src/Umbraco.Web.UI.Client/tinymce-4.9.7 
8.6RC: Bump tinymce from 4.9.2 to 4.9.7 in /src/Umbraco.Web.UI.Client
 2020-02-06 08:48:25 +00:00
Kenn Jacobsen
44e261b36a V8: Improve treepicker keyboard navigation for trees with listviews (#7032) 
* Remember the current tab focus when opening a mini list view in the tree picker

* Automatically assign focus to the search box in mini list views
 2020-02-05 21:04:28 +00:00
Poornima Nayar
3bdcff3a5c Merge pull request #6934 from kjac/v8/fix/treepicker-search-autofocus 
V8: Add autofocus to treepicker search box
 2020-02-05 20:57:07 +00:00
Poornima Nayar
ec97bf11a5 Merge pull request #6927 from kjac/v8/fix/rte-insert-image-auto-resize 
V8: Auto-resize the RTE after inserting images
 2020-02-05 20:36:12 +00:00
Andy Butland
b0c752bc5c Removed concrete type checks for back-office published cache details, so now working from interface. Renamed controller and FE assets to more generic name. 2020-02-04 19:18:35 +01:00
dependabot[bot]
c96c0cff32 Bump tinymce from 4.9.2 to 4.9.7 in /src/Umbraco.Web.UI.Client 
Bumps [tinymce](https://github.com/tinymce/tinymce-dist) from 4.9.2 to 4.9.7.
- [Release notes](https://github.com/tinymce/tinymce-dist/releases)
- [Changelog](https://github.com/tinymce/tinymce-dist/blob/4.9.7/changelog.txt)
- [Commits](https://github.com/tinymce/tinymce-dist/compare/4.9.2...4.9.7)

Signed-off-by: dependabot[bot] <support@github.com>
 2020-02-03 03:27:33 +00:00
emma burstow
a41aa26532 V8: Fix button style when opening doctype in infinite editing w… (#7003) 
Lovely stuff :D
 2020-01-30 14:12:53 +00:00
Kenn Jacobsen
da20bf0b56 V8: Change "Include subfolders in search" to "Search only in th… (#4720) 
Lots of lovely work here - this is one of those PRs that show how good communication can really make the experience of contributing one of learning for all parties. Thanks Kenn and all who contributed their time here
 2020-01-30 10:45:50 +00:00
emma burstow
e39c0ef7a8 V8: Add custom crop indication to image cropper (#5626) 
Thanks!  So sorry it's taken so long.
 2020-01-30 10:32:05 +00:00
emma burstow
a076f10765 Merge branch 'v8/contrib' into pr/5626 2020-01-30 10:29:57 +00:00
emma burstow
829e6dc103 V8: Mark the current variant as dirty when its name changes (#7004) 
Whoop whoop! Thanks Kenn
 2020-01-30 10:27:39 +00:00
emma burstow
f1f175bf11 Merge branch 'v8/contrib' into pr/7004 2020-01-30 10:25:59 +00:00
emma burstow
861c09f24c Merge branch 'v8/contrib' into pr/7003 2020-01-30 10:21:59 +00:00
Matthew-Wise
423a21da10 Added dialog aria labelling (#7000) 
Thanks Matt 👍
 2020-01-30 10:20:16 +00:00
Nathan Woulfe
a945b0c511 use default color when previous selection removed (#7448) 
Thanks Nathan!
 2020-01-29 16:52:20 +00:00
Bjarke Berg
03f1faf20d Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web/Editors/UsersController.cs
#	src/Umbraco.Web/Models/ChangingPasswordModel.cs
#	src/Umbraco.Web/Templates/HtmlImageSourceParser.cs
 2020-01-29 09:22:45 +01:00
Poornima Nayar
c077f56ced Merge pull request #6942 from kjac/v8/fix/locked-alias-cursor 
V8: Use "not allowed" cursor for locked type aliases
 2020-01-27 15:24:36 +00:00
Bjarke Berg
a1ed2eb135 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-27 14:22:04 +01:00
Nathan Woulfe
902d4196cf add dialog for change password, shift form from user details view int… (#7450) 2020-01-27 06:29:04 +01:00
Poornima Nayar
ebed80791d Changed delete button style on media type folder delete to danger style (#7393) 2020-01-27 06:12:01 +01:00
Sebastiaan Janssen
41dc8d915b Merge branch 'v8/dev' into v8/contrib 2020-01-26 10:37:11 +01:00
Kenn Jacobsen
8e736f87d0 Hide the "blob:" URL for images uploaded via the RTE (#6926) 2020-01-24 11:38:21 +00:00
Niels Lyngsø
7fc0f01887 fixed versions for angular + npm 2020-01-23 15:23:32 +01:00
Niels Lyngsø
aaf53921eb upgrade to Angular 1.7.9 + npm 6.13.6 2020-01-23 15:15:48 +01:00
Poornima Nayar
dd78fd832c Merge pull request #6933 from kjac/v8/fix/treepicker-retain-selected-state 
V8: Display picked item state when navigating the treepicker
 2020-01-23 13:03:09 +00:00
Poornima Nayar
18e0f8d092 Merge pull request #6790 from stevemegson/v8/pr/6230 
V8: Update TinyMCE language files
 2020-01-23 12:28:51 +00:00
Bjarke Berg
1bfb64bdd8 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Constants-AppSettings.cs
#	src/Umbraco.Abstractions/ContentVariationExtensions.cs
#	src/Umbraco.Abstractions/IMainDom.cs
#	src/Umbraco.Abstractions/PropertyEditors/MultiUrlPickerConfiguration.cs
#	src/Umbraco.Abstractions/Runtime/IMainDom.cs
#	src/Umbraco.Abstractions/Runtime/MainDom.cs
#	src/Umbraco.Core/IMainDom.cs
#	src/Umbraco.Core/MainDom.cs
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Infrastructure/MainDom.cs
#	src/Umbraco.Infrastructure/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Infrastructure/Runtime/CoreRuntime.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
#	src/Umbraco.Web/PublishedCache/NuCache/ContentStore.cs
#	src/Umbraco.Web/UmbracoApplication.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2020-01-23 13:16:49 +01:00
Dave Woestenborghs
d61090a225 #7452 set save state correctly for variant when setting schedule publishing 2020-01-22 21:27:35 +01:00
Warren Buckley
81a0a52874 Merge branch 'v8/feature/media-tracking' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2020-01-22 08:36:32 +00:00
Niels Lyngsø
8030901184 Fix mistakes made in commit a4a6b77 2020-01-22 08:36:52 +01:00
Sebastiaan Janssen
163c1f7028 Fix automatic merge gone wrong 2020-01-21 19:16:07 +01:00
Sebastiaan Janssen
a4a6b77fc1 Merge branch 'v8/contrib' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/tour.service.js
 2020-01-21 18:58:03 +01:00
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Warren Buckley
466f8ca185 V8: Email Marketing Opt In (#7366) 
* Enable BackOfficeTours to have a bool to hide them in the help drawer

* New hidden tour to display the email marketing option on login to backoffice

* Update to tourService to use the new bool property of hidden to show/hide the tour in the help drawer

* AngularJS Resource to call the Azure Function EmailService proxy code - currently set to DEV

* New method on userService.addUserToEmailMarketing that in turn calls the new emailMarketingResource

* New AngularJS view & controller in the tour step to deal with user clicking yes/accept to the email opt-in

* Modifies the init script to auto launch the hidden email marketing tour at login
If it has been accepted or dismissed before we then try to launch the original intro tour

* Only show the email marketing tour when the intro tour has been dismissed or completed and will appear for one time only the next time you login

* When using X to close email tour, it does not disable and never show it again but just closes it, similar to intro tour

* Adds new localStorageService key for 'emailMarketingTourShown' to prevent the tour being shown again in the same logged in session, if you refresh the backoffice in your browser

* Update URL to email function

* Adding new COMA copy for email marketing tour - needs fine tuning pixel pushing from Niels L

* Prettified layout of e-mail marketing promotion tour

* fixing whitespace

* text=auto

* adding xml to gitattributes

* Ensures the email tour is not shown if you dismiss the intro tour and manually refresh the page

Co-authored-by: Niels Lyngsø <niels.lyngso@gmail.com>
 2020-01-21 08:56:51 +01:00
Shannon
4cf204f8f5 Merge branch 'v8/dev' into v8/feature/media-tracking 
# Conflicts:
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 13:40:16 +11:00
Benjamin Carleski
0c1d54ba4d Remove unused obsoletes from Umbraco.Web.UI.Client 2020-01-20 11:07:13 -08:00
Kenn Jacobsen
c27634d8a9 V8: Allow reordering of allowed child types (#4927) 
* Allow explicitly sorting allowed child types for content types

* Allow explicitly sorting allowed child types for media types

* Remove console.log

* Fix the mapping of allowed content types (after introduction of the new mapper)

* Fix sorting after merge
 2020-01-19 09:50:18 +00:00