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

1642 Commits

Author SHA1 Message Date
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
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
Sebastiaan Janssen
0ba5a0ab25 Merge branch 'v8/dev' into v8/contrib 2020-01-14 08:46:43 +01:00
Shannon
63fab6a56b adds notes 2020-01-14 11:47:31 +11:00
Shannon
d9d3e6847f Merge remote-tracking branch 'origin/v8/dev' into v8/feature/7212-segment-support 2020-01-13 21:33:26 +11:00
Shannon Deminick
eeb4f172bc Merge pull request #7212 from PerplexDaniel/feature/backoffice-segment-support-server 
Segments in Backoffice: Server code
 2020-01-13 21:31:24 +11:00
Dave Woestenborghs
eeaa5a82d4 V8/doctype tours (#6980) 2020-01-10 10:39:22 +01:00
Poornima Nayar
1cd30aae99 Merge pull request #6943 from kjac/v8/fix/protect-system-media-types 
V8: Protect "system media types" from alias changes and deletion
 2020-01-09 14:18:10 +00:00
Bjarne Fyrstenborg
0dfd7679e0 Request datatype by guid (#6847) 2020-01-08 19:02:16 +01:00
Daniël Knippers
24afe3f130 Changed ArgumentException to InvalidOperationException 2020-01-07 09:34:12 +01:00
Rob Maas
809ab6d05f Added ContentApps for Members (#6670) 2019-12-18 10:43:41 +01:00
Daniël Knippers
491ab5c44f Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into feature/backoffice-segment-support-server 2019-11-22 14:06:10 +01:00
Daniël Knippers
06074ead44 Merge branch 'v8/dev' of https://github.com/umbraco/Umbraco-CMS into pr/6691_vary-by-culture-set-unset-culture-flag-only 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentTypeMapDefinition.cs
 2019-11-22 09:08:27 +01:00
Warren Buckley
9fea3ea500 Merge branch 'feature/5702-custom-validation-messages' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-feature/5702-custom-validation-messages 
# Conflicts:
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
 2019-11-21 10:10:15 +01:00
Shannon Deminick
b68f1d44f1 Merge pull request #6599 from ronaldbarendse/v8/bugfix/5947-custom-exceptions 
Fixed and cleaned up custom exception classes
 2019-11-21 19:21:19 +11:00
Andy Butland
12fa862ee6 Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-11-19 11:53:33 +01:00
Ronald Barendse
34008edd34 Fix issues with added PanicException 2019-11-15 09:15:12 +01:00
Jeavon
88f6ddeae4 Code tweaks from PR review - also led to adding logging for Deserialization issues and therefore needing to mock the logger for the tests 2019-11-13 12:07:11 +00:00
Daniël Knippers
965d6cbeb7 Added enum extension methods + tests for SetFlag and UnsetFlag. 2019-10-30 11:04:53 +01:00
Jeavon
04004876b1 Merge branch 'v8/dev' into v8/feature/search-media-files 2019-10-29 12:13:09 +00:00
Kenn Jacobsen
546a948d0b Protect "system media types" from alias changes and deletion 2019-10-29 12:13:42 +01:00
Kenn Jacobsen
b1037786ca V8: Use member type icon in member pickers (#6696) 2019-10-24 20:46:01 +02:00
Bjarke Berg
c072015288 Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB2913-DataTypeTracking 
# Conflicts:
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
 2019-10-21 09:40:21 +02:00
Bjarke Berg
ba215f8700 fix name to follow the class name 2019-10-21 09:34:35 +02:00
Daniël Knippers
1a92dbfd8f Properly set / unset Culture flag instead of removing _all_ flags when "Vary by Culture" is false. 2019-10-15 10:54:51 +02:00
Daniël Knippers
1da29b29b9 Only set segment on property when property can be varied by segment 2019-10-11 14:48:55 +02:00
Daniël Knippers
813998a614 Support for saving edited segment values 2019-10-11 14:48:54 +02:00
Daniël Knippers
8f0ee6d711 Added support for all 4 cases in ContentVariantMapper 2019-10-11 14:48:54 +02:00
Daniël Knippers
74727a179c Adds Segment to ContentItemDisplay and update Variants to include segmented variants. 2019-10-11 14:48:54 +02:00
Claus
ec6b38175c Merge pull request #6458 from umbraco/fix/6377-disable-deleting-sensitive-data-user-group 
Disallow deleting "Sensitive data" user group
 2019-10-10 10:59:37 +02:00
Bjarne Fyrstenborg
0567ed9a34 Fix incorrect path in member group mapping 2019-10-09 10:15:45 +02:00
Shannon
ac300179e6 Adds new endpoint to DataTypeController to return the correct data and wires that up to angular 2019-10-09 15:19:03 +11:00
Ronald Barendse
ed90e71f76 Removed usage of obsoleted ArgumentNullOrEmptyException 2019-10-07 22:10:21 +02:00
Jeavon
68866e9faf Adding a constant for the new field name 2019-10-04 11:17:36 +01:00
Jeavon
e4df2f4205 Add ability for editors to search for media items by file name as well as node name. 2019-10-03 17:46:18 +01:00
Shannon
b4c6930c11 Merge branch 'v8/8.2' into v8/dev 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/common/services/mediahelper.service.js
#	src/Umbraco.Web.UI/Umbraco/config/lang/en_us.xml
 2019-10-02 10:47:09 +02:00
Shannon
aed32afd0f Revert copy-paste property editors, will move to a diff branch 2019-10-02 10:41:00 +02:00
Andy Butland
0fe373259b Merge branch 'v8/dev' into feature/5702-custom-validation-messages 2019-09-30 18:45:00 +02:00
Rasmus John Pedersen
ae6004166f Disallow deleting "Sensitive data" user group 2019-09-26 18:40:45 +02:00
Rasmus John Pedersen
6beb84442c Disable rename alias of system user groups 2019-09-26 18:34:48 +02:00
Kenn Jacobsen
2cbed6c6b0 Merged with v8/dev 2019-09-09 11:22:39 +02:00
Kenn Jacobsen
604bb6b526 Don't allow selecting non-element types when composing element types 2019-09-05 17:57:40 +02:00
Andy Butland
8fdc14f360 Added metadata indicating if document published for content picker display 2019-08-29 14:27:31 +02:00
Benjamin Carleski
289d50d170 Fix FIPS compliance, add FIPS tests (#5978) 
(cherry picked from commit e495faf83c)
 2019-08-07 19:34:13 +02:00
Shannon
16d8f8846e Adds PanicException with details instead of throwing "panic" strings 2019-07-30 22:40:15 +10:00
Kenn Jacobsen
742a664ec3 Merged with v8/dev 2019-07-12 22:38:43 +02:00
Bjarke Berg
c5f1cc15fd Refactored dataTypeId when a guid into dataTypeKey 2019-07-03 08:33:30 +02:00
Shannon
f7382255c2 Fixes N+1 Issues caused by the new bypass start nodes changes 2019-07-03 13:16:40 +10:00
Bjarke Berg
e6484687e5 Small fixes after v7 to v8 merge regarding the bypass security feature 2019-07-02 11:17:23 +02:00