yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
20,592 Commits 4 Branches 7 Tags
6dae4396bb769f2dcfabcdc21d98ced1bf5e0e38
Commit Graph

20592 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Robert
6dae4396bb Merge pull request #2250 from umbraco/temp-u4-10554 
U4-10554 - warn if closing page with changes
 2017-10-18 11:53:54 +02:00
Stephan
dd5560f00b U4-8616 - minor cleanup 2017-10-18 10:11:23 +02:00
Stephan
b56575fc50 Merge branch 'dev-v7' of https://github.com/jhauge/Umbraco-CMS into temp-u4-8616 2017-10-18 09:49:05 +02:00
Stephan
b06d30c0f9 U4-10554 - cross-browser 2017-10-18 09:29:50 +02:00
Claus
0688835ac0 fixing bug in U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item 2017-10-17 23:44:03 +02:00
Stephan
30a0d553d5 Merge pull request #1230 from bjarnef/dev-v7-U4-8319 
U4-8319 - Sort data types array by name A-Z
 2017-10-17 15:06:54 +02:00
Stephan
d0fbc362b2 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-10-17 15:00:13 +02:00
Stephan
39c534ef54 Merge branch 'temp-u4-7115' into dev-v7 2017-10-17 14:59:56 +02:00
Stephan
7f86166abf Merge branch 'dev-v7' of https://github.com/hfloyd/Umbraco-CMS into temp-u4-7115 2017-10-17 14:59:07 +02:00
Robert
838e86469a Merge pull request #2245 from umbraco/temp-u4-5322 
U4-5322 - add labels to color picker
 2017-10-17 14:47:36 +02:00
Stephan
24b147e2a6 U4-10554 - warn if closing page with changes 2017-10-17 14:39:47 +02:00
Robert
bf20af9345 Merge pull request #2247 from umbraco/temp-u4-5722b 
Temp u4 5722b
 2017-10-17 13:19:34 +02:00
Robert
c69774e3f2 Merge pull request #2246 from umbraco/temp-u4-7360 
U4-7360 - toggle password visibility
 2017-10-17 12:30:37 +02:00
Robert
7de8f5a59a Added missing width and height to the "show password" icon 
Not having the height and width on the icon, caused IE 11 to shrink the icon which looked a bit off.
 2017-10-17 12:09:55 +02:00
Sebastiaan Janssen
6795afd5c2 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/SolutionInfo.cs
#	src/Umbraco.Core/Configuration/UmbracoVersion.cs
#	src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
 2017-10-17 11:06:52 +02:00
