Commit Graph

2582 Commits

Author SHA1 Message Date
Shannon
3712a80031 fixes composition check in change doc type 2016-01-25 16:43:20 +01:00
bjarnef
0be5c31d4a Adjust styling for sort table + localize 2016-01-25 15:31:07 +01:00
Simon Busborg
ca03967662 U4-7644 Misleading description of choosing package file
has to have correction
2016-01-25 15:24:11 +01:00
Simon Busborg
91413c2a89 U4-7644 Misleading description of choosing package file
I'm not a multi language talent, so I've taken the liberty only to correct the danish and english version. since `.umb`doesn't exists anymore, I've deleted that extension from the sentence.
2016-01-25 15:18:26 +01:00
Mads Rasmussen
08cfececd9 Fixes: U4-7824 Remove media section dropzone and folders in recycle bin 2016-01-25 12:17:26 +01:00
Claus
bbb187f2c8 Merge pull request #1044 from umbraco/temp-U4-7783
U4-7783 Member can edit / show on profile don't exist any more in 7.4.0
2016-01-24 22:19:01 +01:00
Shannon
ffce67e4fd nuget update 2016-01-22 13:34:16 +01:00
Shannon
4f85985a09 updates mb nuget 2016-01-22 12:45:57 +01:00
Shannon
c365b1569b updates to latest myget MB package 2016-01-22 12:25:39 +01:00
Shannon
52b1a09de0 abstracts out the DocumentType, MemberType and MediaType editor models, since some contain different props than each other and now member properties contain different properties than each other. So we have a lot of generic insanity going on... it works though. 2016-01-21 15:01:55 +01:00
Sebastiaan Janssen
e456761bb9 Merge pull request #1039 from ig-ealbert/japanesev7-2
Added translations and removed unused entries
2016-01-21 13:06:46 +01:00
Mads Rasmussen
504235d6db add memberCanEdit and showOnMemberProfile to property settings overlay in member types 2016-01-20 21:30:12 +01:00
Shannon
6ad568c81a changes config template with new MB config option 2016-01-20 18:18:33 +01:00
ig-ealbert
25dd891938 Added translations and removed unused entries 2016-01-20 12:10:02 -05:00
Shannon
adc3c1e927 updates to latest MB 2016-01-20 18:08:34 +01:00
Shannon
8fc44699bc U4-7768 - Fixes validation issue with new CTs and invalid server side validation, adds validation check for all ct aliases across all types 2016-01-20 16:07:47 +01:00
Shannon
fda3111e43 fixes nuget dll ref 2016-01-20 15:24:57 +01:00
Shannon
dd5523de42 updates package dependency for MB 2016-01-20 14:55:56 +01:00
Shannon
1fd76731cd fixes merge issue, updates MB 2016-01-20 13:54:16 +01:00
Shannon
4e1e240f54 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7747
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/documenttypes/edit.controller.js
2016-01-20 13:38:17 +01:00
Sebastiaan Janssen
dad0cf20eb Merge pull request #1035 from ig-ealbert/japanesev7
Added translations for v7 only entries
2016-01-20 11:23:01 +01:00
Shannon
76dd7f8909 changes default upload limit to 50 mb 2016-01-20 10:48:10 +01:00
ig-ealbert
00aed2b33d Added translations for v7 only entries 2016-01-19 14:58:48 -05:00
Shannon
173f3cb32a ensures the default language has the correct build models translation 2016-01-19 19:58:48 +01:00
Shannon
068a08cfcd Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7748 2016-01-19 14:48:36 +01:00
Shannon
caef155805 U4-7748 Models Builder - needs to be in control of the models-out-of-date status 2016-01-19 14:46:19 +01:00
Sebastiaan Janssen
0621019918 Adds .models extension for the zip release 2016-01-19 12:31:22 +01:00
Sebastiaan Janssen
994ded8518 Merge remote-tracking branch 'origin/7.3.6' into dev-v7
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
#	src/Umbraco.Web.UI/packages.config
2016-01-19 11:10:18 +01:00
Sebastiaan Janssen
1888888650 Update ImageProcessor, this time also in the nuspec file 2016-01-19 11:07:17 +01:00
Shannon
2bc0f0c6b4 Merge branch 'dev-7.4.0-ModelsBuilder' of https://github.com/umbraco/Umbraco-CMS into dev-7.4.0-ModelsBuilder 2016-01-15 17:06:56 +01:00
Shannon
97d64f4f3d adds latest MB version 2016-01-15 17:06:22 +01:00
Sebastiaan Janssen
dc17a20bb8 Adds required namespace + a fake class to make sure the namespace exists 2016-01-15 17:05:09 +01:00
Shannon
c39b8f6eb5 Merge branch 'dev-7.4.0-ModelsBuilder' of https://github.com/umbraco/Umbraco-CMS into dev-7.4.0-ModelsBuilder 2016-01-15 16:56:49 +01:00
Shannon
b776a32a64 fixes the models builder API controller URL 2016-01-15 16:54:38 +01:00
Sebastiaan Janssen
c752c9e2bf Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 16:24:30 +01:00
Sebastiaan Janssen
d1cdff6349 Reference to System.Runtime is required
Release with a reference to ModelsBuilder
2016-01-15 16:24:14 +01:00
Sebastiaan Janssen
742e0d69fa Removes duplicate requestFiltering node in web.Template.config 2016-01-15 15:56:26 +01:00
Sebastiaan Janssen
df266a202a Fix build and dependencies 2016-01-15 15:31:16 +01:00
Sebastiaan Janssen
49bafe51b7 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:24:39 +01:00
Stephan
244d09068a Merge branch 'dev-7.4.0-ModelsBuilder' of https://github.com/umbraco/Umbraco-CMS into dev-7.4.0-ModelsBuilder 2016-01-15 13:11:53 +01:00
Stephan
99cf7a096c Import missing ModelsBuilder files 2016-01-15 13:11:34 +01:00
Shannon
cee20e968f fixes csproj, should no longer reference Zbu DLL 2016-01-15 13:04:18 +01:00
Stephan
fb1a72600e Upgrade to Umbraco.ModelsBuilder 2.2.0-beta002 2016-01-15 12:37:15 +01:00
Shannon Deminick
efdeb757f6 Merge pull request #1023 from umbraco/temp-U4-7212
U4-7212 All new text for content type editor needs to be localized.
2016-01-15 12:05:38 +01:00
Shannon
4a30398499 fixes capitalisation 2016-01-15 12:04:29 +01:00
Shannon
2a905afe08 fixes translation files, removes duplicate and updates en_us 2016-01-15 12:03:03 +01:00
Shannon
b79c7407e6 Removes unecessary promise wrapping for localizing, fixes localization service so that it's not double requesting and fixes how it deals with promise returns. 2016-01-15 11:49:29 +01:00
Sebastiaan Janssen
0fbc0d5431 U4-7715 Update Gallery snippet for ImageCropper instead of the upload in 7.4.0
#U4-7715 Fixed
2016-01-15 10:19:35 +01:00
Per Ploug
cc8bb4c031 Fixes issue with Insert RenderSection
Reported by doug for training build
2016-01-14 15:37:24 +01:00
Simon Busborg
977369fb2d Danish translation for grid templates 2016-01-14 11:44:32 +01:00