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

5424 Commits

Author SHA1 Message Date
Claus
73d681d674 Merge remote-tracking branch 'origin/dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web/Models/Mapping/ContentModelMapper.cs
 2017-10-25 11:52:30 +02:00
Sebastiaan Janssen
b70f543790 Reverts wrongly committed files 2017-10-23 14:02:00 +02:00
Sebastiaan Janssen
24c1c15b66 Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7 2017-10-23 13:59:30 +02:00
Sebastiaan Janssen
4a0cd7228b Revert "U4-10554 - warn if closing page with changes" 
This reverts commit 24b147e2a6.
 2017-10-23 13:59:06 +02:00
Stephan
edfe212227 Fix login issue 2017-10-20 15:35:30 +02:00
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
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
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
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
Warren Buckley
5f9865cc73 Merge pull request #2228 from umbraco/temp-U4-10309 
fixes: MBOGA: Redesign the properties tab
 2017-10-16 14:57:45 +01: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
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
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
Mads Rasmussen
2708f11fcd fix path to angular moment 2017-10-16 12:01:19 +02: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
ca57b9c5e6 fixes issue with js exceptions 2017-10-13 16:50:39 +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
Mads Rasmussen
1cc3b39601 fixes: U4-10521 Creating new folders from the media picker no longer works 2017-10-11 10:18:40 +02:00
Warren Buckley
043c677ddc Merge branch 'dev-v7.8' into temp-U4-10051 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/components/overlays/umb-overlay-backdrop.less
 2017-10-10 13:09:06 +01:00
Robert
b08376651a Merge pull request #2225 from umbraco/temp-U4-10473 
Moved documentType and mediaLink to root node for media section
 2017-10-09 10:54:51 +02:00
Robert
75514c7c42 Changed angular to make sure the values are matching 2017-10-09 10:43:03 +02:00
Warren Buckley
0f6e7d26c9 Merge pull request #1596 from StefanoChiodino/U4-7721 
U4-7721 install button miss aligned
 2017-10-06 15:00:09 +01:00
Warren Buckley
51ceba6fea Merge pull request #1780 from bjarnef/dev-v7-U4-9599 
U4-9599 - Fix caret in font size select
 2017-10-06 14:25:55 +01:00
keroberts
6de3b920eb Fix Typo in Email Property Editor 2017-10-05 14:04:02 +01:00
Robert
5eb609d8a0 Renamed a few properties and a class 2017-10-03 15:35:36 +02:00
Mads Rasmussen
4d5069726b Update client side unit tests 2017-09-29 10:44:18 +02:00
Zsolt
588640037c Merge pull request #2054 from bjarnef/dev-v7-U4-7044 
U4-7044 - Adjust icon and heading to fix issue with icon position in IE
 2017-09-29 10:28:10 +02:00
Zsolt
7b106caf95 Merge pull request #2214 from bjarnef/dev-v7-U4-10461 
U4-10461 - Format dates using culture of current backoffice user
 2017-09-29 10:14:27 +02:00
Mads Rasmussen
0da8644e77 Merge branch 'dev-v7' into temp-U4-10309 2017-09-29 09:55:32 +02:00
Zsolt
828a94bc4f Merge pull request #2213 from bjarnef/dev-v7-U4-10462 
U4-10462 - Localize dropdown filters
 2017-09-29 09:28:42 +02:00
Shannon
33d7598d3c Adding key fallback to list view select functions to fix issue when selecting multiple items with an ID of int.MaxValue 2017-09-29 13:16:53 +10:00