Shannon
2cf590d9c9
Merge branch '7.2.1' of https://github.com/markusdrake/Umbraco-CMS into dev-v7
2015-02-13 10:36:41 +11:00
Shannon Deminick
2729da2c08
Merge pull request #630 from SorenA/SorenA-patch-1-rteformatting
...
RTE composite block and class formatting
2015-02-13 10:05:06 +11:00
Shannon
9046319dc9
fixes grid are you sure button style
2015-02-13 09:45:25 +11:00
Shannon Deminick
fa27a37207
Merge pull request #636 from robbaman/u4-6208
...
Auto hide the 'Are you sure you want to delete' message on columns of a grid
2015-02-13 09:34:02 +11:00
Shannon
80f81ce379
fixes: U4-6255 Add configurable option in base membership providers to toggle AllowManuallyChangingPassword
2015-02-12 15:58:11 +11:00
Shannon
3022293565
re-wires up the input file fields
2015-02-12 15:43:41 +11:00
Shannon
34889c147a
Updates the media picker dialog to use the new directives, fixes: U4-6257 for it's drop zone, adds a drag over ui indicator, shows progress bar for uploading.
2015-02-12 15:25:49 +11:00
Shannon
7d17aef953
Streamlines image upload directives for more re-use, creates umbImageUpload directive which is a wrapper for the blueimp file-upload directive which allows us to have a directive that exposes an API (which the blue imp does not do), creates new upload progress directive so that can easily be re-used inside of any umbimageupload directive.
2015-02-12 14:40:15 +11:00
Shannon
8af8a6d411
Makes a new umbImageFolder directive which can be easily shared and is now used by the dashboard and the folder browser.
2015-02-12 11:59:19 +11:00
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
SorenA
332a95a27a
Support for multiple RTE classes
...
Added support for multiple RTE classes, "p.someclass.otherclass" would give a paragraph element with the classes "someclass" and "otherclass".
2015-01-28 11:42:08 +01:00
SorenA
4482879fc6
Added RTE composite block and class formatting
...
Added "block.class" and "block#id" formatting to the Rich Text Editor.
Example use include following formats:
"p.lead"
"h1#title"
Without this only "p" or ".lead" will work, not composites.
2015-01-28 11:38:11 +01: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