Sebastiaan Janssen
9411a22a0d Don't forget to call the ConfigureUmbracoAuthentication method 2017-10-17 11:04:01 +02:00
Sebastiaan Janssen
461ce64feb Bump version to 7.6.10 2017-10-17 10:57:18 +02:00
Robert
53c251feb5 Merge pull request #2237 from umbraco/temp-U4-10504 
U4-10504 Previewing content results in the same PrepareDocument (expe…
 2017-10-17 10:20:21 +02:00
Sebastiaan Janssen
c5a55b17e6 Manually applying U4-10369: Split out ConfigureUmbracoAuthentication method 2017-10-17 10:08:37 +02:00
Sebastiaan Janssen
fd577afe2c Html encode nodenames to prevent XSS attacks. Fixes U4-10497 XSS Vulnerability in page name. 
(cherry picked from commit fe2b86b681)
 2017-10-16 20:32:56 +02:00
Sebastiaan Janssen
f46ef0b006 U4-10506 Importing a specially crafted document type file can cause XXE attack 
(cherry picked from commit 5dde2efe0d)
 2017-10-16 20:32:04 +02:00
Stephan
909e3788ea Merge branch 'U4-5722' of https://github.com/NikRimington/Umbraco-CMS into temp-u4-5722b 2017-10-16 17:20:19 +02:00
Stephan
09a92ef6ce U4-7360 - toggle password visibility 2017-10-16 16:58:15 +02:00
Stephan
7d9c2bcce9 Merge branch 'dev-v7' into temp-u4-5322 2017-10-16 16:32:43 +02:00
Stephan
529ae961ff U4-5322 - add labels to color picker 2017-10-16 16:16:43 +02:00
Sebastiaan Janssen
04f64cd804 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-10-16 16:14:54 +02:00
Sebastiaan Janssen
dc937ec942 Fix the "Add media" box no longer being square 2017-10-16 16:13:47 +02:00
Shannon
cefd9e7323 Fixes PostAddFolder 
(cherry picked from commit c5d874464a)

# Conflicts:
#	src/Umbraco.Web/Editors/MediaController.cs
 2017-10-16 15:53:54 +02:00
Mads Rasmussen
315690e758 fixes breadcrumbs and search when start node is set 
(cherry picked from commit 1ec07aa205)
 2017-10-16 15:14:24 +02:00
Mads Rasmussen
fb8c519f71 fixes: U4-10521 Creating new folders from the media picker no longer works 
(cherry picked from commit 1cc3b39601)

# Conflicts:
#	src/Umbraco.Web.UI.Client/src/views/common/overlays/mediaPicker/mediapicker.html
 2017-10-16 15:13:56 +02:00
Sebastiaan Janssen
80f172e3fb Bump version to 7.7.3 2017-10-16 14:56:43 +02:00
Sebastiaan Janssen
5eced19816 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/property-editors.less
#	src/Umbraco.Web.UI.Client/src/views/propertyeditors/mediapicker/mediapicker.controller.js
 2017-10-16 14:24:18 +02:00
Warren Buckley
5df4d3509d Fix in PowerShell build - The 7Zip tool download was giving two paths & thus break the build script 
(cherry picked from commit a2e6da2491)
 2017-10-16 14:22:09 +02:00
Claus
4bd263e7bc U4-10524 Show warning in UI for the media/content picker that is referencing a trashed or deleted item 
U4-10533 Show warning in UI for the link picker that is referencing a trashed or deleted item
cherrypicked from dev-v7.
 2017-10-16 13:52:17 +02:00
Claus
b094bfad29 U4-10533 Show warning in UI for the link picker that is referencing a trashed or deleted item 2017-10-16 13:05:20 +02:00
Sebastiaan Janssen
e333f6c628 Merge pull request #2236 from umbraco/temp-U4-10521 
fixes: U4-10521 Creating new folders from the media picker no longer …
 2017-10-16 12:44:32 +02:00
Shannon
916bc6badb U4-10539 - reverts merge issue that reverted the fix for U4-9262 
(cherry picked from commit 2a0cc71d06)
 2017-10-16 08:38:17 +02:00
Sebastiaan Janssen
76ee23b933 Merge pull request #2243 from umbraco/temp-U4-10539 
U4-10539 - reverts merge issue that reverted the fix for U4-9262
 2017-10-16 08:36:56 +02:00
Shannon
2a0cc71d06 U4-10539 - reverts merge issue that reverted the fix for U4-9262 2017-10-16 17:05:33 +11:00
Warren Buckley
a2e6da2491 Fix in PowerShell build - The 7Zip tool download was giving two paths & thus break the build script 2017-10-13 11:19:39 +01:00
Mads Rasmussen
ba7d8b0955 Merge pull request #2240 from bjarnef/dev-v7-U4-10528 
U4-10528 - Add better function to get initials from name
 2017-10-13 10:13:00 +02:00
Shannon Deminick
7288bcf679 Merge pull request #2239 from umbraco/temp-U4-10524 
U4-10524 Show warning in UI for any picker that is referencing a tras…
 2017-10-13 17:08:16 +11:00
Shannon
ca57b9c5e6 fixes issue with js exceptions 2017-10-13 16:50:39 +11:00
Shannon
62ce7f6132 U4-10519 Legacy create is broken 2017-10-13 16:33:49 +11:00
Bjarne Fyrstenborg
b1f2c5d93a Add better function to get initials from name 2017-10-12 23:46:02 +02:00
Mads Rasmussen
1ec07aa205 fixes breadcrumbs and search when start node is set 2017-10-12 16:13:14 +02:00
Claus
13055ad1f2 U4-10524 Show warning in UI for any picker that is referencing a trashed or deleted item 
fixing the trash flag not getting mapped via automapper.
fixing up the ui for mediapicker.
fixing a small ui issue with the contentpicker and trashed content.
 2017-10-12 11:35:08 +02:00
Shannon
d5447106a6 U4-10504 Previewing content results in the same PrepareDocument (expensive) procedure to be executed 3 times 2017-10-12 18:23:19 +11:00
Shannon
c5d874464a Fixes PostAddFolder 2017-10-12 17:11:45 +11:00
Mads Rasmussen
1cc3b39601 fixes: U4-10521 Creating new folders from the media picker no longer works 2017-10-11 10:18:40 +02:00