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

21509 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
Alan Mac Kenna
2caad3f2d0 change newsletter subscribe to default for installation process 2018-02-23 11:24:15 +00: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
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
Shannon
94184238a2 removes uneeded file 2018-02-22 13:19:42 +10:00
Shannon Deminick
f21d1f879e Merge pull request #2459 from dinc5150/U4-10702 
U4-10702 - Update Umb-modal icon to be consistent with other icons
 2018-02-22 14:16:25 +11:00
Luke Phelan
9c1b2499d5 swapped the name and label fields in grid row editor. 2018-02-22 14:14:35 +11:00
Shannon Deminick
60a315f964 Merge pull request #2458 from cpevans/U4-10116 
Check if user is admin to show propertyAlias regardless of debug status
 2018-02-22 14:07:13 +11:00
Chris Evans
1870d5444d check for user admin group membership to show propertyAlias regardless of debug status 
use the getCurrentUser() method of the userService to query the userGroups property of the current user
 2018-02-22 13:54:50 +13:00
David Sheiles
a927d5fb84 U4-10702 - Update Umb-modal icons to be consistant 2018-02-22 11:41:57 +11:00
Migaroez
af476e1536 U4-10999 Fixed wrong description on mediaresource.search 2018-02-21 11:02:56 +01:00
Gerty Engrie
fcfb9afc22 typo fix 2018-02-20 14:24:51 +01:00
Claus
05818f6262 Merge branch 'temp-U4-10915' into dev-v7 2018-02-20 13:39:03 +01:00
Mads Rasmussen
accf8ba5f2 Merge pull request #2444 from bjarnef/dev-v7-U4-10965 
U4-10965 - Add translations of "Save and schedule"
 2018-02-20 09:26:37 +01:00
Shannon
1788682af9 U4-10915 Umbraco automapper configuration is not valid 2018-02-20 19:16:53 +11:00
Sebastiaan Jansssen
7abc6d3d4f Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 2018-02-19 17:20:12 +01:00
Sebastiaan Jansssen
a551881ce2 TypedMember(object id) didn't know how to deal with UDI values coming in, breaking MNTP pickers 2018-02-19 17:13:03 +01:00
Sebastiaan Jansssen
567c0977d0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-19 15:37:50 +01:00
Sebastiaan Jansssen
9ec4247350 Sync en and en_us - normalize whitespace 2018-02-19 15:24:50 +01:00
Sebastiaan Jansssen
2f31175db5 Bump version to 7.7.12 2018-02-19 14:20:47 +01:00
Richard Thompson
c2722d8120 Grammar improvement 
Improved the grammar of an error message
 2018-02-16 15:19:16 +00:00
Dennis Öhman
76725aa0d8 U4-10969 - Removed legacy file MediaUploader.ashx 2018-02-15 16:12:49 +01:00
Sebastiaan Jansssen
56f4904fc0 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 2018-02-14 12:15:18 +01:00
Sebastiaan Jansssen
9178e7afcf Whoops, no need to introduce a new method here, old method was still available 2018-02-14 12:13:01 +01:00
Sebastiaan Jansssen
7746c4a014 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/PropertyEditors/ValueConverters/MultiNodeTreePickerPropertyConverter.cs
 2018-02-14 10:28:51 +01:00
Sebastiaan Janssen
b18945e630 Merge pull request #2447 from umbraco/temp-Fix-CDF-Version-Change 
Updates the CDF version changer to to use a hash of the current versi…
 2018-02-14 10:25:27 +01:00
Sebastiaan Jansssen
4640cf56d1 Make change non-breaking 2018-02-14 10:23:58 +01:00
Shannon
eae1ce7012 fixes build 2018-02-14 12:05:05 +11:00
Shannon
e900711180 Updates the CDF version changer to to use a hash of the current version and the date time so that it's not constantly updated if it's not changed. 2018-02-14 11:53:49 +11:00
Bjarne Fyrstenborg
040e45ca70 Ensure move cursor is added the multiple media picker (sortable), but not on imagepicker prevalue editor, which not has ui-sortable 2018-02-12 22:27:23 +01:00