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

14881 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
e64f0fc5c5 Fixes: U4-7654 Recycle bin now display a input instead of a readonly heading 2016-01-07 21:10:04 +01:00
Simon Busborg
896eda1022 Fixes firefox bug where it ignores inline elements width 2016-01-07 12:58:28 +01:00
Mads Rasmussen
2a0287f5ad Fixes: U4-7653 List view - input types 2016-01-06 19:29:30 +01:00
Mads Rasmussen
7cb4a47f3e Fixes: U4-7653 List view - can't remove custom layouts 2016-01-06 19:00:23 +01:00
Sebastiaan Janssen
20720cdb28 Merge branch 'dev-v7' into 7.4.0 2016-01-06 15:59:51 +01:00
Sebastiaan Janssen
d2483159bc Fixes unit tests, not all packages will have the sort order in there 2016-01-06 15:59:23 +01:00
Sebastiaan Janssen
37baeec8a9 Merge branch 'dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 15:23:47 +01:00
Sebastiaan Janssen
48ab3f580c Fixes the build 2016-01-06 15:21:45 +01:00
Sebastiaan Janssen
aa6897bfa7 Merge branch 'dev-v7' into 7.4.0 
# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 15:00:44 +01:00
Claus
c524d67a37 Fixes: U4-7553 Importing Document Type doesn't respect property sort order 
Handling sortOrder property in both import/export.

(cherry picked from commit 378479b4c1)

# Conflicts:
#	src/Umbraco.Core/Services/PackagingService.cs
 2016-01-06 14:56:31 +01:00
Sebastiaan Janssen
f1414ae000 Merge pull request #995 from umbraco/temp-U4-7553 
Fixes: U4-7553 Importing Document Type doesn't respect property sort order
 2016-01-06 14:50:21 +01:00
Claus
378479b4c1 Fixes: U4-7553 Importing Document Type doesn't respect property sort order 
Handling sortOrder property in both import/export.
 2016-01-06 14:48:37 +01:00
Sebastiaan Janssen
701dea5de7 Merge pull request #969 from umbraco/temp-U4-7591 
U4-7591 File cleanup for old editor 'tasks' and 'create' dialogs
 2016-01-06 13:43:14 +01:00
Shannon
5767cea8f2 fixes build/merge 2016-01-06 12:58:05 +01:00
Shannon
4e3cf6c608 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
	src/Umbraco.Tests/PropertyEditors/PropertyEditorValueEditorTests.cs
	src/Umbraco.Web/Editors/ContentTypeController.cs
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2016-01-06 12:54:19 +01:00
Shannon
4c3258812c normalize culture for test 2016-01-06 12:50:41 +01:00
Shannon
bc98f5e8fc code cleanup. 
Conflicts:
	src/Umbraco.Core/ObjectExtensions.cs
 2016-01-06 12:49:18 +01:00
Shannon
6f2f6c088b Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-06 12:48:36 +01:00
Shannon
da91923577 Changes ObjectExtensions NormalizeNumberDecimalSeparator to use normal Culture (not UI Culture) 2016-01-06 12:48:26 +01:00
Sebastiaan Janssen
fbc46d8046 Merge pull request #989 from umbraco/temp-U4-7643 
U4-7643 DatabaseServerMessenger.cs causes lucene indexes to rebuild o…
 2016-01-06 12:43:36 +01:00
Shannon Deminick
3cec0c3b43 Merge pull request #993 from umbraco/temp-U4-7655 
Fixes: U4-7655 PropertyValueEditor tests failing
 2016-01-06 12:26:38 +01:00
Shannon
e8a0fae557 adds notes 2016-01-06 12:24:09 +01:00
Shannon Deminick
e0baf45247 Merge pull request #992 from umbraco/temp-U4-5168 
U4-5168 Media Items label says "Document Type" instead of  "Media Type"
 2016-01-06 12:22:53 +01:00
