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

15251 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Shannon
4ce4bd25c4 Fixes package installer and export - doesn't import any folders for child doc types, doesn't export folders for child doc types, ensures that parent doc types are added as compositions (this was never working) and changed the list<string> to hashset<string> so it's always unique. 2016-01-15 11:07:21 +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
Claus
e1ee8a1437 Fix to ensure config array is copied and not referenced. 2016-01-15 10:00:05 +01:00
Claus
21ba88a34d Fixes: U4-6297 Add Settings to Grid Controls 
Reusing the existing code for calling the dialog instead of having a separate method for this.
 2016-01-15 09:43:01 +01:00
Shannon
a468cb78c5 Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 19:56:43 +01:00
Shannon
ce3028446b Moves all serialization logic, including the part for folders into the EntityXmlSerializer where it needs to be, updates the data type repo to ensure paths are udpated correctly when moving, removes folder logic from other packaging logic, it's purely the responsibility of the serializer. adds new methods to content type and data type services to return an entities total folder collection. 2016-01-14 19:33:53 +01:00
Shannon
73f1458190 Fixes the Move content type command to ensure that all paths are updated correctly. 2016-01-14 18:25:14 +01:00
Shannon
684788cb62 Merge remote-tracking branch 'origin/dev-v7' into temp-U4-7557 2016-01-14 18:12:09 +01:00
Shannon
b5abbc7c30 Adds some null checks 2016-01-14 18:11:48 +01:00
Shannon
da9a2c59fc Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 2016-01-14 17:40:36 +01:00
Shannon
7958b5fcb1 U4-7740 Speed up the current user's culture lookup 2016-01-14 16:43:31 +01:00
Shannon
44b22503e1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2016-01-14 16:36:13 +01:00
Shannon
bfa12856db Fixes issue with DefaultRepositoryCachePolicy when creating new items - we were generating the cache key before actually calling the method to create the item therefore there was no id assigned yet (it would be zero). 2016-01-14 16:36:03 +01:00
Claus
163f39b8be Merge remote-tracking branch 'origin/dev-v7' into 7.4.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.html
 2016-01-14 15:53:20 +01:00
Stephan
46f3d0c647 Merge branch '7.4.0' into dev-7.4.0-ModelsBuilder 2016-01-14 15:51:53 +01:00