fecd09cf9d
Merge pull request #7488 from JeffDess/v8/contrib
...
Fix typo in contentTypeSavedHeader French label
2020-01-21 22:48:46 +01:00
163c1f7028
Fix automatic merge gone wrong
2020-01-21 19:16:07 +01:00
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
204e0841af
Fix typo in contentTypeSavedHeader French label
...
"documet" should read "document"
2020-01-21 10:48:21 -05:00
0d12852cd8
Address Shannon comments
...
Add code documentation, return empty enumerable instead of allocate empty list
2020-01-21 09:07:10 +00:00
7a113ca386
Merge pull request #7482 from umbraco/v8/dev-merge-8.5
...
Merge of 8.5 into v8/dev
2020-01-21 09:03:16 +01:00
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
832c699fc4
Merge remote-tracking branch 'origin/v8/8.5' into v8/dev-merge-8.5
...
# Conflicts:
# src/SolutionInfo.cs
2020-01-21 08:10:12 +01:00
be38b96391
fixes up the AddSegmentData endpoint
2020-01-21 13:52:53 +11:00
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
8cc78631a0
Adds TestData project along with test endpoints for enabling/disabling segments
2020-01-21 13:33:39 +11:00
addd583e34
visual corrections
2020-01-20 20:21:43 +01:00
84f383a77d
Turn Compositions and Reorder buttons into outline styles, to make then stand back.
2020-01-20 19:20:33 +01:00
9f8d6230d1
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/5656-ux-doctype-property-creation-journey
...
# Conflicts:
# src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
2020-01-20 19:06:15 +01:00
7fbe482919
Revert " https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue"
...
This reverts commit baef282b
2020-01-20 14:09:13 +01:00
9a7b72c8c1
Fix typo in DE "installFinish" caption
...
(and improve wording: "Abschließen" (~ completing something) instead of "Quit" or "Close" as it was; EN is "Finishing")
2020-01-20 13:39:22 +01:00
d378495942
Log message format fix for PR6617
2020-01-20 09:11:29 +00:00
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
bc82ccd824
Prevented user from changing a document type to an element type if it's already been used to create content ( #5668 )
2020-01-19 09:34:04 +00:00
b3829bfff8
Reorder methods to keep overloads adjacent
2020-01-17 22:44:44 +01:00
d9dfea8ef5
Add remarks and better summary on SetVariesBy extension methods
2020-01-17 22:43:11 +01:00
05f7d24a9a
Add VariesBySegment and VariesByCultureAndSegment extension methods for ISimpleContentType
2020-01-17 22:42:24 +01:00
93e85f77f2
removes generics stuff & makes the migration simpler
2020-01-17 15:15:29 +00:00
bcf4c97270
V8: Support culture variant URLs in multi URL picker ( #7130 )
...
Thanks, Kenn - great work as usual 👍
2020-01-17 12:58:18 +00:00
baef282b10
https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue
2020-01-17 13:53:03 +01:00
6637bf520c
https://github.com/umbraco/Umbraco-CMS/issues/7469 - Fixed Ambiguous extension method issue by renaming our extension method from Value to GetValue
2020-01-17 13:22:13 +01:00
5ddc4b8efb
Bump version to 8.5.2
2020-01-17 11:51:31 +01:00
12e88fde42
Merge branch 'v8/dev' into v8/contrib
2020-01-17 10:07:06 +01:00
1b56922213
Fixes threadsafety for settings value
2020-01-17 13:31:22 +11:00
f3d9a01800
Hide the "Add" button for Nested Content in "single mode" ( #7327 )
2020-01-16 22:00:28 +00:00
b272a3b791
https://github.com/umbraco/Umbraco-CMS/issues/7466 - Fixes issue with external ModelsBuilder and Dll or LiveDll mode. The issue is because the Mode is determined in the contructor, and not lazy.
2020-01-16 19:39:17 +01:00
f5a5a9a297
Spelling mistake in comments of partial snippet ( #6975 )
2020-01-16 17:19:54 +01:00
4d5f34a63d
Spelling mistake on word Success in instructional comment. ( #6966 )
2020-01-16 17:15:07 +01:00
d4e6eb2b6b
AB4084 - Backported/reimplemented fix for contentservice returning outdated results
2020-01-16 17:04:38 +01:00
4c68f7e53a
List view configuration - Sort order distance fix ( #6905 )
...
Thanks, Jan. You're a 🌟
2020-01-16 15:13:25 +00:00
c127bedb93
Responsive Angular API documentation ( #7030 )
2020-01-16 15:11:08 +00:00
dbe088eedb
V8: Add infinite editing to datatype references tab ( #6907 )
...
* Add infinite editing to datatype references tab
* Use correct save button label in infinite editing mode
2020-01-16 14:36:54 +00:00
e85640c483
V8: Set tab focus on newly created nested content items ( #6914 )
...
* Set tab focus on newly created nested content items
* Fix bad merge
* Undo unintentional change
2020-01-16 14:15:04 +00:00
6ca0a8ba66
V8: A few UX updates to the listview move dialog ( #6902 )
...
* Add some context to the move operation from listviews
* Disable submit button in the listview move dialog until a target is chosen
* Fix bad merge
2020-01-16 13:47:25 +00:00
1b3f809cec
Improvements to grid accessibility ( #6804 )
...
Happy to merge this one. It's a nice improvement. Great work Mmmmmmasey ;)
2020-01-16 13:03:01 +00:00
ed533697e2
Listview: Various corrections ( #6904 )
...
Heyyyyy Jan. Thanks for this contribution. :)
2020-01-16 13:01:40 +00:00
fb477429fe
V8: UX updates to the listview copy dialog + add option to incl… ( #6903 )
...
Fab work Kenn :)
2020-01-16 09:48:46 +00:00
6b570cd5e3
adds fk index to cmsDictionary -> parentId
2020-01-15 14:56:06 +00:00
6d92f5915a
Merge remote-tracking branch 'origin/v8/8.5' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
2020-01-15 13:44:42 +01:00
55160f8e03
Merge remote-tracking branch 'origin/v8/8.5' into v8/8.5
2020-01-15 07:07:32 +01:00
10e5d5c7ac
bump version to 8.5.1
2020-01-15 07:06:30 +01:00
6f420b9577
Merge branch 'v8/bugfix/contentquery-search' of https://github.com/ronaldbarendse/Umbraco-CMS into ronaldbarendse-v8/bugfix/contentquery-search
2020-01-15 12:18:52 +11:00
a341079442
Merge pull request #7458 from umbraco/v8/hotfix/7457-external-modelsbuilder-issue-missing-di-registration
...
Hotfix - Missing registration in IOC when running external MB
2020-01-15 10:40:36 +11:00
d841fdcde0
Moved the accessibiity texts created in #6315 and #5760 into visuallyhidden section to comply with other commits ( #6978 )
2020-01-14 20:35:46 +01:00
8829d7fbca
Forms dashboard: Add translations and hide icon for screen readers ( #6883 )
2020-01-14 20:13:03 +01:00
Anders Bjerner