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

21476 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alan Mac Kenna
2caad3f2d0 change newsletter subscribe to default for installation process 2018-02-23 11:24:15 +00: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
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
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
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
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
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
f4c038c64c Add translations of "Save and publish". 2018-02-12 18:04:46 +01:00
Mikulas Tomanka
d51cda7843 Merge pull request #2440 from ProNotion/patch-1 
Fixed typo on user section of tour
 2018-02-12 13:32:10 +01:00
Claus
372ffee42b Merge pull request #2437 from umbraco/temp-UAASSCRUM-1365 
allowing to disable the template check when sending content through t…
 2018-02-12 11:15:26 +01:00
Claus
c1cfea7ebd removing constructor. 2018-02-12 11:12:46 +01:00
ProNotion
d3a2d88347 Fixed type on user section 2018-02-09 17:33:11 +00:00
Claus
93f4d65227 Merge pull request #2438 from umbraco/temp-U4-10958 
Fixes broken MNTP by switching convert cases to the correct DataType
 2018-02-09 14:42:08 +01:00
Robert
a4c0342bda Fixes broken MNTP by switching convert cases to the correct DataType 2018-02-09 14:09:03 +01:00
Sebastiaan Janssen
6c328d729d Merge pull request #2435 from madsoulswe/temp-U4-10953 
U4-10953- Help-drawer, (caption + h3 -> h5
 2018-02-09 13:32:32 +01:00
Sebastiaan Jansssen
095633ba27 Test names were inverted 2018-02-09 13:27:25 +01:00
Claus
633d1bb0ae changing the template check to an enabled check instead. 2018-02-09 13:19:56 +01:00
Claus
fb89c3da3c allowing to disable the template check when sending content through to render. 2018-02-09 12:58:50 +01:00
Sebastiaan Jansssen
3097a46ab3 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
 2018-02-09 09:57:00 +01:00
Sebastiaan Jansssen
c63156fcd8 Bump version to 7.7.11 
(cherry picked from commit 0c25c36af0)
 2018-02-09 09:53:52 +01:00
Stephan
84a90884e3 Merge pull request #2433 from umbraco/temp-U4-10947 
Fix for not being able to save decimal value
 2018-02-09 08:14:51 +01:00
Shannon
d29b7311fa reverts the convertible2 back to what it was before 2018-02-09 10:08:25 +11:00
Shannon
17b59cc20f Updates the ObjectExtensions TryConvertTo code and moved all unit tests to ObjectExtensionsTests which now all pass 2018-02-09 10:02:51 +11:00
Robert
4423571eaa Added ConvertToNullableDecimalTest and check that fixes the decimal save issue 2018-02-08 16:21:09 +01:00
Dennis Öhman
750600b202 U4-10953 
Populate Caption in dashboardhelper
h2 -> h5
 2018-02-08 15:37:50 +01:00
Sebastiaan Jansssen
28eb4ff03a Bump version to 7.8.1 2018-02-08 14:08:38 +01:00
Sebastiaan Jansssen
79517f171c Update UI.xml when upgrading 2018-02-08 14:07:54 +01:00
Stephan
e76c42f874 Merge pull request #2434 from umbraco/temp-U4-U4-10950 
Fix checkbox in nested content
 2018-02-08 13:42:42 +01:00