Sebastiaan Janssen
43e983e27a Corrects spelling of localStorateDir to localStorageDir 2016-01-06 12:17:48 +01:00
Claus
b1b7598e3c code cleanup. 2016-01-06 12:17:30 +01:00
Claus
b4ca4917cc Updating Double and Single conversion (where NormalizeNumberDecimalSeparator is also used) to include CurrentUICulture. 2016-01-06 12:12:29 +01:00
Sebastiaan Janssen
b882806847 Merge pull request #980 from umbraco/temp-U4-7614 
U4-7614 Allow Examine's local temp storage to exist in the current Us…
 2016-01-06 12:09:31 +01:00
Shannon
4838bf62f7 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-06 12:01:12 +01:00
Claus
b5fb82e934 Fixes: U4-7655 PropertyValueEditor tests failing 
Passing in CurrentUICulture to TryParse method, since it is also used for the normalization part.
NumberStyles.Number is the default parameter used by the other TryParse overload so should be good to use here too.
 2016-01-06 12:01:01 +01:00
Shannon
58c30cd7a6 removes erroneous reverse call 2016-01-06 12:00:50 +01:00
Shannon Deminick
ae1b6d95b8 Merge pull request #990 from umbraco/temp-PVS-Studio 
Temp pvs studio
 2016-01-06 12:00:28 +01:00
Shannon
a2b0f6f7f9 removes erroneous reverse call 2016-01-06 11:59:09 +01:00
Shannon Deminick
c6481f853c Merge pull request #991 from umbraco/temp-U4-7556 
Temp u4 7556
 2016-01-06 11:40:28 +01:00
Sebastiaan Janssen
403af78ba9 U4-5168 Media Items label says "Document Type" instead of "Media Type" 2016-01-06 11:22:15 +01:00
Shannon
dca6f2b42a fixes build 2016-01-06 10:47:58 +01:00
Shannon
b0060a9592 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	build/InstallGit.cmd
	build/UmbracoVersion.txt
	src/SolutionInfo.cs
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
	src/Umbraco.Web.UI/Umbraco/config/lang/nb.xml
	src/Umbraco.Web/Editors/DataTypeValidateAttribute.cs
	src/Umbraco.Web/Security/Identity/UmbracoBackOfficeCookieAuthOptions.cs
	src/Umbraco.Web/WebServices/SaveFileController.cs
 2016-01-06 10:46:38 +01:00
Claus
f1cc32771e Using constants instead of -1. 2016-01-06 10:31:21 +01:00
Claus
bfa9c80ed6 Added null checks for elements on import. 2016-01-06 10:27:39 +01:00
Claus
2dcb9c93f7 Dropped these null checks to avoid serializing invalid objects. 2016-01-06 10:26:09 +01:00
Claus
e49033a602 Added import document type option to context menu on root node. 2016-01-06 09:44:12 +01:00
Claus
e489cffa3d Removed unused namespaces and cleanup. 2016-01-06 09:26:58 +01:00
Claus
83963003f9 Ensures XML serializer doesn't fail when trying to serialize null properties. 
Some properties can now be nulls instead of string.Empty when using the new content type editor.
 2016-01-06 09:25:15 +01:00
Claus
2bdea2ef30 Fixes: U4-7556 Export/import document types isn't available in 7.4 
Added in export to context menu on document types using the legacy dialog.
 2016-01-06 09:23:55 +01:00
Sebastiaan Janssen
59fe690a88 Code sample No.10 2016-01-05 23:34:30 +01:00
Sebastiaan Janssen
a15b005d95 Code sample No.6, No.7 2016-01-05 23:22:16 +01:00
Sebastiaan Janssen
b94c396d4e Code sample No.5 2016-01-05 23:20:47 +01:00
Sebastiaan Janssen
8afc4f5ad1 Code sample No.3 2016-01-05 23:15:25 +01:00
Sebastiaan Janssen
f68b2de9e3 Code sample No.2 2016-01-05 23:13:37 +01:00
Sebastiaan Janssen
f4e29d90e0 Code sample No.1 2016-01-05 23:12:09 +01:00
Sebastiaan Janssen
5ad5e945c4 Merge pull request #813 from TimGeyssens/dev-v7 
Fixes U4-7249 Insert Macro split button, when selecting a macro that …
 2016-01-05 19:49:14 +01:00