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

15161 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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 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
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
Sebastiaan Janssen
32ca5de20c Reference to System.Runtime is required 2016-01-15 16:23:37 +01:00
Sebastiaan Janssen
742e0d69fa Removes duplicate requestFiltering node in web.Template.config 2016-01-15 15:56:26 +01:00
Sebastiaan Janssen
9b28fd0e27 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-15 15:34:11 +01:00
Sebastiaan Janssen
b36a73eecc Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-15 15:33:55 +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
Sebastiaan Janssen
39b1357a2a Ensure correct assembly redirects for System.Web.WebPages.Razor and HtmlAgilityPack 2016-01-15 15:07:53 +01:00
Sebastiaan Janssen
4a2b7447a9 Merge branch '7.4.0' of https://github.com/umbraco/Umbraco-CMS into 7.4.0 2016-01-15 13:48:14 +01:00
Sebastiaan Janssen
f7676062ea Bumps version 2016-01-15 13:47:18 +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
Shannon
8399906c9a Merge branch '7.4.0' into temp-U4-7212 2016-01-15 11:17:28 +01:00
Claus
72eaec0ff8 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/dialogs/config.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html

Merged branch over and ignored changes since they are not compatible with the new grid and they have been implemented correctly in the 7.4.0 branch.
 2016-01-15 10:34:20 +01:00
Mads Rasmussen
9e75a1821d Merge pull request #1024 from umbraco/temp-U4-6297 
Fixes: U4-6297 Add Settings to Grid Controls
 2016-01-15 10:22:49 +01:00
Mads Rasmussen
08e4f42974 do not show settings icon if there are no settings 2016-01-15 10:21:32 +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
Claus
54e3f0f9ec Fixes: U4-6297 Add Settings to Grid Controls 
Added settings to grid controls in v.7.4.
 2016-01-15 10:04:49 +01:00