Mads Rasmussen
|
5d6cbee196
|
rename data attribute for editor container
|
2017-11-21 21:39:34 +01:00 |
|
Mads Rasmussen
|
00cec3267c
|
Merge pull request #2318 from abjerner/patch-24
New Danish translation for "Dato for Fortryd udgivelse"
|
2017-11-16 12:07:01 +01:00 |
|
Mads Rasmussen
|
4bfb2d219b
|
Merge branch 'dev-v7' into dev-v7.8
# Conflicts:
# src/SolutionInfo.cs
# src/Umbraco.Core/Configuration/UmbracoVersion.cs
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
|
2017-11-16 12:01:26 +01:00 |
|
Sebastiaan Janssen
|
7eca99e249
|
Bump version to 7.7.6
|
2017-11-15 15:21:25 +01:00 |
|
Sebastiaan Janssen
|
dad77fc506
|
Bump version to 7.7.5
|
2017-11-14 07:17:19 +01:00 |
|
Sebastiaan Janssen
|
000ba73887
|
Merge branch 'dev-v7.6' into dev-v7
# Conflicts:
# build/NuSpecs/UmbracoCms.Core.nuspec
# src/Umbraco.Tests/Umbraco.Tests.csproj
# src/Umbraco.Tests/packages.config
# src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
# src/Umbraco.Web.UI/packages.config
# src/Umbraco.Web/Umbraco.Web.csproj
# src/Umbraco.Web/packages.config
# src/UmbracoExamine/UmbracoExamine.csproj
# src/UmbracoExamine/packages.config
# src/umbraco.MacroEngines/packages.config
# src/umbraco.MacroEngines/umbraco.MacroEngines.csproj
|
2017-11-13 15:38:59 +01:00 |
|
Mads Rasmussen
|
084fde885a
|
Merge pull request #2319 from abjerner/patch-25
"Set date" and "Clear date" in the new Info tab can now be localized
|
2017-11-13 15:34:30 +01:00 |
|
Sebastiaan Janssen
|
08b81d991b
|
Update to latest ImageProcessor
|
2017-11-13 15:33:54 +01:00 |
|
Sebastiaan Janssen
|
4937f87c0d
|
Update to latest Examine
|
2017-11-13 15:27:15 +01:00 |
|
Mads Rasmussen
|
50a5679b5c
|
Merge pull request #2316 from abjerner/patch-22
Added Danish translations for the new "History" and "Scheduled Publishing" headers
|
2017-11-13 15:24:19 +01:00 |
|
Anders Bjerner
|
2c248791e1
|
Added Danish translation for "content_noChanges"
|
2017-11-13 15:05:20 +01:00 |
|
Anders Bjerner
|
3405a1f600
|
Added Danish translation for "content_setDate"
|
2017-11-11 18:27:55 +01:00 |
|
Anders Bjerner
|
8be02ff7b0
|
Added English (US) translation for "content_setDate"
|
2017-11-11 18:26:41 +01:00 |
|
Anders Bjerner
|
c371f00315
|
Added English translation for "content_setDate"
|
2017-11-11 18:25:57 +01:00 |
|
Anders Bjerner
|
6ca94074f3
|
And here as well
|
2017-11-11 17:40:49 +01:00 |
|
Anders Bjerner
|
8236eee7a6
|
And while we're at it...
|
2017-11-11 17:36:13 +01:00 |
|
Anders Bjerner
|
8bdeca6374
|
On second thought, this may be even better
|
2017-11-11 17:28:40 +01:00 |
|
Anders Bjerner
|
e37bbdfcf4
|
New Danish translation for "Dato for Fortryd udgivelse"
|
2017-11-11 17:18:44 +01:00 |
|
Anders Bjerner
|
dac882ce9f
|
Added Danish translations for the new "History" and "Scheduled Publishing" headers
|
2017-11-11 17:10:25 +01:00 |
|
Shannon
|
fe2e689865
|
Merge branch 'dev-v7.8' of https://github.com/umbraco/Umbraco-CMS into dev-v7.8
|
2017-11-09 22:15:22 +11:00 |
|
Shannon
|
ece5fecf12
|
fixes doc type conflict name so the tour uses "My Home Page"
|
2017-11-09 22:15:05 +11:00 |
|
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 |
|