f024dba864
Merge pull request #1139 from umbraco/temp-U4-8017
...
U4-8017 - fix issues with MySql InitColumnTypeMap
2016-02-22 19:05:41 +01:00
9758851a4b
Fix SqlCeSyntaxProviderTests
2016-02-22 18:55:49 +01:00
38e56f0fea
Might make the build server happy?
2016-02-22 17:57:44 +01:00
462baf91e4
Merge pull request #1137 from umbraco/temp-U4-7914
...
U4-7914 - add PublishedContentRequest.Preparing event
2016-02-22 17:45:50 +01:00
f1366c7d29
U4-8017 - fix issues with MySql InitColumnTypeMap
2016-02-19 13:33:11 +01:00
baaa9340e4
Merge pull request #1131 from umbraco/temp-U4-7918
...
Fixes U4-7918 Make icon picker for document type and list views consistent
2016-02-19 12:03:27 +00:00
183a5b5c43
U4-7472: fix macro parameter column width
2016-02-19 09:52:29 +01:00
1a0c095f40
Merge pull request #932 from engern/MacroParamSortOrder
...
Fixes U4-7472 - Should be possible to sort macro parameters
2016-02-19 09:27:27 +01:00
ffada74aa4
Improve RenderModelBinder error msg when same type, different assemblies
2016-02-18 16:04:45 +01:00
f2fc70f731
Merge pull request #982 from abryukhov/patch-4
...
U4-7616 - Nodes sort dialog - additional date formats
2016-02-18 14:19:06 +01:00
866b0113e7
Fixes grunt break
2016-02-18 12:43:09 +01:00
06c49daca7
Merge branch 'dev-v7-login-retina-umbraco-logo' of git://github.com/bjarnef/Umbraco-CMS into bjarnef-dev-v7-login-retina-umbraco-logo
...
# Conflicts:
# src/Umbraco.Web.UI.Client/src/less/pages/login.less
2016-02-18 12:42:17 +01:00
9293008b94
U4-7914 - add PublishedContentRequest.Preparing event
2016-02-18 11:36:48 +01:00
dbb9386d22
Fixes: U4-7660 [7.4 Fix] Added a default value to the Umbaco.TrueFalse datatype. Thanks Jeremy Pyne
2016-02-18 11:20:04 +01:00
51ed441b85
Merge branch 'u4-5123' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-5123
...
# Conflicts:
# src/Umbraco.Web/PropertyEditors/ListViewPropertyEditor.cs
2016-02-18 10:00:22 +01:00
f566fec665
Merge branch 'Acentrage-U4-6700' into dev-v7
2016-02-17 15:26:51 +01:00
9d92781a97
Merge pull request #949 from kgiszewski/dev-v7
...
Fix u4-7534
2016-02-17 15:04:14 +01:00
123bfe5afe
Fixed merge conflict
2016-02-17 14:31:30 +01:00
3383d2a2ac
Merge pull request #1135 from umbraco/temp-U4-7601
...
U4-7601 - filter published content by composition
2016-02-17 13:31:07 +01:00
d9f38a20af
Merge remote-tracking branch 'origin/7.3.8' into dev-v7
2016-02-17 13:28:52 +01:00
a91669abc0
Fixes unit tests
2016-02-17 13:28:11 +01:00
cc6dfd0c55
U4-7601 - refactor PR, case insensitive
2016-02-17 12:55:40 +01:00
d4802fcef6
Merge branch 'feature/is-composed-of' of https://github.com/AndyButland/Umbraco-CMS into temp-U4-7601
2016-02-17 12:44:18 +01:00
35c3208b77
Fixes merge error
2016-02-17 12:30:42 +01:00
3b9db8a92f
tries fixing test for appveyor
2016-02-17 12:25:40 +01:00
7debe17c58
Merge remote-tracking branch 'origin/7.3.8' into dev-v7
...
Conflicts:
src/Umbraco.Web.UI/packages.config
2016-02-17 11:56:24 +01:00
1bfc1229bd
Merge pull request #1134 from umbraco/temp-738-U4-7996
...
Upgrade SQL CE to hopefully fix SQL CE data loss bug
2016-02-17 11:54:25 +01:00
f941456af6
fixes namespace
2016-02-17 11:48:32 +01:00
828e88e6f2
Merge remote-tracking branch 'origin/7.3.8' into dev-v7
...
Conflicts:
src/Umbraco.Tests/Web/Mvc/UmbracoViewPageTests.cs
src/Umbraco.Web/Mvc/UmbracoViewPageOfTModel.cs
2016-02-17 11:46:33 +01:00
3d6fd2d785
Updates to SQL CE 4.0.0.1
2016-02-17 11:44:33 +01:00
e56881abc6
adds unit tests for new ext methods
2016-02-17 11:21:15 +01:00
d32991c30a
re-organizing some namespaces for tests
2016-02-17 10:59:48 +01:00
8758f9649b
checks for null before assigning culture
2016-02-17 10:57:20 +01:00
07902e840f
Merge pull request #1133 from rodyvansambeek/patch-2
...
Changed allow upload whitelist to disallow extensions
2016-02-17 10:53:05 +01:00
e807ee7d64
Changed allow upload whitelist to disallow extensions
...
It is not possible to upload files in 7.4.0 with an extension different then the imageTypes in the Umbraco.Sys.ServerVariables.umbracoSettings.imageFileTypes, in the single upload this was changed after beta 7.4.0-beta1 to Umbraco.Sys.ServerVariables.umbracoSettings.disallowedUploadFiles. However the change was not added to the drag-drop-uploader. This fixes that.
2016-02-17 10:30:57 +01:00
6f0f1ab2c3
fixes wrong constant used
2016-02-17 10:22:37 +01:00
cd28240172
Moves strings to constants, adds ControllerContextExtensions to get the UmbracoContext from the hierarchy of ControllerContext's, changes RenderModelBinder to use this method to get the UmbracoContext, changes UmbracoViewPageOfTModel to use this method to get the UmbracoContext, adds RouteDataExtensions to get the UmbracoContext from routedata, adds extension methods on the HttpContext to get the UmbracoContext from it.
...
Conflicts:
src/Umbraco.Web/Mvc/RenderModelBinder.cs
2016-02-17 10:22:22 +01:00
85ca85fd42
Merge pull request #1129 from umbraco/temp-U4-7577
...
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext /…
2016-02-16 17:32:38 +01:00
4a10178697
Merge pull request #1123 from umbraco/temp-U4-8000
...
U4-8000 NullReferenceException in RenderModelBinder when performing an async controller action
2016-02-16 17:28:49 +01:00
ccba7f14a0
tries fixing test for appveyor
2016-02-16 16:26:21 +01:00
b797e0d0c5
Merge pull request #1127 from umbraco/temp-U4-7953
...
U4-7953 Creating Templates via new DocType have camelCased aliases, b…
2016-02-16 15:39:35 +01:00
8220b033f3
Merge pull request #1125 from umbraco/temp-U4-7954
...
U4-7954 Error upgrading database to 7.4.0 - [ FK_cmsPropertyTypeGroup…
2016-02-16 15:20:53 +01:00
6fffc8b45e
U4-7577 Remove dependency on UmbracoContext in CreateServiceContext / RequestLifespanMessagesFactory
2016-02-16 15:07:42 +01:00
b550b3dde3
Merge remote-tracking branch 'origin/7.3.8' into dev-v7
2016-02-16 14:52:14 +01:00
7002291c41
adds tests for ShouldAuthenticateRequest for app configurations
2016-02-16 14:51:15 +01:00
51bbf7ceb5
U4-7494 Installation Fails for 7.3.3 - Intermittent - Value cannot be null. Parameter name: sqlSyntax
2016-02-16 14:22:59 +01:00
93d9f09fcc
U4-7953 Creating Templates via new DocType have camelCased aliases, but from the Template section have PascalCase aliases
2016-02-16 14:20:29 +01:00
42a68cb770
U4-7494 Installation Fails for 7.3.3 - Intermittent - Value cannot be null. Parameter name: sqlSyntax
2016-02-16 14:00:28 +01:00
1c2dec00fc
bumps version
2016-02-16 13:32:03 +01:00
fcea4c7fdd
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2016-02-16 13:30:21 +01:00
Sebastiaan Janssen