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

5038 Commits

Author SHA1 Message Date
Bjarke Berg
d7377bd9b4 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.ModelsBuilder.Embedded/Compose/ModelsBuilderComposer.cs
#	src/Umbraco.ModelsBuilder.Embedded/Configuration/ModelsBuilderConfig.cs
#	src/Umbraco.Web.UI/Umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/web.Template.Debug.config
#	src/Umbraco.Web/Editors/ContentController.cs
#	src/Umbraco.Web/Editors/DataTypeController.cs
#	src/Umbraco.Web/Editors/MacrosController.cs
#	src/Umbraco.Web/Models/Mapping/ContentPropertyBasicMapper.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
 2020-01-21 10:51:04 +01:00
Bjarke Berg
1ee09af4f3 7368 - Updated view to use the new name of ReplaceLineBreaksForHtml 2020-01-21 09:01:11 +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
8cc78631a0 Adds TestData project along with test endpoints for enabling/disabling segments 2020-01-21 13:33:39 +11:00
Benjamin Carleski
94f42c3223 Update package references to fix compilation error 2020-01-17 17:21:50 -08:00
Bjarke Berg
6d92f5915a Merge remote-tracking branch 'origin/v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-15 13:44:42 +01:00
Bjarke Berg
10e5d5c7ac bump version to 8.5.1 2020-01-15 07:06:30 +01:00
Shannon
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
Sebastiaan Janssen
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
Niels Lyngsø
61eaf20954 added missing function, forgotten in a previous commit. 2020-01-08 12:12:11 +01:00
Bjarke Berg
c7f60d8312 AB3986 - Wrapped System.Web.Hosting.IRegisteredObject in the AspNetHostingEnvironment. Updated Maindom to use our own new interface and the wrapper and moved to infrastructure. Removed the Umbraco.Core project now that it was empty. 2020-01-08 09:01:58 +01:00
Jan Skovgaard
ddb0bd6bd9 Healthcheck dashboard: Add translations (#6887) 2020-01-07 15:41:06 +01:00
Bjarke Berg
58f9b48e16 Merge branch 'netcore/dev' into netcore/feature/AB3677-remove-current-from-core 
# Conflicts:
#	src/Umbraco.Abstractions/UriExtensions.cs
#	src/Umbraco.Tests/Web/Controllers/ContentControllerTests.cs
#	src/Umbraco.Web/Editors/Filters/MemberSaveModelValidator.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/Editors/TemplateController.cs
#	src/Umbraco.Web/Models/Mapping/PropertyTypeGroupMapper.cs
#	src/Umbraco.Web/PropertyEditors/FileUploadPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/UserPickerPropertyEditor.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2020-01-07 09:46:42 +01:00
Bjarke Berg
09b480919b Merge remote-tracking branch 'origin/netcore/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Web.UI/config/umbracoSettings.Release.config
 2020-01-07 07:35:34 +01:00
Jan Skovgaard
161faec2b1 User group picker: Fix accessibility issues (#6994) 2020-01-06 22:27:36 +01:00
Jan Skovgaard
9c69504fac Add label, styling and dictionary items (#6984) 2020-01-06 21:17:12 +01:00
Niels Odgaard
91b36fc512 #6896 - Added notifications for Cultures and Hostnames save event. Notifcations are in english and danish so far. (#6899) 2020-01-06 20:29:57 +01:00
Jan Skovgaard
617216e0c9 Startup dashboard: Add view fallback translations (#6884) 2020-01-06 20:08:41 +01:00
Bjarke Berg
44a36227f9 Merge pull request #7356 from umbraco/netcore/feature/AB4227-move-files-to-infrastructure 
Netcore/feature/ab4227 move files to infrastructure
 2020-01-06 14:59:17 +01:00
Sebastiaan Janssen
d988d07c5d Merge branch 'v8/dev' into v8/contrib 2020-01-06 14:34:17 +01:00
Poornima Nayar
9d30b1acc0 Feature/media provide screen reader context remove files (#6919) 2020-01-03 20:23:47 +01:00
Dennis Adolfi
f3b542f1c2 Temp/Missing-swedish-translations (#7046) 
* Added a few missing swedish translations.

* Found two more translations missing for swedish

* User translations

* fond some more

* found some more translations missing
 2020-01-03 16:04:36 +00:00
Warren Buckley
ad53b76308 Merge branch 'v8/8.5' into v8/dev 
# Conflicts:
#	src/SolutionInfo.cs
 2020-01-03 11:59:05 +00:00
Poornima Nayar
87199ca91c @poornimanayar Changed the styles from warning to danger for the confirm delete button, added localization keys 2020-01-02 19:28:20 +01:00
Andy Butland
32e46b0f0c Added user and member password configuration to release config. 2019-12-24 08:05:33 +01:00
Andy Butland
0670caee15 Populated user and member password configuration from settings file. 2019-12-23 14:35:39 +01:00
Dirk Seefeld
07924e7627 Update de.xml 
Based on 8.3.0 release
 2019-12-22 18:40:31 +01:00
Sebastiaan Janssen
c1bffefd23 Merge branch 'v8/dev' into v8/contrib 2019-12-20 11:55:36 +01:00
Warren Buckley
ed0aa7f14a Use DetectIsJson string extension as opposed to a horrible try/catch 2019-12-20 09:55:03 +00:00
Niels Swimberghe
e578ca1b0f Add KeepAlive settings to resolve #7116 (#7164) 2019-12-20 08:14:42 +01:00
Warren Buckley
1fc2c89ea6 Updates the HTML Razor Partial View for grid cell items that use Embed 
It has been recently updated in 8.2.0 that the Value stored is a JSON object containing width, height & the raw HTML returned by the oEmbed

Fixes #7178
 2019-12-19 16:01:55 +00:00
Bjarke Berg
dfeb97caa4 AB3677 - Moved usages of Current (Core) to Current (Web) 2019-12-19 15:53:50 +01:00
Bjarke Berg
d5527f0485 AB3677 - Removed lot of stuff from Current (Core) and uses Current (Web) instead 2019-12-19 10:43:34 +01:00
Warren Buckley
fa2bbcc358 V8: Add in Recycle Bin context message (#7341) 
* Add a message bar to give context that this node/content item is in the trash/recycle bin

* Update umb-variant-content.html

* Update en.xml

* Update en_us.xml
 2019-12-19 09:38:44 +01:00
Sebastiaan Janssen
8b225b8e58 Merge branch 'v8/dev' into v8/contrib 2019-12-19 09:18:02 +01:00
Dennis Adolfi
a835aa0674 v8: Updated search component to get translated placeholder "Search.." and "Clear" text (#7122) 
* Added translation for clear with marker so I can see if it loads correcly. Installing Umbraco locally to try it out.

* Added Clear translation to en.xml, en-us.xml and sv.xml.

* befin translation search placeholder. Not working for some reason, investiagte.

* Inject localizationService to localize placeholder. For some reason i get 503 service unavabile when I try to build.ps1. Will have to look more into this late, saving my work.

* merge conflicts

* 2 vs 4 spaces caused massive diff. Fixed my local copy to same space so now it should look better.

* * updated after PR review. Using localize element attribute instead of adding dependency to the localizationService. Also added dansih translation.

* Remove whitespace noise
 2019-12-19 08:25:42 +01:00
Rachel Breeze
578a725d7c V8: Accessibility Changes For umbEditorHeader Directive (settings section) (#6986) 
* Improved accessibility of the data type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Improved accessibility of the macro edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Improved accessibility of the relation type edit controller, by implementing the new header directive properties for screen reader only text, and for setting the page title

* Added to do note for log viewer
 2019-12-18 14:37:34 +01:00
Niels Lyngsø
5939d02e49 remove line break 2019-12-17 16:19:48 +01:00
Niels Lyngsø
746bcb3571 updated badge animation and position to be center aligned. 2019-12-17 15:42:20 +01:00
Niels Lyngsø
9640f05582 updated previewBadge with option to open in PreviewMode in BackOffice and with new styling 2019-12-17 13:50:35 +01:00
Niels Lyngsø
e215d19f96 only show languages if we have any + select default if none is selected + right align dropdown menu 2019-12-16 16:31:04 +01:00
Niels Lyngsø
526b1e8b82 changed svg to icon 2019-12-16 15:05:58 +01:00
Warren Buckley
b78d8fa3e1 Merge pull request #6795 from umbraco/v8/feature/mb-embed 
V8: Embed models builder
 2019-12-16 11:42:01 +00:00
Bjarke Berg
76e1f30594 Fixed broken view 2019-12-10 15:01:11 +01:00
Bjarke Berg
aa15f89275 Merge remote-tracking branch 'origin/v8/feature/media-tracking' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Models/IDataValueEditor.cs
#	src/Umbraco.Abstractions/Models/RelationType.cs
#	src/Umbraco.Core/Contants-UdiEntityType.cs
#	src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
#	src/Umbraco.Core/Udi.cs
#	src/Umbraco.Tests/Models/RelationTests.cs
#	src/Umbraco.Tests/Models/RelationTypeTests.cs
#	src/Umbraco.Tests/Persistence/Repositories/MediaRepositoryTest.cs
#	src/Umbraco.Tests/Persistence/Repositories/UserRepositoryTest.cs
#	src/Umbraco.Tests/Published/NestedContentTests.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTestBase.cs
#	src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
#	src/Umbraco.Tests/Services/ContentServicePerformanceTest.cs
#	src/Umbraco.Tests/Testing/UmbracoTestBase.cs
#	src/Umbraco.Tests/Web/TemplateUtilitiesTests.cs
#	src/Umbraco.Web/Editors/MediaController.cs
#	src/Umbraco.Web/PropertyEditors/GridPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/NestedContentPropertyEditor.cs
#	src/Umbraco.Web/PropertyEditors/RichTextPropertyEditor.cs
#	src/Umbraco.Web/Runtime/WebInitialComposer.cs
#	src/Umbraco.Web/Templates/TemplateUtilities.cs
#	src/Umbraco.Web/UmbracoComponentRenderer.cs
 2019-12-10 14:44:42 +01:00
Niels Lyngsø
86c6fd5873 dropdown menus for preview 2019-12-10 14:07:09 +01:00
Niels Lyngsø
6c0cb723c6 new preview UI prototype 2019-12-10 09:40:41 +01:00
Warren Buckley
ba82e51c72 Bumped to 8.5.0 
powershell .\build setumbracoversion 8.5.0
 2019-12-06 09:48:35 +00:00
mikkelhm
7c5a2dd6f1 Close unclosed key element in italian language file 2019-12-05 08:35:49 +01:00
Bjarke Berg
1da4429177 Merge remote-tracking branch 'origin/v8/dev' into netcore/dev 
# Conflicts:
#	src/Umbraco.Abstractions/Exceptions/ConnectionException.cs
#	src/Umbraco.Abstractions/Exceptions/DataOperationException.cs
#	src/Umbraco.Abstractions/Exceptions/InvalidCompositionException.cs
#	src/Umbraco.Abstractions/IO/MediaFileSystem.cs
#	src/Umbraco.Abstractions/IO/PhysicalFileSystem.cs
#	src/Umbraco.Abstractions/Migrations/DataLossException.cs
#	src/Umbraco.Abstractions/Models/Entities/EntitySlim.cs
#	src/Umbraco.Abstractions/Xml/UmbracoXPathPathSyntaxParser.cs
#	src/Umbraco.Abstractions/Xml/XmlHelper.cs
#	src/Umbraco.Core/Manifest/ManifestParser.cs
#	src/Umbraco.Core/Models/ContentRepositoryExtensions.cs
#	src/Umbraco.Core/Models/PropertyType.cs
#	src/Umbraco.Core/Persistence/UmbracoDatabaseFactory.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RegexValidator.cs
#	src/Umbraco.Core/PropertyEditors/Validators/RequiredValidator.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Web/Editors/Filters/ContentModelValidator.cs
#	src/Umbraco.Web/Mvc/AreaRegistrationExtensions.cs
 2019-12-02 13:51:07 +01:00