yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
31,970 Commits 4 Branches 7 Tags
0180b9db7d565393773ac4e7c701e9ed528ca3de
Commit Graph

10143 Commits

Author SHA1 Message Date
Niels Lyngsø
0180b9db7d fixing broken style 2020-01-24 11:05:59 +01:00
Niels Lyngsø
0b8cffabc7 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui 2020-01-24 10:18:57 +01:00
Niels Lyngsø
b8ded53e6a revert to content 2020-01-23 20:00:06 +01:00
Niels Lyngsø
ba6c5a4840 rename variantHelper to contentVariantUtilities 2020-01-23 19:56:03 +01:00
Niels Lyngsø
f2edd9682b Remove this part until we see the need for this 2020-01-23 19:51:06 +01:00
Niels Lyngsø
133bec9b65 remove space 2020-01-23 19:45:17 +01:00
Niels Lyngsø
03b05a05d1 clean up 2020-01-23 19:40:41 +01:00
Niels Lyngsø
e02624baf5 remove spaces 2020-01-23 19:32:31 +01:00
Niels Lyngsø
535b762f6e reverting these lines from refactoring process 2020-01-23 19:24:33 +01:00
Niels Lyngsø
3672048c60 clean up 2020-01-23 19:17:40 +01:00
Niels Lyngsø
9215575f19 remove comment 2020-01-23 19:14:22 +01:00
Niels Lyngsø
2f2fc72500 correct binding 2020-01-23 19:14:14 +01:00
Niels Lyngsø
d4d7425c24 Refactoring part 2 of umb-editor, splitview, variants. 2020-01-23 19:09:48 +01:00
Niels Lyngsø
f302b373ac basic tests for segments validation 2020-01-23 17:00:14 +01: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
Niels Lyngsø
58adb42930 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui 2020-01-23 15:04:22 +01:00
Niels Lyngsø
30be926949 Refactorying of umb-editor, splitview, variants 2020-01-23 14:50:58 +01:00
Niels Lyngsø
109d9e1f7b implement segment support 2020-01-23 11:26:55 +01:00
Dave Woestenborghs
d61090a225 #7452 set save state correctly for variant when setting schedule publishing 2020-01-22 21:27:35 +01:00
Niels Lyngsø
4a028ed22c renaming getCultureCallbacks to getVariantCallbacks, for segment support. 2020-01-22 11:47:48 +01:00
Niels Lyngsø
5acca8c416 adding missing segment argument 2020-01-22 11:40:53 +01:00
Niels Lyngsø
686e1beb74 Apply segments for validation, client side. 2020-01-22 10:40:56 +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ø
5246e535e6 Merge remote-tracking branch 'PerplexDaniel/feature/backoffice-segment-support-client' into v8/feature/AB4550-segments-ui 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/directives/components/editor/umbeditorcontentheader.directive.js
#	src/Umbraco.Web.UI.Client/src/views/components/editor/umb-editor-content-header.html
 2020-01-22 09:22:39 +01: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
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
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
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
Kenn Jacobsen
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
Kenn Jacobsen
f3d9a01800 Hide the "Add" button for Nested Content in "single mode" (#7327) 2020-01-16 22:00:28 +00:00
Jan Skovgaard
4c68f7e53a List view configuration - Sort order distance fix (#6905) 
Thanks, Jan. You're a 🌟
 2020-01-16 15:13:25 +00:00
Kenn Jacobsen
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
Kenn Jacobsen
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
Kenn Jacobsen
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
Mike Masey
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
Jan Skovgaard
ed533697e2 Listview: Various corrections (#6904) 
Heyyyyy Jan. Thanks for this contribution. :)
 2020-01-16 13:01:40 +00:00
Kenn Jacobsen
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
Rachel Breeze
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
Jan Skovgaard
8829d7fbca Forms dashboard: Add translations and hide icon for screen readers (#6883) 2020-01-14 20:13:03 +01:00
Jan Skovgaard
9847b99b68 Nested content config: Add help translations (#6909) 2020-01-14 16:22:13 +01:00
Jan Skovgaard
0ec3080fe2 Help drawer: Add missing translations (#6932) 2020-01-14 10:33:14 +01:00
Jan Skovgaard
8176054432 Add label and missing translations (#7019) 2020-01-13 22:33:31 +01:00
Jan Skovgaard
d48b33d86d Icon picker: Accessibility improvements (#6990) 2020-01-13 22:03:34 +01:00
Kenn Jacobsen
2906eafa79 V8: Make it possible to hide anchor/querystring input in the li… (#7031) 
Wonderful work
 2020-01-10 19:14:11 +00:00
Kenn Jacobsen
2b1e330957 V8: Reset paging in user search when free text searching and fi… (#7049) 
Thanks Kenn :)
 2020-01-10 19:09:51 +00:00
Kenn Jacobsen
4a44cd3a58 V8: If Nested Content has multiple item types, always let the e… (#5429) 
Lovely work  Kenn. Thanks, as ever
 2020-01-10 19:02:39 +00:00