Commit Graph

12027 Commits

Author SHA1 Message Date
Robert Mulder
dd736dce3a Hide the 'Are you sure you want to delete' message on columns of a grid when mouse-leaving them just like it does on the similar message on the row level. This way they messages work the same for both rows and columns. 2015-02-11 10:18:51 +01:00
Shannon
cd4c738c04 Moves jquery and blueimp files to be included with bower, removes all unnecessary jquery files that are committed to the repo. Jquery and jquery ui versions remain the same, however the canvas designer was using a jquery ui version one patch version ahead so need to test that it works with the bower version, otherwise we'll have to re-include it. 2015-02-11 18:39:53 +11:00
Shannon
ed383bdaeb Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-02-11 18:24:01 +11:00
Shannon
4874a71e72 fixes publish button so it saves properly without causing js errors 2015-02-11 18:23:49 +11:00
Sebastiaan Janssen
58b8aacff1 Fixes U4-6052 Umbraco 7.2.1 web app installed with Nuget fails at start with error :"Cannot create an MVC Area path without the umbracoPath specified"
#U4-6052 Fixed Due in version 7.2.2
2015-02-10 17:38:19 +01:00
Shannon
24ef0dd961 fixes small issue with the image layout when viewing media folder, in some cases when there are consecutive small images that when placed beside each other cannot fit the width, they'll end up individually on a row due to their small size, this fix allows for a leniency when fitting to the width so in these cases they'll get rendered together on the row even though they won't actually fit. 2015-02-10 17:31:31 +11:00
Shannon
0efb9b72e7 Adds small exif library to read meta data from jpg's so we can attempt to read width/height from exif instead of loading the file into mem with GDI, makes for much faster and far less memory processing.U4-6246 Uploading specific images causes GDI+ Errors 2015-02-10 16:33:59 +11:00
Shannon Deminick
dd680b6fd1 Merge pull request #635 from NathalieLarsson/dev-v7
Changes to lang config, notifications area - Sv
2015-02-10 10:54:03 +11:00
Nathalie Larsson
788ed68b5b Changes to lang config, notifications area - Sv 2015-02-09 15:47:16 +01:00
Shannon
89606d3a05 Goes brute force to try to resolve: U4-4049 Some images fail when uploading multiple media files 2015-02-06 11:19:52 +11:00
Sebastiaan Janssen
4790dc59a9 Update CDF dependency 2015-02-05 09:01:42 +01:00
Stephan
de53dbffd1 U4-6129 - fix order of EntityService.GetByIds items 2015-02-04 19:07:51 +01:00
Stephan
c8087d1f68 Cleanup TypeHelper, add tests - IsAssignableFromGeneric may have issues? 2015-02-04 17:05:18 +01:00
Shannon
c4c21b8b6e fixes: U4-6151 Datatype PreValues not updated in Datatype Saved Event 2015-02-04 13:35:22 +11:00
Shannon
a7c134a375 fixes last failing test 2015-02-04 12:11:10 +11:00
Shannon
9cdea752e8 Updates ExtensionMethodFinder to use new TypeFinder methods, all tests are passing now. Moved Stephen's MatchType methods to TypeHelper and moved those tests to TypeHelperTests. Now, need to compare notes with Stephen and add more tests to validate/invalidate the aproaches taken to see what might not be supported between either approaches and should probably look into benchmarks too. 2015-02-04 10:24:09 +11:00
Shannon
de3c836ac1 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
Conflicts:
	src/Umbraco.Core/Dynamics/ExtensionMethodFinder.cs
	src/Umbraco.Tests/DynamicsAndReflection/ExtensionMethodFinderTests.cs
