Mads Rasmussen
45a246d8b6
handle entity and full media objects in media grid
2017-05-23 14:38:34 +02:00
Mads Rasmussen
65bcd78872
add helper to get file extension
2017-05-23 14:37:51 +02:00
Mads Rasmussen
a0fd7001e9
fixes image select in details overlay
2017-05-23 14:37:26 +02:00
Sebastiaan Janssen
cf7c0dffb0
Merge branch 'u4-9558' of https://github.com/AndyButland/Umbraco-CMS into AndyButland-u4-9558
2017-05-20 11:48:47 +02:00
Shannon Deminick
c09cd95eb6
Merge pull request #1951 from umbraco/temp-U4-9919
...
U4-9919 Updated media files are deleted
2017-05-19 13:17:35 +10:00
Claus
79844154fb
U4-9919 Updated media files are deleted
2017-05-18 11:30:11 +02:00
Claus
067a1ba8e6
U4-9646 RTE Link dialog should auto focus on url
2017-05-18 10:02:46 +02:00
Shannon
765decf3b1
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
...
# Conflicts:
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/Services/MediaService.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web/Trees/PartialViewMacrosTree.cs
# src/Umbraco.Web/Trees/PartialViewsTree.cs
2017-05-17 20:00:29 +10:00
AndyButland
eb35791003
Reverted media picker behaviour when selecting images to use just configured image types
2017-05-16 21:16:11 +01:00
Claus
d146df43e6
Merge pull request #1903 from HarveyWilliams/dev-v7
...
U4-9806 Media Picker media hover should show full title
2017-05-15 10:19:04 +02:00
AndyButland
3cc0df0273
Fixed media picker calculation of intersection of allowed whitelist and images list
2017-05-09 23:44:31 +02:00
AndyButland
712cd29fea
Upload checks to utilise whitelist. Refactored check on white and black list to common extension method.
2017-05-09 23:29:30 +02:00
mikkelhm
745252341f
Merge branch 'dev-v7' into dev-v7.6
...
# Conflicts:
# src/Umbraco.Core/Persistence/Migrations/MigrationBase.cs
# src/Umbraco.Web.UI.Client/src/common/directives/components/imaging/umbimagegravity.directive.js
2017-05-08 13:58:08 +02:00
Shannon Deminick
d012d8e8b6
Merge pull request #1925 from SaDa1337/dev-v7
...
fixed console error on media picker
2017-05-08 17:11:28 +10:00
Mikkel Holck Madsen
9318da2883
Merge pull request #1931 from umbraco/temp-U4-9849-2
...
U4-9849 Query Builder not working in template editor. Always returns …
2017-05-08 09:05:29 +02:00
James Coxhead
9ccf7bdbab
Fix typo error in upgrade installer
...
Changed "your" to "you're"
2017-05-07 16:22:54 +01:00
Claus
8a096cd826
Merge pull request #1794 from TheBekker/fix-U4-9038
...
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:51:31 +02:00
Claus
3b236ba724
Merge pull request #1794 from TheBekker/fix-U4-9038
...
[fix-U4-9038] get and set media start node for mediaPickerOverlay in …
2017-05-05 10:47:52 +02:00
Claus
e7eaf6959f
U4-9849 Query Builder not working in template editor. Always returns Model.Content.Site().Children()
...
adding missing nullchecks in the endpoint action.
ensuring promise returns before setting init data - the unresolved promise was being used on the query model instead of the actual text string the promise returns - causing the endpoint to fail to bind the model.
2017-05-04 15:08:37 +02:00
Claus
1030fd5294
U4-9704 Sorting UDI media picker items, makes it store Int's
2017-05-03 10:21:00 +02:00
Maciej Sadowski
0eafa14246
fixed console error on media picker
2017-05-02 15:36:39 +02:00
Niels Hartvig
d553eb2978
Change it back to username and then with a hint for email (for backwards compat.)
2017-04-28 13:57:29 +02:00
Niels Hartvig
d1e6c0e835
Change username to email in login dialog
2017-04-28 13:37:19 +02:00
Shannon
a6f9d14a1b
Merge remote-tracking branch 'origin/dev-v7.6' into temp-CON-1267
2017-04-26 14:18:05 +10:00
Shannon
5d4a97591a
Cherry picks changes for package fetching for Our to use the new endpoint and passes in the current version
2017-04-26 14:08:37 +10:00
Shannon
bfb81f6362
Allows for the umb pckage repo rest api endpoint to be configurable - for testing
2017-04-26 14:04:47 +10:00
Harvey Williams
81354cea3c
U4-9806 Media Picker media hover should show full title
...
Added title to all media items in the media picker rather than just SVG and normal images.
Solving an issue where whole titles could not be visible if the title was too long.
2017-04-24 16:29:35 +01:00
Shannon
d295174e53
Updates JS to include the current umbraco version when requesting a package's details, updates the c# to use a new endpoint on OUR to ensure that the correct file is downloaded based on the umb version passed in.
2017-04-24 21:31:35 +10:00
Mads Rasmussen
55022e2aaf
fix removeNode check to only be for the root node
2017-04-24 12:46:45 +02:00
Warren Buckley
c34a1060f7
When we create a brand new template & set a master template we were removing the entire tree for templates - this adds in a check to not do the remove of the old node if its a brand new template we are creating
2017-04-20 15:49:49 +01:00
Mads Rasmussen
20526b40bf
fixes: U4-9789 Email input type is not same height as text input type
2017-04-20 12:03:29 +02:00
Shannon Deminick
992073ab4e
Merge pull request #1888 from umbraco/temp-U4-9717
...
fixes: U4-9717 7.6 "Do something else"-button
2017-04-20 11:00:49 +10:00
Mads Rasmussen
004a3e2808
Merge pull request #1882 from umbraco/temp-U4-9769
...
U4-9769 - BG Color change for installer to purple hue
2017-04-19 14:42:43 +02:00
Mads Rasmussen
d05bfc8983
use same purple as the login screen
2017-04-19 14:39:38 +02:00
Mads Rasmussen
334fcf38ec
fixes: U4-9780 Use email input type for password reset
2017-04-19 11:25:14 +02:00
Mads Rasmussen
8873d0f79d
fixes: U4-9717 7.6 "Do something else"-button
2017-04-19 10:04:55 +02:00
Shannon
777b02b84c
Merge remote-tracking branch 'origin/dev-v7' into dev-v7.6
...
# Conflicts:
# build/NuSpecs/UmbracoCms.nuspec
# build/UmbracoVersion.txt
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Core/IO/IFileSystem.cs
# src/Umbraco.Core/Media/ImageHelper.cs
# src/Umbraco.Core/Models/ContentExtensions.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web.UI/packages.config
2017-04-18 20:17:59 +10:00
Warren Buckley
379bbe5bc4
Change background color to purple to the overlay solid color before we login to backoffice at end of installer
2017-04-13 12:06:48 +01:00
Emil Wangaa
298e56ad05
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
2017-04-12 14:24:27 +02:00
Emil Wangaa
d74d2cd945
Fixes U4-9732 Insert Value in new template editor missing standard metadata fields
2017-04-12 14:24:10 +02:00
Sebastiaan Janssen
abda579da6
Merge pull request #1875 from umbraco/temp-U4-9753
...
fixes: U4-9753 When uploading, moving or deleting folders in the medi…
2017-04-11 22:00:40 +02:00
Sebastiaan Janssen
2e43e97ae2
Merge pull request #1867 from umbraco/temp-U4-9722
...
fixes: U4-9722 7.6 RC layout issues
2017-04-11 21:51:24 +02:00
Sebastiaan Janssen
c7ac3e7691
Merge pull request #1873 from umbraco/temp-U4-9749
...
fixes: U4-9749 Clean up ace themes and modes
2017-04-11 21:41:00 +02:00
Sebastiaan Janssen
a209a2067c
Merge pull request #1874 from umbraco/temp-U4-9751
...
fixes: U4-9751 "Your recycle bin is empty" shows when folders are add…
2017-04-11 21:38:04 +02:00
Warren Buckley
ba559f6836
Pass the emptystate message in other places we use the treepicker
2017-04-10 10:54:29 +01:00
Warren Buckley
a320b63fd6
Checks that the tree has items otherwise we display the emptystate message
2017-04-10 10:51:28 +01:00
Warren Buckley
200497b865
Dictionary is the most common treepicker that may not have any items in core
2017-04-10 10:42:26 +01:00
Warren Buckley
8bd38b3cdd
For tree search results - we display a generic no results message for an emtpy state now. Need to check with Mads if I broke the transiston?!
2017-04-10 09:49:56 +01:00
Jason Woods
4ef1eeb8bc
The form closing tag
...
The form was closing tag was </div> should be </form>
2017-04-07 11:09:21 -06:00
Mads Rasmussen
0d7661a779
fixes: U4-9753 When uploading, moving or deleting folders in the media section you have to reload to see the changes
2017-04-07 13:59:26 +02:00
