yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
21,598 Commits 4 Branches 7 Tags
15c803b975f0b3cc33d900673babb72b127f56e5
Commit Graph

21598 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Sebastiaan Jansssen
b5b17a466b Cleanup and moving data to json format 2018-02-26 12:03:46 +01:00
Shannon
e8fd7e2373 Fixes for U4-10900 Individual member data export functionality 2018-02-26 15:02:47 +11: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
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
Robert
cd6c7e51fd Merge branch 'temp-U4-10900' of https://github.com/umbraco/Umbraco-CMS into temp-U4-10900 2018-02-23 12:24:37 +01:00
Alan Mac Kenna
2caad3f2d0 change newsletter subscribe to default for installation process 2018-02-23 11:24:15 +00:00
Robert
4850b01097 Added checks in place to stop users that has no access to sensitive data to export member data, removed some unused usings 2018-02-23 12:23:23 +01:00
Sebastiaan Jansssen
92c0cfb9df Additional action needs to be counted in the test 2018-02-23 10:58:33 +01:00
Sebastiaan Jansssen
8c5ee547b1 Does v3 MyGet API work? 2018-02-23 10:32:49 +01:00
Sebastiaan Jansssen
b9c9a232cd Style updates, and removes unused usings 2018-02-23 10:26:11 +01:00
Sebastiaan Jansssen
b565513052 Merge branch 'dev-v7.9' into temp-U4-10900 2018-02-23 09:46:06 +01:00
Robert
cff24e6ccf Added translation keys for en.xml and deleted duplicate anchorInsert key in en_us.xml 2018-02-23 09:44:32 +01:00
Robert
8ef3ecd714 Forgot to commit the translation keys :| 2018-02-23 09:11:42 +01:00
Sebastiaan Janssen
1f66ebff1f Merge pull request #2470 from MMasey/dev-v7 
U4-11005 Examine Search tools form does not submit when pressing Enter key
 2018-02-22 18:49:17 +01:00
Sebastiaan Janssen
47f8b483a9 Merge pull request #2467 from christophnz/U4-5366 
Uduf-Hackathon U4-5366
 2018-02-22 18:46:27 +01:00
Sebastiaan Janssen
1c56cd48ae Merge pull request #2468 from emmanueltissera/U4-11002 
Fixed email address in invite email [UDUF 2018 Hackathon]
 2018-02-22 18:29:48 +01:00
Sebastiaan Janssen
6e9a9d6444 Merge pull request #2464 from lukaaaaaaaay/dev-v7.8 
Hackathon: U4-10941 Name should be before Label when adding grid row configurations
 2018-02-22 18:17:18 +01:00
Migaroez
c4850199f7 U4-10999 Fixed wrong description on mediaresource.search 
(cherry picked from commit af476e1536)
 2018-02-22 17:36:39 +01:00
Sebastiaan Janssen
679333b9c9 Merge pull request #2456 from Migaroez/U4-10999 
U4-10999 Fixed wrong description on mediaresource.search
 2018-02-22 17:33:37 +01:00
Sebastiaan Janssen
02c609747d Merge pull request #2455 from GertyEngrie/dev-v7 
Typo fix for nullreference in RenderRouteHandler
 2018-02-22 17:32:25 +01:00
Sebastiaan Janssen
413e70db7d Merge pull request #2450 from richarth/patch-1 
Grammar improvement
 2018-02-22 17:31:29 +01:00
Sebastiaan Janssen
c2cbac7ef9 Merge pull request #2448 from madsoulswe/temp-U4-10969 
U4-10969 - Removed legacy file MediaUploader.ashx
 2018-02-22 17:30:14 +01:00
Mike Masey
a4a079cd1b Merge remote-tracking branch 'upstream/dev-v7' into dev-v7 2018-02-22 16:24:15 +00:00
Mike Masey
22fc9c617c Upate search button in examin search tools to use type="submit" 2018-02-22 16:18:59 +00:00
Sebastiaan Jansssen
0bcdfc8820 Merge branch 'skartknet-spanish_translations' into dev-v7 2018-02-22 17:11:38 +01:00
Sebastiaan Jansssen
b868c06e79 Merge branch 'spanish_translations' of https://github.com/skartknet/Umbraco-CMS into skartknet-spanish_translations 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/es.xml
 2018-02-22 17:11:09 +01:00
Robert
f0dd32ea19 Removed export placeholder button and added "Action" button instead. 2018-02-22 16:52:16 +01:00
Robert
97607bc83b Added front and back end logic to export member data 2018-02-22 15:32:33 +01:00
ChristophNZ
5b41262f41 rewrote if/else to remove code duplication 2018-02-22 16:35:18 +10:00
Emmanuel Tissera
e8e1cd8323 Fixed email address in invite email 
http://issues.umbraco.org/issue/U4-11002 - Corrected issue where email address was not linked correctly in the invite template
 2018-02-22 16:30:41 +10:00
ChristophNZ
1e17d6a527 continue loop after logging warning when null 2018-02-22 16:19:21 +10:00
ChristophNZ
0d05d0bf34 Import Document Type: use ContentTypeService to search for allowed child nodes if they are not part of the imported type(s) 2018-02-22 15:53:11 +10:00