yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
13,104 Commits 4 Branches 7 Tags
4697f2ecad9dff86fa866037e71cf1660dbbb32a
Commit Graph

2292 Commits

Author SHA1 Message Date
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
bjarnef
7091cb6012 Change code for help videos 
Change code for in help.controller.js as it was.
 2015-02-05 10:52:55 +01: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
bjarnef
a721f6836f Pointer cursor for sections in IE10 
IE10 displayed a text cursor for tray and help section. Added cursor:
pointer; to make sure a pointer cursor is displayed.
 2015-02-05 03:31:41 +01:00
bjarnef
83840ba6dd U4-4507 - Make expand arrow in sections as a toggle 
I have made some suggestions, so the right arrow act as a toggle button,
so you easily can collapse the extra overflow-sections. Furthermore I
have made some changes, so when you click userDialog or helpDialog other
open dialogs close and also sections. When you click a section or expand
it also close dialogs, so you don't have to close those dialogs first.
 2015-02-04 21:55:19 +01: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
Stephan
1d80fc66af Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	src/Umbraco.Core/Umbraco.Core.csproj
 2015-01-30 14:03:01 +01: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
Shannon
c092d871c1 Fixes: U4-5834 Change password description text is confusing 2015-01-29 17:48:41 +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
mattbrailsford
9c8e6ab864 Add "config" support to the macro grid property editor to allow predefining the macro to use 2015-01-26 12:35:01 +00:00
Shannon
3f8df66385 Merge branch 'dev-v7' into 7.3.0 2015-01-21 13:28:10 +11: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
Shannon
0a0d845173 Merge branch 'dev-v7' into 7.3.0 2015-01-19 13:26:30 +11: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
Shannon
d9d8bae376 ensures that the html form attribute is set to POST if for some very strange reason someone visited that html page and tries to submit it with a real password 2015-01-16 10:58:22 +11:00
Shannon
19037ee1ba Ensures all stylesheet usages in RTE are working as expected 2015-01-15 12:40:09 +11: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
023c7f3fe7 Merge branch 'dev-v7' into 7.3.0 
Conflicts:
	build/UmbracoVersion.txt
	src/Umbraco.Core/Configuration/UmbracoVersion.cs
	src/Umbraco.Core/Persistence/Repositories/TemplateRepository.cs
	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
 2015-01-07 15:54:08 +11: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
89b8fe93b7 Updes more code for U4-337 2015-01-06 15:36:14 +11:00
Shannon
8509aef99a Merge branch 'U4-337' of https://github.com/leekelleher/Umbraco-CMS into leekelleher-U4-337 2015-01-06 12:23:31 +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
fec70fcf47 parseMacroSyntax accepts other characters than a-z 
I had problems with parseMacroSyntax when `syntax` included Swedish characters. Now it works with other characters than a-z as well.
 2015-01-05 17:13:50 +01: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
leekelleher
8a32f02781 Added custom event handler to create the relation for trashed nodes. 
Removed the additional (AJAX) resource call from the Angular controller, as the relation removal is handled in server-side code during the move.
 2015-01-04 20:46:00 +00:00
leekelleher
f21265c7ae Added "DeleteById" method to the Relation Resource/Service. 2015-01-03 22:22:54 +00:00
leekelleher
458e7dde94 Created "relationResource" to expose methods from RelationService to angular controllers. 
Added view for the "restore" menu option.
 2015-01-03 20:10:39 +00: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