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

15184 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
dd5523de42 updates package dependency for MB 2016-01-20 14:55:56 +01:00
Shannon
4bb9dfb4c9 Ensure that the raw ct alias is passed in with additionaldata 2016-01-20 14:47:32 +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
Shannon
85207b3d5c removes MB dependencies from Umbraco.Web proj, we don't want circular references and this is not required since MB can take care of injecting the server vars. 2016-01-20 13:37:47 +01:00
Shannon
8b80a22018 Merge branch 'temp-U4-7748' into temp-U4-7747 2016-01-20 13:32:40 +01:00
Shannon
9c58e82169 publicized required method for externally setting template markup, removes logic from core for this 2016-01-20 12:47:09 +01:00
Shannon
42fbcb6f41 Bumps version so that the MB core can reference updated code 2016-01-20 11:45:33 +01:00
Shannon
2571e5c683 Moves MB nuget reference to UmbracoCms nuget package - otherwise we have a circular nuget reference! 2016-01-20 11:40:53 +01:00
Mads Rasmussen
c16aa5bbf0 Fixes: U4-7745 7.4 Property Editor & Keyboard Shortcuts 2016-01-20 11:35:46 +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
fe563b0828 adds AdditionalData to the event args so we can use that to check for specific keys/values when consuming events and maintain compatibility. 2016-01-20 11:19:04 +01:00
Sebastiaan Janssen
9e8821594a Merge remote-tracking branch 'origin/7.3.6' into dev-v7 2016-01-20 10:55:24 +01:00
Sebastiaan Janssen
7fb9d430a9 changes default upload limit to 50 mb 2016-01-20 10:54:43 +01:00
Shannon
76dd7f8909 changes default upload limit to 50 mb 2016-01-20 10:48:10 +01:00
Sebastiaan Janssen
7cd8ba13c0 U4-7781 Setting a user's start node causes YSOD 
#U4-7781 Fixed
 2016-01-20 10:45:40 +01:00
Shannon
9a0e85af10 Creates new CreateTemplateForContentType for use with the content type editor, I need to somehow add some additional information to the event raised there so that we can listen to that event in MB in order to create the default template markup. 2016-01-19 21:38:11 +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
d0df31be8b Ensures the build models buttons work and are enabled for content types, media types and member types 2016-01-19 19:57:38 +01:00
Shannon
e857b0a5f4 Updates the strange TypeFinder GetTypeByName method to use BuildManager by default. 2016-01-19 15:58:38 +01:00
Simon Busborg
e5f5e16f9a Added ng-cloak to fix flickeren in http://issues.umbraco.org/issue/U4-7762 
Fixes flickering in U4-7762 Move document or media briefly show error- and success placeholders + odd position of checkmark at root level
 2016-01-19 15:17:39 +01:00
Simon Busborg
e51ef64b66 Fixes: U4-7770 List view icon on content node not displayed properly 2016-01-19 14:54:37 +01:00
Simon Busborg
76ff12f681 Fixes: U4-7762 Move document or media briefly show error- and success placeholders + odd position of checkmark at root level 2016-01-19 14:54:37 +01:00
Shannon
068a08cfcd Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7748 2016-01-19 14:48:36 +01:00
Shannon Deminick
329636abab Merge pull request #1032 from umbraco/temp-U4-7775 
Fixes: U4-7775 Ctrl + S doesn't work in new document type editor
 2016-01-19 14:47:11 +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
Mads Rasmussen
ff876266cf Fixes: U4-7775 Ctrl + S doesn't work in new document type editor 2016-01-19 13:50:50 +01:00
Stephan
9f360c2b9b Fix test broken by PR #1027 2016-01-19 12:52:43 +01:00
Sebastiaan Janssen
0621019918 Adds .models extension for the zip release 2016-01-19 12:31:22 +01:00
Simon Busborg
cff6a74f16 Merge pull request #1030 from umbraco/temp-U4-7524 
Fixes: U4-7524 Markdown editor - doesn't save content changes after using buttons.
 2016-01-19 12:21:13 +01:00
Simon Busborg
853bd3947b Merge branch 'markdowneditor-fix' of git://github.com/pynej/Umbraco-CMS into pynej-markdowneditor-fix 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/markdowneditor/markdowneditor.controller.js
 2016-01-19 12:18:24 +01:00
Shannon Deminick
19fae702a9 Merge pull request #1027 from umbraco/temp-u4-7754 
U4-7754 - fix UmbracoViewPage with models
 2016-01-19 11:18:51 +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
Stephan
a1b98b6e31 U4-7754 - fix UmbracoViewPage with models 2016-01-18 17:35:26 +01:00
Simon Busborg
a6b7e26606 Fixes U4-7761 Typo on Allowed Templates label 2016-01-18 12:58:34 +01:00
Mads Rasmussen
2074df58fb Fixes: U4-7765 disable folder select + only allow images in grid image picker 2016-01-18 12:02:41 +01:00
Mads Rasmussen
e6ab111f4d Fixes: U4-7676 Don't show "Reorder" link in initial row-view for grid 2016-01-18 11:29:23 +01:00
Simon Busborg
c9936da37f Fixes U4-7759 Imagepicker setting in Grid broken in 7.4-beta2 2016-01-18 10:10:03 +01:00
Shannon
2aa5dfb3ec Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2016-01-15 18:02:39 +01:00
Shannon
283b893128 hack until we fix template generation for when MB is disabled 2016-01-15 18:02:31 +01:00
Sebastiaan Janssen
1345c48e73 Require very latest version of ModelsBuilder 2016-01-15 17:38:31 +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