2015-02-04 09:58:48 +11:00
Stephan
2cdc89297f U4-6210 - fix failing tests, improve extension methods support on dynamics 2015-02-03 19:38:14 +01:00
Shannon
839a5b13b0 updates extension method finder with tests to better support finding generic equivialents, adds tests for TypeHelper as well. 2015-02-03 20:23:05 +11:00
Shannon
40cc4b90fc updates a test 2015-02-03 14:41:43 +11:00
Shannon
ba54f96efd updates nuspec 2015-02-03 13:16:30 +11:00
Shannon Deminick
b5696de71e Merge pull request #629 from AndyButland/u4-6183
U4 6183 - Only allow change document type to types that would allow the existing children to be created under them
2015-02-02 18:16:37 +11:00
Stephan
a4d4cbd99f U4-6034 - issue when renaming tabs 2015-01-30 15:02:21 +01:00
Stephan
08a2c0d082 U4-6184 - pipeline falls back from example.com:666 to example.com 2015-01-30 14:44:47 +01:00
Shannon
f037f8541c Fixes: U4-6210 ExtensionMethodFinder doesn't work with overloaded extensions - this means overloaded extension methods for dynamic content won't work. and finalizes: U4-6209 GetGridHtml needs to be an extension on HtmlHelper not IPublishedContent so that ViewData and ModelState are inherited 2015-01-30 19:04:39 +11:00
Shannon
10990e50e6 Fixes: U4-6209 GetGridHtml needs to be an extension on HtmlHelper not IPublishedContent so that ViewData and ModelState are inherited 2015-01-30 15:48:55 +11:00
Shannon
9dad4c9573 Fixes: U4-6111 GetGridHtml throws an exception if no grid value is available 2015-01-30 15:42:12 +11:00
Shannon
6318b85449 Fixes: U4-6208 Cannot cancel grid 'Are you sure' button when deleting a cell, U4-5942 Issue with placing cursor in right part of richtext editor in Grid 2015-01-30 15:17:13 +11:00
Shannon Deminick
9d313898d0 Merge pull request #624 from bjarnef/dev-v7-U4-5942
U4-5942 - change width of grid cell tools
2015-01-30 11:09:33 +11:00
Shannon
0380b04b03 fixes breadcrumb on content/media, ensures a request to load it doesn't happen if there is no parent, ensures that the full breadcrumb is shown and in the right order and ensures that the breadcrumb class is not added if there isn't one so the margins on the buttons work better. 2015-01-30 11:07:47 +11:00
Shannon
f32e47a363 fixes exception when rendering macros in rte in back office. 2015-01-30 10:59:11 +11:00
Shannon Deminick
3ea7f8a226 Merge pull request #628 from sparkalyn/dev-v7
Fixes: U4-4565 Add margin to bottom bar
2015-01-30 10:37:12 +11:00
Shannon
2617016e3b Merge branch 'umbUkFest-U4-4400' of https://github.com/ja0b/Umbraco-CMS into dev-v7 2015-01-30 10:33:07 +11:00
Shannon
90b3bf59e0 Fixes: U4-2038 Violation of PRIMARY KEY constraint 'PK_cmsContentPreviewXml' YSOD occurs when publishing content
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
2015-01-30 10:32:46 +11:00
Shannon
0f7b902bba Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2015-01-29 17:50:18 +11:00
Shannon
b899ab6557 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:49:58 +11:00
Shannon Deminick
7c3ff7d746 Fixes: U4-6165 Make Enum<T> public 2015-01-29 17:09:04 +11:00
AndyButland
199bf0ff6e Minor code tidy of change content type 2015-01-28 09:22:33 +01:00
AndyButland
24915163ff Improved validation label for why a change of document type isn't available for a given node 2015-01-28 09:10:22 +01:00
AndyButland
1289d3255c Presentation improvements for confirmation page of change document type 2015-01-27 22:35:17 +01:00
AndyButland
dc40b73fef When changing document type, added filter on populating list of available document types to include only those types that would permit the existing children to be created under them 2015-01-27 22:34:57 +01:00
Sunshine Lewis
c1cc8a3824 U4-4565 Add margin to bottom bar 2015-01-27 09:57:51 -05:00
Stephan
9695ccea0a Merge pull request #623 from zpqrtbnk/dev-v7-6154
U4-6154 - fix unpublishing a document with changes
2015-01-21 16:03:33 +01:00
Shannon
bbcca7f3e5 fixes test 2015-01-21 13:26:09 +11:00
Stephan
7b4a82eb8d U4-6154 - bugfix 2015-01-20 19:58:57 +01:00
bjarnef
633f56a7aa U4-5942 - change width of grid cell tools
Change width of grid cell tools, so it doesn't overlap the input
fields/texteditors.
2015-01-19 16:55:02 +01:00
Stephan
12d51b292c U4-6154 - fix unpublishing a document with changes
Conflicts:
	src/Umbraco.Core/Services/ContentService.cs
2015-01-19 14:03:58 +01:00
Shannon Deminick
e85ef38218 Merge pull request #621 from AndyButland/u4-6135
Fixes U4-6135 (node name disappears in certain situations when tree is synched
2015-01-19 18:20:47 +11:00
AndyButland
4775b638a4 Reverted previous commit and changed anchor removal to target the correct tag (the elipsis) 2015-01-19 08:05:32 +01:00
Shannon
db3b8a1acd Merge remote-tracking branch 'origin/dev-v6' into dev-v7
Conflicts:
	src/Umbraco.Tests/TreesAndSections/ApplicationTreeTest.cs
2015-01-19 12:53:54 +11:00