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

3428 Commits

Author SHA1 Message Date
Mads Rasmussen
b21dea84d9 remove markup from tour step title 2017-11-08 15:38:15 +01:00
Shannon
b9b1fc3a70 Adds a global config switch to enable/disable tours entirely 2017-11-09 00:57:05 +11:00
Shannon
1d52f59657 Puts tours on the file system and loads them from an api controller 2017-11-09 00:41:59 +11:00
Shannon
78f6b8d8bc Fixes up more the the session id validation, makes sure that the GetUserSecondsMiddleWare also validates the session since this is what keeps the user logged in if that option is being used. 2017-11-08 23:57:17 +11:00
Shannon
e6de9e0004 Merge branch 'dev-v7' into dev-v7.8 2017-11-08 19:25:22 +11:00
Shannon
9290f61f94 Merge branch 'dev-v7.6' into dev-v7 
# Conflicts:
#	src/Umbraco.Core/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web.UI/umbraco/config/lang/en.xml
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
 2017-11-08 17:36:27 +11:00
Shannon
0f3a76809b Merge branch 'dev-v7.8' into temp-U4-10305 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
#	src/Umbraco.Web.UI.Client/src/common/directives/components/tree/umbtreeitem.directive.js
 2017-11-08 14:52:21 +11:00
Shannon
4f88da2c26 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Web.UI/umbraco/config/lang/en_us.xml
#	src/Umbraco.Web/Models/Mapping/TabsAndPropertiesResolver.cs
 2017-11-08 14:51:27 +11:00
Sebastiaan Janssen
51fec0c7d3 Remove misleading text, nothing bad will happen when you close the sort panel, sorting is a background task. 2017-11-07 14:03:17 +01:00
Sebastiaan Janssen
87ace12a4f Prevent double clicks of the Save button 
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
 2017-11-07 13:49:02 +01:00
Daniël Knippers
c066280990 Make a shiny template for the emails that are sent from Umbraco 
Make a shiny template for the emails that are sent from Umbraco (only for EN and EN-US).
 2017-11-02 16:44:08 +00:00
Shannon
a4ef487fab Merge branch 'dev-v7.8' into temp-U4-10305 
# Conflicts:
#	src/Umbraco.Web.UI.Client/src/less/belle.less
#	src/Umbraco.Web.UI.Client/src/views/components/content/edit.html
#	src/Umbraco.Web.UI.Client/src/views/media/edit.html
 2017-11-01 15:24:49 +11:00
Shannon
2fdd1c0bd2 bump version 2017-10-31 11:52:43 +11:00
Shannon
a2025c14b1 Merge branch 'dev-v7' into dev-v7.8 
# Conflicts:
#	src/Umbraco.Core/Umbraco.Core.csproj
 2017-10-31 11:18:52 +11:00
Richard Thompson
594c473134 Updated grammar 
Updated the grammar of the email validation messages
 2017-10-30 15:00:08 +00:00
Claus
1c883be16b Merge remote-tracking branch 'origin/temp-u4-8409' into dev-v7.8 2017-10-25 12:27:34 +02:00
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
Claus
fa68bee762 removing left over using statements and references to SharpZipLib. 2017-10-24 15:16:12 +02:00
Mads Rasmussen
ab09042fdc add options to prevent click in backdrop highlighted area 2017-10-24 15:00:14 +02:00
Mads Rasmussen
ee79d7ecdc add custom backdrop opacity to tour steps 2017-10-24 13:35:26 +02:00
Sebastiaan Janssen
18e377f159 U4-10564 - Update ImageProcessor dependencies 2017-10-24 13:20:33 +02:00
Sebastiaan Janssen
7e7f9902f6 Bumps version to 7.7.4 2017-10-23 14:18:00 +02:00
Sebastiaan Janssen
a36184a261 Bump version to 7.6.11 2017-10-23 14:14:59 +02:00
Sebastiaan Janssen
b70f543790 Reverts wrongly committed files 2017-10-23 14:02:00 +02:00
Stephan
edfe212227 Fix login issue 2017-10-20 15:35:30 +02:00
Mads Rasmussen
d518ab908e add intro/outro step logic, start on intro tour, testing intro steps 2017-10-19 13:11:10 +02:00
Mads Rasmussen
27c884f4eb add more data elements for navigating the UI 2017-10-19 09:10:13 +02:00
Richard Thompson
507e3ece98 Removed duplicate translations 
Removed duplicate definition of English translations
 2017-10-18 15:36:17 +01: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
7f86166abf Merge branch 'dev-v7' of https://github.com/hfloyd/Umbraco-CMS into temp-u4-7115 2017-10-17 14:59:07 +02:00
Sebastiaan Janssen
461ce64feb Bump version to 7.6.10 2017-10-17 10:57:18 +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
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
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
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
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
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
Shannon
2a0cc71d06 U4-10539 - reverts merge issue that reverted the fix for U4-9262 2017-10-16 17:05:33 +11:00
Mads Rasmussen
c59ac4ee0e moved tours from dashboard to service, option to group tours, added functions to get tours from service 2017-10-13 12:29:44 +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
Zsolt
89b714c960 Merge remote-tracking branch 'origin/dev-v7.8' into temp-U4-10305 2017-10-12 10:15:22 +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
Mads Rasmussen
0b3a38ec8f add option to disable all events on backdrop click to prevent dialogs, overlays, etc. form closing 2017-10-10 12:14:10 +02:00
Mads Rasmussen
ea6f561c96 move backdrop to its own component 2017-10-09 10:19:49 +02:00
Sebastiaan Janssen
fe2b86b681 Html encode nodenames to prevent XSS attacks. Fixes U4-10497 XSS Vulnerability in page name. 2017-10-06 14:38:21 +02:00
Mads Rasmussen
b9d1a776cb init tour component 2017-10-04 09:19:33 +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