Sebastiaan Janssen
5f10ed99aa
Revert "U4-4565 Add margin to bottom bar"
...
This reverts commit c1cc8a3824
2015-02-19 14:14:30 +01:00
Shannon Deminick
48fa60039b
Merge pull request #641 from AussieInSeattle/U4-6288
...
U4-6288 Changes
2015-02-19 11:56:23 +01:00
Shannon
20ceceffe0
Fixes: U4-5932 Grid editor has JS errors
2015-02-19 11:43:08 +01:00
Shannon
b73c7fbb16
Fixes: U4-6284 UmbracoCms.7.2.2-build.26 - missing feedback when file is too large
2015-02-19 11:34:43 +01:00
Shannon
c96b866f1d
Fixes bower config for jquery
2015-02-19 10:35:06 +01:00
AussieInSeattle
ee78e3815b
U4-6288 Changes
2015-02-17 19:32:25 -08:00
Sebastiaan Janssen
25cfceadc0
Merge branch 'dev-v7-upgradablemvc5webapi2' of https://github.com/Shazwazza/Umbraco-CMS into Shazwazza-dev-v7-upgradablemvc5webapi2
...
Conflicts:
build/UmbracoVersion.txt
src/Umbraco.Core/Configuration/UmbracoVersion.cs
2015-02-17 10:46:36 +01:00
Shannon
15c36a63d3
Fixes: U4-6168 Custom Section is not showing correctly in 7.2 if custom tree is empty
2015-02-13 12:35:57 +11:00
Shannon
2411271ae0
removes cancel button from related links as it is not needed and doesn't actually cancel due to two way binding.
2015-02-13 11:11:43 +11:00
Shannon Deminick
c87d0a6430
Merge pull request #634 from andycyberian/U4-4198
...
U4 4198
2015-02-13 11:06:48 +11:00
Shannon
c0051ba8cd
fixes jshint warnings
2015-02-13 10:38:53 +11:00
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
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
4874a71e72
fixes publish button so it saves properly without causing js errors
2015-02-11 18:23:49 +11: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
Andy Rose
77319301c6
U4-4198, adding a specific save event to ensure that the related links title property is updated with its caption property
2015-02-05 09:19:47 +00:00
Andy Rose
227bd1cd7e
Revert "U4-4198, adding a hidden field in the related links property editor to maintain the title property when editing. This will be mapped directly to the caption property value."
...
This reverts commit 68ac167ec3
2015-02-05 09:18:48 +00:00
Andy Rose
68ac167ec3
U4-4198, adding a hidden field in the related links property editor to maintain the title property when editing. This will be mapped directly to the caption property value.
2015-02-04 16:30:14 +00: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 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
b899ab6557
Fixes: U4-5834 Change password description text is confusing
2015-01-29 17:49:58 +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
Sunshine Lewis
c1cc8a3824
U4-4565 Add margin to bottom bar
2015-01-27 09:57:51 -05: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
AndyButland
4775b638a4
Reverted previous commit and changed anchor removal to target the correct tag (the elipsis)
2015-01-19 08:05:32 +01:00
AndyButland
17906b505d
Removed code in tree synchronisation that removes anchor tag containing node name for certain nodes
2015-01-18 21:13:24 +01:00
Asbjørn Riis-Knudsen
778d8e0afa
Added missing apostrophes
2015-01-14 09:00:12 +01:00
arknu
f8ed9e60f6
U4-6103: Replace style with ng-style (again)
2015-01-12 22:13:01 +01:00
Shannon
dc846e7ff6
Fixes installer email validation. Ensures all validation directives are registered under the correct module: umbraco.directives.validation, then we load this module in the installer so we can use the correct email validation directive.
2015-01-07 15:02:58 +11:00
Shannon
322bd4e41e
Fixes: U4-5717 Member email validation does not allow valid domains (Umbraco 7.1.4)
2015-01-07 14:32:39 +11:00
Shannon
97a05008b3
Makes the umbProperty directive check optional since these validators can exist outside of an umbProperty directive (i.e. like in a dialog for a parameter editor)
2015-01-06 12:03:19 +11:00
Shannon Deminick
69e1dd1c73
Merge pull request #612 from gildebrand/patch-3
...
Fix for macrocontainer making it possible to edit
2015-01-06 11:50:31 +11:00
Shannon
a4f7c49f50
Merge branch 'Alain-es-Fix_for_U4-5875' into dev-v7 - And updates quite a lot: changes directive name to valPropertyValidator and changes how it works to be ultra flexible for custom validation of property data. Updates umbProperty directive to expose an API for other directives to utilize (like the new set setPropertyError method). Updates valServer to use the better way to access the current property object from the umbProperty directive API. Updates both valServer and valPropertyMsg to only perform a watch when necessary when there has been server side errors, this will speed up client side performance quite a bit. Now the tags, color picker and upload property editors performs correct client side and server side validation for the required validation flag.
2015-01-06 10:55:38 +11:00
Anton Gildebrand
11b53a5dcc
Fix for macrocontainer making it possible to edit
2015-01-05 15:17:50 +01:00
Shannon
d4c0ea9c48
working on U4-5875 - Updated RequiredManifestValueValidator to automatically check for empty json strings if the value type is JSON. Updates the TagsPropertyEditor to check for empty json in it's required validator. Updated the tags JS to always update the model value so if there's a server side validation, it gets cleared on change.
2015-01-05 14:25:16 +11:00
Shannon
459d9b34e7
Fixes: U4-5974 User which is not administrator getting logged out when clicking recycle bin
2015-01-05 12:22:49 +11:00
Shannon
201464cb44
Fixes: U4-5918 Update Underscore.js and also updates our usage of bower with the correct grunt-bower plugin, this massively simplifies bower usage and paves the way to start using bower for all JS components.
2015-01-02 14:25:11 +11:00
Shannon
a68fed42ad
Merge branch 'madsoulswe-7.2.1' into dev-v7
2015-01-02 11:58:56 +11:00
