Sebastiaan Janssen
9421a92610
Merge pull request #2482 from umbraco/temp-u4-11018
...
Fix tabs issue
2018-02-27 15:48:48 +01:00
Stephan
cec71f5651
Fix tabs issue
2018-02-27 14:52:12 +01:00
Sebastiaan Jansssen
7ee510ed38
Fix formatting
2018-02-26 16:28:12 +01:00
Sebastiaan Jansssen
136e9e66d2
Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9
2018-02-26 16:26:54 +01:00
Shannon
55a2eb5b6c
Merge branch 'dev-v7.9' of https://github.com/umbraco/Umbraco-CMS into dev-v7.9
2018-02-27 01:39:05 +11:00
Shannon
0c2c12fdd9
ensures that the template cache is cleared on startup if it hasn't been tracked in local storage
2018-02-27 01:38:53 +11:00
Sebastiaan Jansssen
ec427afe14
Spelling
2018-02-26 15:19:45 +01:00
Shannon
155a304ce3
Allows GUID to be passed to ContentTreeControllerBase
2018-02-27 01:17:21 +11:00
Shannon
161a19a82b
Adds cache busting for TinyMCE
2018-02-27 01:12:17 +11:00
Shannon
e40ed5e858
not full caps for col name
2018-02-27 00:47:03 +11:00
Shannon
1ffbd734c8
Changes column and model for auditing to EventDateUtc
2018-02-27 00:46:09 +11:00
Shannon
fd5bc49c87
Audits the member being exported, moves the export method to the service (again) but returns a proper model this time and raises an event, adds error checking to the export http request
2018-02-27 00:40:43 +11:00
Shannon Deminick
2301a00cd1
Merge pull request #2480 from umbraco/temp-U4-10794-2
...
Makes methods on IConsentService more explicit to allow mo
2018-02-26 22:43:26 +10:00
Shannon Deminick
313f7967cb
Merge pull request #2479 from umbraco/temp-U4-10900-2
...
Fixes for U4-10900 Individual member data export functionality
2018-02-26 22:41:03 +10:00
Shannon
6adaa1f70c
adds a notification when the member gets exported
2018-02-26 23:37:20 +11:00
Shannon
8960b0828e
simplifies the exporter even more, no more reflection, no more streams
2018-02-26 23:23:25 +11:00
Shannon
397ab0e979
Merge branch 'dev-v7.9' into temp-U4-10900-2
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/views/member/export.html
2018-02-26 23:13:58 +11:00
Shannon
15c803b975
Changes how the json response is created
2018-02-26 23:12:33 +11:00
Shannon
d62b36ae5b
Merge branch 'temp-U4-10900-2' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10900-2
2018-02-26 23:09:48 +11:00
Shannon
34506664df
Moves the member export to happen on action click, adds a helper method to download a file via XHR
2018-02-26 23:09:29 +11:00
Sebastiaan Jansssen
2557b9a7fb
Cleanup and makes a nice JSON object out of members + properties
2018-02-26 13:07:32 +01:00
Sebastiaan Jansssen
ac66dc9892
Fix member groups and don't add a line at the top
2018-02-26 12:39:02 +01:00
Robert
11e3d8c761
Merge pull request #2474 from umbraco/temp-u4-10688
...
U4-10688 Obsolete property editors showing
2018-02-26 12:37:53 +01:00
Shannon Deminick
22b9941822
rename to match file naming conventions
2018-02-26 22:28:41 +11:00
Sebastiaan Jansssen
b5b17a466b
Cleanup and moving data to json format
2018-02-26 12:03:46 +01:00
Shannon
2c5b37a842
CHanges back to IConsentService but keeps method name changes
2018-02-26 21:56:00 +11:00
Niels Hartvig
ae864a3b19
Mark old package installed Nested Content obsolete so it doesn't come up in the list
2018-02-26 11:32:58 +01:00
Mads Rasmussen
449e464a14
Merge branch 'mathiasrando-U4-10883' into dev-v7.9
2018-02-26 09:47:13 +01:00
Mads Rasmussen
5f72eb74db
use attr to control button size + remove disabled state
2018-02-26 09:26:14 +01:00
Niels Hartvig
fa85ce39c7
Changes filter of deprecated property editors to be on controller level instead of resolver
2018-02-26 09:22:54 +01:00
Shannon
bdea519770
Changes from IConsentService to ILawfulDataProcessService to allow more flexibility with GDPR data processing in the future
2018-02-26 17:07:06 +11:00
Shannon
78657f34d6
I have updated the Consent.HistoryInternal to internal
2018-02-26 16:51:34 +11:00
Shannon
e8fd7e2373
Fixes for U4-10900 Individual member data export functionality
2018-02-26 15:02:47 +11:00
Niels Hartvig
3da9fddd64
U4-10688 Obsolete property editors showing
...
Please be aware that if you do have obsolete property editors in use and set the setting "showDeprecatedPropertyEditors" to false you'll get an exception.
2018-02-24 21:31:10 +10:00
Sebastiaan Jansssen
e1821697d4
Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
2018-02-24 11:53:28 +01:00
Sebastiaan Jansssen
a7756afae6
Bump version to 7.8.2
2018-02-24 11:50:39 +01:00
Sebastiaan Jansssen
fcd3bb2eee
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
...
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.html
2018-02-24 11:48:20 +01:00
mikkelhm
cf5dac0ddd
fix xml in spanish lang file
...
(cherry picked from commit 2281cd8291 )
2018-02-23 22:23:07 +01:00
Sebastiaan Janssen
1cdf5c042e
Merge pull request #2473 from umbraco/temp-fix-spanish-language-xml
...
fix xml in spanish lang file
2018-02-23 22:19:10 +01:00
mikkelhm
2281cd8291
fix xml in spanish lang file
2018-02-23 22:02:47 +01:00
Robert
fa68f7fafe
Merge pull request #2445 from bjarnef/dev-v7-U4-10966
...
U4-10966 - Single/Multiple Media Picker is messed up when dragging images
2018-02-23 15:15:36 +01:00
Mads Rasmussen
898e39dac5
Merge branch 'U4-10883' of git://github.com/mathiasrando/Umbraco-CMS into mathiasrando-U4-10883
2018-02-23 14:49:50 +01:00
Sebastiaan Jansssen
f6045a49b5
Bump version to 7.7.13
2018-02-23 14:22:53 +01:00
Sebastiaan Jansssen
849cd4d315
Merge remote-tracking branch 'origin/dev-v7.8' into dev-v7.9
2018-02-23 13:49:57 +01:00
Sebastiaan Jansssen
10141bf4f6
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8
...
# Conflicts:
# src/Umbraco.Web/Mvc/RenderRouteHandler.cs
2018-02-23 13:49:20 +01:00
Sebastiaan Janssen
11fcc8cd65
Merge pull request #2469 from umbraco/temp-U4-10900
...
Export member data functionality
2018-02-23 13:44:01 +01:00
Sebastiaan Jansssen
95aaf40281
Some more code cleanup and making sure we pass in the current user so that we can't avoid the sensitivedata check easily
2018-02-23 13:38:21 +01:00
Robert
e25a39ec5d
Merge pull request #2472 from umbraco/temp-U4-10964
...
Temp u4 10964
2018-02-23 13:33:47 +01:00
Sebastiaan Jansssen
c165a34ed7
U4-10964 Adding a new property to a MemberType if you are not in Sensitive Data group throws a 404 when saving
2018-02-23 13:17:24 +01:00
Sebastiaan Janssen
dc616bb6bf
Merge pull request #2471 from alanmac/U4-11007
...
change newsletter subscribe to default for installation process - GDPR Compliance
2018-02-23 12:48:26 +01:00