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

15207 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mads Rasmussen
be1b770df8 Fixes: U4-7665 When adding tab without save and remove it again "Add another tab" should be shown again 2016-01-21 12:00:29 +01:00
Shannon
2d0f198f58 U4-7546 Cannot delete document type - fanoe starter kit Text Page 2016-01-20 18:26:30 +01:00
Shannon
6ad568c81a changes config template with new MB config option 2016-01-20 18:18:33 +01:00
Shannon Deminick
2ef673bc84 Merge pull request #1038 from umbraco/temp-U4-7768 
U4-7768 - Fixes validation issue with new CTs and invalid server side…
 2016-01-20 18:08:58 +01:00
Shannon
adc3c1e927 updates to latest MB 2016-01-20 18:08:34 +01:00
Shannon
e2eaf7d58e Updates how the editor validators work 2016-01-20 17:42:09 +01:00
Shannon
38a6f8c4a9 creates new EditorValidationResolver for external validators to work (internal for now), bumps version 2016-01-20 16:57:31 +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
Sebastiaan Janssen
277b67ac84 Merge pull request #1029 from umbraco/temp-U4-7557 
U4-7557 Support folders for import/export, packaging
 2016-01-20 15:45:21 +01:00
Shannon
fda3111e43 fixes nuget dll ref 2016-01-20 15:24:57 +01:00
Shannon
5c2bd5748d Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 
Conflicts:
	build/NuSpecs/UmbracoCms.Core.nuspec
 2016-01-20 15:02:12 +01:00
Sebastiaan Janssen
348bee885e Finish last bit for U4-7683 2016-01-20 15:01:25 +01:00
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
Sebastiaan Janssen
5440353fb3 Merge pull request #1031 from umbraco/temp-U4-7683 
Fixes: U4-7683 Search on Property Editors/Data Types in new Content Type Editor should display two results - resuse / available
 2016-01-20 14:37:15 +01:00
Sebastiaan Janssen
df3e96e86a Merge remote-tracking branch 'origin/7.3.6' into dev-v7 
# Conflicts:
#	build/NuSpecs/UmbracoCms.Core.nuspec
 2016-01-20 14:09:40 +01:00
Sebastiaan Janssen
74d73cfe94 U4-7796 Get UrlRewritingNet from the official NuGet location 
#U4-7796 Fixed
 2016-01-20 13:57:35 +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
Mads Rasmussen
28aa928655 add loader to overlay 2016-01-19 12:29:14 +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
Mads Rasmussen
9ea492f5b7 Fix tab indent 2016-01-19 11:51:49 +01:00
Mads Rasmussen
05044dc871 Fixes: U4-7683 Search on Property Editors/Data Types in new Content Type Editor should display two results - resuse / available 2016-01-19 11:49:52 +01:00