Per Osbeck
ffaf1f96b9
Fix for U4-6444
2015-03-24 09:28:53 +01:00
Shannon
b02e0c0232
Fixes: U4-6433 Usercontrol loaded after package installation not executing
2015-03-20 17:47:33 +11:00
Per Ploug
19e4fe5059
Grid labels header colors for delete and move actions
2015-03-19 14:33:12 +01:00
Per Ploug
f0fc3313e4
Tweaked borders a tiny bit
2015-03-19 12:46:29 +01:00
Per Ploug
dc7cb08824
Styling for grid editors + row labels
2015-03-19 12:29:05 +01:00
Shannon
af112f6b20
Adds nicer grid editor labels on hover
2015-03-19 17:08:14 +11:00
Shannon
cbef51eaf0
Fixes: U4-6294 Feature Request 7.2.1 Grid - UX - labeling the grid editors - but will see if we can do a better job of the labeling
2015-03-19 16:10:46 +11:00
Shannon
db5c204d8c
Merge branch '7.2.1-configurablemacrogrideditor' of https://github.com/mattbrailsford/Umbraco-CMS into mattbrailsford-7.2.1-configurablemacrogrideditor
2015-03-19 14:33:36 +11:00
Shannon
9469b0b844
Fixes: U4-6402 Grid config file should be merged with package.manifests & U4-6427 Grid config file has caching problems because it's downloaded as a static file
...
This also fixes up the OutputCaching params on the BackOfficeController since OutputCache is bypassed when an action requires authentication, so now we manually do some caching when not in debug mode for authorized actions (of course auth happens before any cached response can occur). This also fixes up the static caching that was happening with the ManifestBuilder so now when that is not in use it gives back it's memory. This also fixes up any client side caching that was happening on BackOfficeController - before we were allowing client cache to happen for a few actions on that controller which is incorrect, we need to disable all client cache for all actions on that controller.
2015-03-19 13:53:15 +11:00
Shannon
1a082464e9
Fixes: U4-5127 AssetService does not support virtual paths (~/) - and fixes up some formatting
2015-03-19 11:44:37 +11:00
Shannon
e004ad31b5
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
...
Conflicts:
src/Umbraco.Web.UI.Client/src/views/propertyeditors/grid/grid.controller.js
2015-03-19 11:36:05 +11:00
Shannon
6cf25f0043
Fixes: U4-6428 Grid configuration does not support virtual paths - and therefore is not compatible with virtual directories
2015-03-19 11:35:04 +11:00
Sebastiaan Janssen
00fbc6dfcb
Revert "Fixes broken bower jquery reference"
...
This reverts commit c2cfd26ee6
2015-03-18 13:05:21 +01:00
Per Ploug
3a9ad91f8f
Adds better error handling to missing grid editors
2015-03-18 11:45:22 +01:00
Per Ploug
c2cfd26ee6
Fixes broken bower jquery reference
2015-03-18 11:45:04 +01:00
Per Ploug
c5f26c7c15
Fixes: U4-6331 The grid tools overlay disable the links/buttons on smaller screens
2015-03-18 11:44:49 +01:00
Shannon
37b219f6e1
Fixes: U4-4942 Widget disappears in RTE when there is a space in the macro alias
2015-03-18 19:52:45 +11:00
Shannon Deminick
300a46f1b2
Merge pull request #613 from gildebrand/patch-4
...
parseMacroSyntax accepts other characters than a-z
2015-03-18 19:17:33 +11:00
Shannon
9aa5df43bf
Fixes: U4-5956 Feature request: Enhance the preview mode with labels clearly explaining the current view
2015-03-18 19:14:47 +11:00
Sebastiaan Janssen
7210c6cd95
U4-6384 Incorrect Error Message When Uploading Large File
...
#U4-6384 Fixed Due in version 7.2.3
2015-03-17 17:59:24 +01:00
Shannon
2feef247ed
Fixes: U4-3562 Cannot preview when no template is assigned
2015-03-17 19:31:46 +11:00
kgiszewski
f06a468fb4
Fix for U4-6395, U4-6117
2015-03-13 11:40:04 -04:00
Shannon
d2083673be
Fixes: U4-3420 Firefox v25.0 - Right click context menu doesn't work - this felt like being a web dev 10 years ago when you had to code totally differently for each browser. Firefox unfortunatley treats 'a' tags differently than anything else and combined with angular saying you can have empty 'href' tags doesn't work. In the end, the fix was easy, just remove the empty (supposed to be supported) href attributes from the 'a' tags in the tree, then the contextmenu starts working in firefox and the events can be canceled as per normal. This commit also moves the angular localization library to use bower.
2015-03-10 13:02:34 +11:00
Shannon
2834ccdc2b
Fixes: U4-6344 TinyMCE RTE style_formats configuration changes
2015-03-09 17:31:29 +11:00
Shannon
f708a24401
fixes U4-6333, U4-6348
2015-03-03 17:36:53 +11:00
Shannon
ded1def8e2
Fixes: U4-6333 - but should fix this better (i.e. centralize the code to clean for xss in JS like we have in c#)
2015-02-27 16:50:33 +11:00
Shannon
5a2a3c3b1e
removes duplicate attribute
2015-02-27 01:04:53 +01:00
Shannon
9a89b6048a
Merge branch '7.2.0_U4-5236' of https://github.com/bjarnef/Umbraco-CMS into bjarnef-7.2.0_U4-5236
...
Conflicts:
src/Umbraco.Web.UI.Client/src/less/tree.less
2015-02-20 09:43:21 +01:00
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
