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
|
837bb83d48
|
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
|
2017-11-15 14:40:19 +01:00 |
|
Sebastiaan Janssen
|
054ac78970
|
Revert "Position changed from "target" to "center""
This reverts commit c1769aa299.
|
2017-11-15 14:39:09 +01:00 |
|
Mads Rasmussen
|
31f6bd4c02
|
fixes: U4-10665 7.8 - Log info on two lines is a bit off
|
2017-11-14 15:57:13 +01:00 |
|
Mads Rasmussen
|
3e5744dbb7
|
fixes: U4-10663 7.8 - Save and Publish button styling - Firefox
|
2017-11-14 13:38:18 +01:00 |
|
Sebastiaan Janssen
|
69a42e26a9
|
Merge remote-tracking branch 'origin/dev-v7.6' into dev-v7
|
2017-11-14 11:42:00 +01:00 |
|
Sebastiaan Janssen
|
d9ed420ed4
|
U4-10492 Users failing to list with MySQL
|
2017-11-14 11:38:45 +01:00 |
|
Sebastiaan Janssen
|
2b3397120f
|
Disambiguate events by explicitly naming them
|
2017-11-14 11:23:48 +01:00 |
|
Mads Rasmussen
|
cb0d8320e6
|
rename parameter
|
2017-11-14 10:47:34 +01:00 |
|
Mads Rasmussen
|
df0fe62fca
|
Merge branch 'dev-v7.8' into patch-27
|
2017-11-14 09:50:05 +01:00 |
|
Sebastiaan Janssen
|
1f41aa7d81
|
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.UI/packages.config
|
2017-11-14 07:19:08 +01:00 |
|
Sebastiaan Janssen
|
dad77fc506
|
Bump version to 7.7.5
|
2017-11-14 07:17:19 +01:00 |
|
Sebastiaan Janssen
|
350f5c88c7
|
Bump version to 7.6.12
|
2017-11-14 07:16:14 +01:00 |
|
Stephan
|
928c0dc535
|
Merge pull request #2314 from umbraco/temp-U4-10646
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
|
2017-11-13 17:33:27 +01:00 |
|
Mads Rasmussen
|
483a2c7c02
|
Merge pull request #2320 from abjerner/patch-26
"by" in the new Info tab is now localized
|
2017-11-13 15:44:17 +01:00 |
|
Sebastiaan Janssen
|
cc7a28db65
|
Update to latest ImageProcessor
|
2017-11-13 15:39:29 +01:00 |
|
Sebastiaan Janssen
|
065e764957
|
Update to latest Examine
|
2017-11-13 15:39:28 +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 |
|
Mads Rasmussen
|
6b6a7fe231
|
Merge branch 'dev-v7' into dev-v7.8
|
2017-11-13 14:47:52 +01:00 |
|
Mads Rasmussen
|
6fd197d1bf
|
fixes: U4-10667 7.8 Item not published is still a hyperlink
|
2017-11-13 13:32:03 +01:00 |
|
Anders Bjerner
|
00aa59c9c6
|
Dates in the "History" box is now also localized (1/2)
|
2017-11-11 20:15:27 +01:00 |
|
Anders Bjerner
|
06254ba462
|
Dates in the "History" box are now also localized (1/2)
|
2017-11-11 20:14:45 +01:00 |
|
Anders Bjerner
|
684cb19a7c
|
Localized dates for the new "Info" tab
|
2017-11-11 19:57:11 +01:00 |
|
Anders Bjerner
|
9c5da12653
|
Updated the "umbContentNodeInfo" directive with localized dates
|
2017-11-11 19:53:48 +01:00 |
|
Anders Bjerner
|
83f229abc6
|
"by" in the new Info tab is now localized
|
2017-11-11 18:45:37 +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
|
0ccf798f14
|
"Set date" and "Clear date" in the new Info tab can now be localized
|
2017-11-11 18:23:47 +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
|
2dc11f6fa1
|
Fixes new installation user login
|
2017-11-09 23:05:56 +11: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
|
492b0aadc8
|
ensure that the user login table is created
|
2017-11-09 01:14:00 +11:00 |
|
Shannon
|
b399630202
|
bumps version
|
2017-11-09 01:02:09 +11: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
|
0afee71e9e
|
Fixes locking issue with SessionIdValidator which was forcing a log out in some cases
|
2017-11-08 22:15:00 +11:00 |
|
Claus
|
dc67d82671
|
adding trim.
|
2017-11-08 12:08:30 +01:00 |
|
Claus
|
c7d9683fc4
|
Merge pull request #2277 from umbraco/temp-U4-10589
U4-10589 Login should be sanitized and/or cause validation errors if trying to save with
|
2017-11-08 12:07:34 +01:00 |
|
Mads Rasmussen
|
3c7c6b4ad7
|
Update thumbnails.less
Use new color variables
|
2017-11-08 11:38:32 +01:00 |
|
Mads Rasmussen
|
838d7975c9
|
Update healthcheck.less
prevent UI from "jumping" on hover
|
2017-11-08 11:36:23 +01:00 |
|