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

11664 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Shannon
ee040eb04f Merge branch 'umbukfest-U4-4731' of https://github.com/tompipe/Umbraco-CMS into tompipe-umbukfest-U4-4731 
Conflicts:
	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2014-11-21 09:25:57 +11:00
Shannon Deminick
d1e684cb40 Merge pull request #550 from tompipe/umbukfest-U4-5848 
Reset the template when converting a doctype and the new doctype does no...
 2014-11-21 08:46:16 +11:00
Shannon Deminick
98b41256c1 Merge pull request #547 from Alain-es/umbUkFest-U4422 
Bug fix U4-4422
 2014-11-21 08:18:42 +11:00
Tom Pipe
8a214b5181 Correctly translate property label and description on ALL Tabs 
Fixes U4-4731
 2014-11-20 15:19:58 +00:00
Tom Pipe
91f087141b Reset the template when converting a doctype and the new doctype does not have a template assigned 
Fixes U4-5848
 2014-11-20 14:22:19 +00:00
per ploug
6265354327 Fixes grid auto-resizing fields on hidden tabs 2014-11-20 13:39:28 +01:00
Alain
86f39aee03 Bug fix U4-4422 2014-11-20 12:32:46 +01:00
per ploug
9190930f49 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-19 15:08:52 +01:00
per ploug
11ec43c5c1 Have grid refresh editor config automatically 2014-11-19 15:08:43 +01:00
per ploug
1b83c5c180 Fluid grid views in seperate files 2014-11-19 10:37:17 +01:00
Shannon
8a98b66cfd removes un-needed lock on data type service 2014-11-19 12:47:33 +11:00
Shannon
9638bd8bd2 Fixes: U4-5758 Unable to add pre values to checkbox/dropdown list datatype after removing previous values correctly 2014-11-19 12:37:49 +11:00
Shannon Deminick
362717c05d Merge pull request #541 from jforage/issue-U4-5758 
Fix to issue U4-5758. Branched off from 7.2.0
 2014-11-19 12:03:36 +11:00
Shannon
16d9b9f527 fix last failing test 2014-11-19 11:58:00 +11:00
Shannon
3ae57100c8 fix merge 2014-11-19 11:52:37 +11:00
Shannon
6d33cf6c69 Merge branch '7.1.9' into 7.2.0 
Conflicts:
	src/Umbraco.Tests/PublishedContent/PublishedMediaTests.cs
 2014-11-19 11:50:10 +11:00
Shannon
209ccb9ae7 removes a MoveNext() call since we're no longer dealing with xdocuments and instead xelements 2014-11-19 11:49:13 +11:00
Shannon
2850c8aa05 Fixes build and fixes how published media cache gets root nodes - if people have done this in the past it would have been horrible for site performance 2014-11-19 11:35:37 +11:00
Shannon
87a9a57e6d Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 11:11:14 +11:00
Shannon
3e6273d073 Fixes: U4-5768 Partial View Macro path is wrong on create 2014-11-19 11:09:45 +11:00
Shannon
8d98813440 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-19 10:21:19 +11:00
Shannon
d0b409341e Fixes media tests and updates how the IPublishedContent is created from the xpath iterator 2014-11-19 10:21:08 +11:00
per ploug
84489f612b Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 2014-11-18 23:41:07 +01:00
per ploug
ee6c9a3b05 Updates grid render cshtml 
Better single/multi section layout support
Cleaned up the templates with a helper for cleaner code
 2014-11-18 23:40:53 +01:00
per ploug
d12162cca5 Grid Media rendering + sets save url correct 2014-11-18 23:39:56 +01:00
Sebastiaan Janssen
1117f96597 Spellchecker performed action again.. ;) 2014-11-18 18:09:15 +01:00
per ploug
d3f3e161e0 Merge branch '7.2.0' of https://github.com/umbraco/Umbraco-CMS into 7.2.0 
Conflicts:
	src/Umbraco.Web.UI.Client/src/installer/installer.service.js
 2014-11-18 17:45:23 +01:00
per ploug
90d78d1b60 Install fact, minor tweak 2014-11-18 17:43:30 +01:00
Sebastiaan Janssen
5673b1907b Grid also renders the macro, so added to that description as well 2014-11-18 17:37:13 +01:00
Sebastiaan Janssen
bc9ebb24f9 Makes it clear the checkbox is for both RTE and the grid 2014-11-18 17:12:03 +01:00
Sebastiaan Janssen
084e9e00ce Fix spelling mistake in new installer fact 2014-11-18 17:07:43 +01:00
per ploug
96e4f723b1 Fixes issue with grid media without size config 2014-11-18 13:58:49 +01:00
per ploug
163a03986c force add base.cshtml 2014-11-18 13:22:56 +01:00
per ploug
7007389505 New installer fact 2014-11-18 13:14:33 +01:00
Stephan
2336905dae Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 13:10:20 +01:00
Stephan
a2164819f5 Safe compositions for 7.2 2014-11-18 13:09:57 +01:00
Morten Christensen
6b345bfc75 Ignoring *_Without_Examine tests which seem to cause eternal loop. 2014-11-18 12:41:22 +01:00
Morten Christensen
a699f32178 Correcting invalid tests related to Compositions 2014-11-18 12:40:31 +01:00
Stephan
e597886d0f Merge remote-tracking branch 'origin/7.2.0' into 7.2.0 2014-11-18 10:32:28 +01:00
Stephan
10e53de029 Safe compositions for 7.2 2014-11-18 10:29:46 +01:00
Shannon Deminick
c9336ba32f Merge pull request #520 from Jeavon/U4-5698 
Fix for U4-5698 - EntityService.GetObjectType throws for deleted Id's
 2014-11-18 17:15:12 +11:00
Shannon
55190b7318 Fixes: U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:59:15 +11:00
Shannon
0328ba1aec Working on U4-5707 Cannot upgrade 6.2.2 site to 7.2 2014-11-18 15:06:27 +11:00
Shannon
1accc6275a Updates how the validation works in the member model mapper to use the native validation stuff instead of custom pre-values. 2014-11-18 14:32:51 +11:00
Shannon Deminick
ce80c9a244 Merge pull request #540 from AndyButland/u4-5619 
U4-5619 - Applied required setting for text field client-side validation to handle both native and custom properties
 2014-11-18 14:22:25 +11:00
Shannon
2d9bd394ae Updates the codemirror plugin for tinymce so that it uses it's own alias: codemirror, so the code and codemirror plugins can be enabled individually. 2014-11-18 14:06:43 +11:00
Shannon
b3c291206a Merge branch '7.1.9' into 7.2.0 2014-11-18 12:23:51 +11:00
Shannon
f3f6504398 Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:23:32 +11:00
Shannon
52629f829d Working on: U4-5711 Media cache valueDictionary exception 2014-11-18 12:05:03 +11:00
Shannon
3496c5aece Fix merge issue 2014-11-18 11:08:14 +11:00