d5e2c12685
fixes merge issue
2020-04-17 13:20:57 +10:00
d2f361e816
Merge remote-tracking branch 'origin/v8/8.6' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Tests/PublishedContent/NuCacheChildrenTests.cs
2020-04-16 18:54:45 +02:00
b09d736c1b
Bump verison to 8.6.1
2020-04-16 13:47:23 +02:00
8cba80913a
Remove generated files from git and ignore them
2020-03-30 13:38:17 +02:00
8cd537cc96
Merge branch 'v8/8.5.5' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
2020-03-19 14:03:38 +01:00
5531c7300d
Update dependency for 8.5.5
...
(cherry picked from commit 2d3388d6d3
2020-03-19 14:02:01 +01:00
2d3388d6d3
Update dependency for 8.5.5
2020-03-12 15:52:23 +01:00
69483d03b6
Set version to 8.6.0
...
.\build SetUmbracoVersion 8.6.0
2020-03-09 09:57:22 +00:00
4dc5b02b89
Changed showPage to Save and publish updated button style to link ( #7649 )
...
* Changed showPage to Save and publish updated button style to link
* Change language key from showPage to saveAndPreview
2020-02-26 13:44:57 +00:00
a7ad464b40
Remove Empty Statements
2020-02-12 15:11:18 +01:00
9c428b7f01
Bump version to 8.5.4
2020-02-12 11:55:51 +00:00
a7ff20de6e
Introduce Image URL Generator abstraction
2020-02-07 15:01:03 -08:00
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
a076f10765
Merge branch 'v8/contrib' into pr/5626
2020-01-30 10:29:57 +00:00
b6a073a12e
Add missing documentation for web.routing in umbracoSettings.config ( #7468 )
...
Cheers Kenn :)
2020-01-29 16:54:56 +00:00
902d4196cf
add dialog for change password, shift form from user details view int… ( #7450 )
2020-01-27 06:29:04 +01:00
41dc8d915b
Merge branch 'v8/dev' into v8/contrib
2020-01-26 10:37:11 +01:00
8bf457a88d
Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0
2020-01-24 09:10:54 +00:00
257ea6c1c3
Merge remote-tracking branch 'origin/v8/8.5' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
2020-01-24 09:32:34 +01:00
4cf78d6ef0
Bump version to 8.5.3
2020-01-24 09:22:34 +01:00
d45ef632f1
Merge branch 'v8/dev' into v8/contrib
2020-01-24 09:01:37 +01:00
384ecbe22a
Removed reference from Umbraco.Web.UI to Umbraco.TestData
2020-01-24 08:25:03 +01:00
a9d45413c8
Merge branch 'v8/dev' into v8/contrib
2020-01-23 09:04:57 +01:00
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
63bd28f8c1
Merge pull request #7477 from MarcStoecker/patch-4
...
Fix typo in DE "installFinish" caption
2020-01-21 23:01:58 +01:00
fecd09cf9d
Merge pull request #7488 from JeffDess/v8/contrib
...
Fix typo in contentTypeSavedHeader French label
2020-01-21 22:48:46 +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
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
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
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
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
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
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
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
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
6d92f5915a
Merge remote-tracking branch 'origin/v8/8.5' into v8/dev
...
# Conflicts:
# src/SolutionInfo.cs
2020-01-15 13:44:42 +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
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
9847b99b68
Nested content config: Add help translations ( #6909 )
2020-01-14 16:22:13 +01:00
0ec3080fe2
Help drawer: Add missing translations ( #6932 )
2020-01-14 10:33:14 +01:00
8176054432
Add label and missing translations ( #7019 )
2020-01-13 22:33:31 +01:00
4e5a433348
Merged with v8/dev
2020-01-10 16:18:29 +01:00
324f18052f
Merge branch 'v8/dev' into v8/contrib
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/users/views/groups/groups.html
# src/Umbraco.Web.UI.Client/src/views/users/views/users/users.html
2020-01-09 13:29:06 +01:00
Shannon