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

5056 Commits

Author SHA1 Message Date
Niels Lyngsø
678ceba1a8 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB6057-segment-feature 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/content/umbvariantcontenteditors.directive.js
#	src/Umbraco.Web.UI.Client/src/common/directives/components/umbgroupsbuilder.directive.js
#	src/Umbraco.Web.UI.Client/src/common/services/servervalidationmgr.service.js
 2020-04-27 12:58:29 +02:00
Sebastiaan Janssen
d65041c250 Merge branch 'v8/dev' into v8/contrib 2020-04-27 11:03:32 +02:00
Niels Lyngsø
291d5167b1 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 2020-04-17 09:42:25 +02:00
Shannon
d5e2c12685 fixes merge issue 2020-04-17 13:20:57 +10:00
Bjarke Berg
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
Bjarke Berg
b09d736c1b Bump verison to 8.6.1 2020-04-16 13:47:23 +02:00
Niels Lyngsø
0e8591c728 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 2020-04-16 07:52:43 +02:00
Mike Masey
23e32d2b59 improvement: update umb-tabs to use better semantic markup (#7926) 2020-04-10 20:42:43 +02:00
Jan Skovgaard
3e9c759426 Move the infinite overlay to the same source order as regular o… (#7923) 2020-04-10 17:41:31 +02:00
Mike
766a6df967 feat: add localisation for add new row button 2020-04-10 17:23:07 +02:00
Sebastiaan Janssen
8cba80913a Remove generated files from git and ignore them 2020-03-30 13:38:17 +02:00
Sebastiaan Janssen
8cd537cc96 Merge branch 'v8/8.5.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:03:38 +01:00
Sebastiaan Janssen
5531c7300d Update dependency for 8.5.5 
(cherry picked from commit 2d3388d6d3)

# Conflicts:
#	src/SolutionInfo.cs
 2020-03-19 14:02:01 +01:00
Warren Buckley
2d3388d6d3 Update dependency for 8.5.5 2020-03-12 15:52:23 +01:00
Niels Lyngsø
d4dae19888 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui-variant-picker 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/validation/valpropertymsg.directive.js
#	src/Umbraco.Web.UI.Client/src/less/sections.less
 2020-03-11 12:00:19 +01:00
Warren Buckley
69483d03b6 Set version to 8.6.0 
.\build SetUmbracoVersion 8.6.0
 2020-03-09 09:57:22 +00:00
Matthew-Wise
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
Niels Lyngsø
27b239cc08 making variant dialogs up to date with Segments. 2020-02-19 17:25:08 +01:00
Niels Lyngsø
602ee33334 use "and" instead of & 2020-02-19 15:35:46 +01:00
Niels Lyngsø
490ce0808a Save & publish dialog change for a simpler experience accommodating segments 2020-02-19 13:28:46 +01:00
Niels Lyngsø
2cd50822ea adjustments of Save and publish dialog 2020-02-19 09:35:36 +01:00
abi
a7ad464b40 Remove Empty Statements 2020-02-12 15:11:18 +01:00
Warren Buckley
9c428b7f01 Bump version to 8.5.4 2020-02-12 11:55:51 +00:00
Niels Lyngsø
87b9642d1a Merge branch 'v8/feature/AB4550-segments-clientcode' into v8/feature/AB4550-segments-ui-variant-picker 2020-02-10 11:34:29 +01:00
Benjamin Carleski
a7ff20de6e Introduce Image URL Generator abstraction 2020-02-07 15:01:03 -08:00
Niels Lyngsø
555be8dd0a first part of enabling allow segments 2020-02-06 12:47:50 +01: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
a076f10765 Merge branch 'v8/contrib' into pr/5626 2020-01-30 10:29:57 +00:00
Kenn Jacobsen
b6a073a12e Add missing documentation for web.routing in umbracoSettings.config (#7468) 
Cheers Kenn :)
 2020-01-29 16:54:56 +00: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
Sebastiaan Janssen
41dc8d915b Merge branch 'v8/dev' into v8/contrib 2020-01-26 10:37:11 +01:00
Warren Buckley
8bf457a88d Set v8/dev to 8.7.0 with powershell .\build setumbracoversion 8.7.0 2020-01-24 09:10:54 +00:00
Bjarke Berg
257ea6c1c3 Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-24 09:32:34 +01:00
Bjarke Berg
4cf78d6ef0 Bump version to 8.5.3 2020-01-24 09:22:34 +01:00
Sebastiaan Janssen
d45ef632f1 Merge branch 'v8/dev' into v8/contrib 2020-01-24 09:01:37 +01:00
Bjarke Berg
384ecbe22a Removed reference from Umbraco.Web.UI to Umbraco.TestData 2020-01-24 08:25:03 +01:00
Sebastiaan Janssen
a9d45413c8 Merge branch 'v8/dev' into v8/contrib 2020-01-23 09:04:57 +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
Anders Bjerner
63bd28f8c1 Merge pull request #7477 from MarcStoecker/patch-4 
Fix typo in DE "installFinish" caption
 2020-01-21 23:01:58 +01:00
Anders Bjerner
fecd09cf9d Merge pull request #7488 from JeffDess/v8/contrib 
Fix typo in contentTypeSavedHeader French label
 2020-01-21 22:48:46 +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
Jean-François Dessureault
204e0841af Fix typo in contentTypeSavedHeader French label 
"documet" should read "document"
 2020-01-21 10:48:21 -05: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
Shannon
8cc78631a0 Adds TestData project along with test endpoints for enabling/disabling segments 2020-01-21 13:33:39 +11:00
Marc Stöcker
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
Andy Butland
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
Bjarke Berg
5ddc4b8efb Bump version to 8.5.2 2020-01-17 11:51:31 +01:00
Sebastiaan Janssen
12e88fde42 Merge branch 'v8/dev' into v8/contrib 2020-01-17 10:07:06 +01:00
Kieron Boswell
f5a5a9a297 Spelling mistake in comments of partial snippet (#6975) 2020-01-16 17:19:54 +01:00