e02624baf5
remove spaces
2020-01-23 19:32:31 +01:00
535b762f6e
reverting these lines from refactoring process
2020-01-23 19:24:33 +01:00
3672048c60
clean up
2020-01-23 19:17:40 +01:00
9215575f19
remove comment
2020-01-23 19:14:22 +01:00
2f2fc72500
correct binding
2020-01-23 19:14:14 +01:00
d4d7425c24
Refactoring part 2 of umb-editor, splitview, variants.
2020-01-23 19:09:48 +01:00
f302b373ac
basic tests for segments validation
2020-01-23 17:00:14 +01:00
7fc0f01887
fixed versions for angular + npm
2020-01-23 15:23:32 +01:00
aaf53921eb
upgrade to Angular 1.7.9 + npm 6.13.6
2020-01-23 15:15:48 +01:00
58adb42930
Merge remote-tracking branch 'origin/v8/dev' into v8/feature/AB4550-segments-ui
2020-01-23 15:04:22 +01:00
30be926949
Refactorying of umb-editor, splitview, variants
2020-01-23 14:50:58 +01:00
dd78fd832c
Merge pull request #6933 from kjac/v8/fix/treepicker-retain-selected-state
...
V8: Display picked item state when navigating the treepicker
2020-01-23 13:03:09 +00:00
18e0f8d092
Merge pull request #6790 from stevemegson/v8/pr/6230
...
V8: Update TinyMCE language files
2020-01-23 12:28:51 +00:00
fd11ef6ed1
Merge pull request #7306 from umbraco/v8/bugfix/AB3323-SqlMainDom
...
Introduce a new IMainDomLock and both default and sql implementations
2020-01-23 12:44:11 +01:00
df8f281141
Merge pull request #7045 from ronaldbarendse/v8/bugfix/nested-content-defaultpropertyvalueconverters
...
Add DefaultPropertyValueConverterAttribute to core Nested Content PropertyValueConverters
2020-01-23 11:26:13 +00:00
109d9e1f7b
implement segment support
2020-01-23 11:26:55 +01:00
a9d45413c8
Merge branch 'v8/dev' into v8/contrib
2020-01-23 09:04:57 +01:00
52b93bfc9c
ensures only _sqlServerSyntax is used
2020-01-23 18:33:55 +11:00
8d7ed7dd32
adds const fixing naming
2020-01-23 16:26:13 +11:00
201927580c
Fixing accidental api signature breaking change
2020-01-23 16:23:27 +11:00
238db1c908
Merge pull request #7430 from ronaldbarendse/v8/bugfix/enum-extensions
...
Clean up EnumExtensions
2020-01-23 15:03:51 +11:00
d61090a225
#7452 set save state correctly for variant when setting schedule publishing
2020-01-22 21:27:35 +01:00
1047929880
simplifies tablename for dictionary dto
2020-01-22 13:22:09 +00:00
4a028ed22c
renaming getCultureCallbacks to getVariantCallbacks, for segment support.
2020-01-22 11:47:48 +01:00
5acca8c416
adding missing segment argument
2020-01-22 11:40:53 +01:00
c4da5703fd
Merge changes
2020-01-22 11:40:41 +01:00
1cc6a8cb45
Rename SetVariesBy to SetFlag on the enum overload
2020-01-22 11:14:31 +01:00
ac675d14e9
Fixes build errors
2020-01-22 11:13:49 +01:00
db27090ac0
Merge pull request #7233 from umbraco/v8/bugfix/6758-nucache-fix
...
When nucache updates are made the previous Gen root node is cleared
2020-01-22 11:13:43 +01:00
6c2e1b29fd
Use SetVariesBy extension methods instead of SetFlag/UnsetFlag
2020-01-22 11:10:56 +01:00
10f15a7648
Remove duplicate VariesBySegment overload after merge
2020-01-22 11:10:28 +01:00
b01f2ed35e
Merge remote-tracking branch 'upstream' into v8/bugfix/enum-extensions
2020-01-22 11:04:11 +01:00
a7b580b552
Merge branch 'v8/dev' into pr/7430
2020-01-22 10:56:21 +01:00
686e1beb74
Apply segments for validation, client side.
2020-01-22 10:40:56 +01:00
1dfdfba236
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
2020-01-22 09:39:06 +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
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
efd4512e64
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
2020-01-22 09:18:30 +01:00
794976dda7
Merge branch 'v8/dev' into v8/contrib
2020-01-22 08:55:42 +01:00
8030901184
Fix mistakes made in commit a4a6b77
2020-01-22 08:36:52 +01:00
b84961bcbc
Merge remote-tracking branch 'origin/v8/dev' into v8/bugfix/AB3323-SqlMainDom
...
# Conflicts:
# src/Umbraco.Core/Migrations/Upgrade/UmbracoPlan.cs
# src/Umbraco.Web/PublishedCache/NuCache/PublishedSnapshotService.cs
2020-01-22 07:06:43 +01:00
3fa969eef2
Merge pull request #7400 from bielu/allow-override-internalsearch-constants
...
Add possibility to override internal hardcoded configs for backoffice search
2020-01-22 11:18:32 +11: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
163c1f7028
Fix automatic merge gone wrong
2020-01-21 19:16:07 +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
0d12852cd8
Address Shannon comments
...
Add code documentation, return empty enumerable instead of allocate empty list
2020-01-21 09:07:10 +00:00
7a113ca386
Merge pull request #7482 from umbraco/v8/dev-merge-8.5
...
Merge of 8.5 into v8/dev
2020-01-21 09:03:16 +01: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
Niels Lyngsø