Jack Penney
1c4e1db054
Removed CMS Import keys from hebrew translation
2017-11-23 12:28:17 +00:00
bjarnef
8d14a3ef2c
added number validation in embed overlay
2017-11-20 12:36:12 +01:00
bjarnef
2f3d9c9509
localize texts
2017-11-20 12:32:09 +01:00
Robert
6e8f3b6e13
Merge pull request #2324 from umbraco/temp-UAASSSCRUM-1254
...
Added custom RollingFileAppender and changed rollingStyle to "size"
2017-11-17 13:03:48 +01:00
mikkelhm
b9cbdbd9a7
Add rename of Appender to csproj
2017-11-17 12:01:32 +01:00
mikkelhm
ebf35356a8
Updates the CustomRollingFileAppender to read config settings to control it
2017-11-17 12:00:42 +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
Robert
5982a868ea
Added custom RollingFileAppender and changed rollingStyle to "size"
...
OpenFile method has been overiden, this means that everytime a log will be opened, it will check the last access time of all existing logs, and delete the ones that haven't been accessed in more than 1 month.
Changing the rollingStyle to "size" will make sure that logs will roll once the maximumFileSize reaches its set limit.
2017-11-14 12:01:11 +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
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
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
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
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
Mads Rasmussen
5af9712d51
Merge branch 'dev-v7' into U4-9144
2017-11-08 10:43:58 +01:00
Shannon
e2c2b8534f
Merge branch 'dev-v7' of https://github.com/umbraco/Umbraco-CMS into dev-v7
2017-11-08 19:48:02 +11:00
Shannon
cfd3cc5187
OK... maybe that is now required
2017-11-08 19:47:47 +11:00
Sebastiaan Janssen
1f29418ea5
Revert "Adds overloads so you can do paging with the TypedSearch methods."
...
This reverts commit 089f488c15
2017-11-08 09:23:58 +01:00
Shannon
977b30c51a
Revert "more test hacks" which in theory shouldn't be required for 7.7+
2017-11-08 19:23:34 +11:00
Shannon
66a849dd12
Merge branch 'dev-v7.6' into dev-v7
2017-11-08 19:20:28 +11:00
Shannon
637abc384b
more test hacks
2017-11-08 18:46:08 +11:00
Shannon
8959b81f6a
another test fix attempt (this is only for 7.6, this is already fixed in 7.7)
2017-11-08 18:16:17 +11:00
Shannon
32bb8ac5a4
Merge branch 'dev-v7.6' of https://github.com/umbraco/Umbraco-CMS into dev-v7.6
2017-11-08 17:47:32 +11:00
Shannon
016caba35f
attempt to fix tests
2017-11-08 17:47:18 +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 Deminick
d522dd7a31
Merge pull request #2313 from umbraco/temp-U4-10620
...
U4-10620 Umbraco 2FA implementation issues
2017-11-08 17:18:31 +11:00
Shannon
95f632e1ea
Adds notes and overrides SendTwoFactorCodeAsync and checks for -1 instead of null
2017-11-08 17:16:11 +11:00
Shannon Deminick
e72ec171f7
Merge pull request #2312 from umbraco/temp-U4-9857
...
Temp u4 9857
2017-11-08 16:06:53 +11:00
Shannon
2538e2e9c9
additional null check
2017-11-08 16:06:23 +11:00
Daniël Knippers
b1ceeb23b3
Only show characters left is a number of characters is configured on the datatype, hide otherwise
2017-11-07 23:13:59 +01:00
Sebastiaan Janssen
46d0807fa4
Merge pull request #2287 from PerplexDaniel/U4-6985
...
Switching between sections - select last node
2017-11-07 20:26:25 +01:00
Sebastiaan Janssen
579c572dd8
Oops, missed that I was passing a string array into the int array param
2017-11-07 18:36:37 +01:00
Sebastiaan Janssen
bbf4c18825
U4-10646 Sorting nodes in edge cases can lead to blanking out of property data
2017-11-07 17:12:04 +01:00
Sebastiaan Janssen
9a94ac5317
Implement TwoFactorSignInAsync from Identity repo to make sure our custom GetVerifiedUserIdAsync fires
...
U4-10620 Umbraco 2FA implementation issues
2017-11-07 16:51:40 +01:00
Sebastiaan Janssen
0b904e82b5
Get user by id instead of loginname
...
U4-9857 Umbraco 7.6 - Exception after changing user login name
2017-11-07 16:36:15 +01:00
Claus
c816558936
cleanup.
2017-11-07 15:14:45 +01: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
